From 6889f53397edf4c2e94df67d72ef0b1e7b18d35a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 26 Jun 2016 01:28:06 +0200 Subject: [PATCH 001/168] debug.nix: add traceSeq & traceValSeq Debugging functions that strictly deep-evaluate the argument that should be traced. --- lib/debug.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/debug.nix b/lib/debug.nix index 2d10d981114..38612d630b3 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -19,6 +19,10 @@ rec { traceXMLVal = x: trace (builtins.toXML x) x; traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; + # strict trace functions (traced structure is fully evaluated and printed) + traceSeq = x: y: trace (builtins.deepSeq x x) y; + traceValSeq = v: traceVal (builtins.deepSeq v v); + # this can help debug your code as well - designed to not produce thousands of lines traceShowVal = x : trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; From 93bbe13f98c1759330a6a37728607f636734b930 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 26 Jun 2016 01:23:25 +0200 Subject: [PATCH 002/168] debug.nix: deprecate strict Replace the implementation by seq and add a deprecation warning. The semantics seems a little bit off, but the function should only be used for debugging. --- lib/debug.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 38612d630b3..e2e895ab620 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -73,27 +73,9 @@ rec { # usage: { testX = allTrue [ true ]; } testAllTrue = expr : { inherit expr; expected = map (x: true) expr; }; - # evaluate everything once so that errors will occur earlier - # hacky: traverse attrs by adding a dummy - # ignores functions (should this behavior change?) See strictf - # - # Note: This should be a primop! Something like seq of haskell would be nice to - # have as well. It's used fore debugging only anyway - strict = x : - let - traverse = x : - if isString x then true - else if isAttrs x then - if x ? outPath then true - else all id (mapAttrsFlatten (n: traverse) x) - else if isList x then - all id (map traverse x) - else if isBool x then true - else if isFunction x then true - else if isInt x then true - else if x == null then true - else true; # a (store) path? - in if traverse x then x else throw "else never reached"; + strict = v: + trace "Warning: strict is deprecated and will be removed in the next release" + (builtins.seq v v); # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 From 1e534e234b0a92bf06361fa41b7ac8691fdbc769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 23 Jul 2016 22:31:57 +0200 Subject: [PATCH 003/168] fix nixos-version --hash when building from git --- .../tools/{get-version-suffix => get-git-revision} | 2 +- nixos/modules/installer/tools/nixos-rebuild.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) rename nixos/modules/installer/tools/{get-version-suffix => get-git-revision} (95%) diff --git a/nixos/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-git-revision similarity index 95% rename from nixos/modules/installer/tools/get-version-suffix rename to nixos/modules/installer/tools/get-git-revision index b8972cd57d2..b57d9cf9fa0 100644 --- a/nixos/modules/installer/tools/get-version-suffix +++ b/nixos/modules/installer/tools/get-git-revision @@ -17,6 +17,6 @@ getVersion() { if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then getVersion $nixpkgs if [ -n "$rev" ]; then - echo ".git.$rev" + echo "$rev" fi fi diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 5ecdcdb3cdb..80a4537375c 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -311,9 +311,10 @@ fi # nixos-version shows something useful). if [ -n "$canRun" ]; then if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$($SHELL $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}" || true) - if [ -n "$suffix" ]; then - echo -n "$suffix" > "$nixpkgs/.version-suffix" || true + revision=$($SHELL $nixpkgs/nixos/modules/installer/tools/get-git-revision "${extraBuildFlags[@]}" || true) + if [ -n "$revision" ]; then + echo -n ".git.$revision" > "$nixpkgs/.version-suffix" || true + echo -n "$revision" > "$nixpkgs/.git-revision" || true fi fi fi From c0ff64c2e8bd8fa9e751c835fb5b060a9f870463 Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Fri, 29 Jul 2016 20:36:06 +1000 Subject: [PATCH 004/168] zsh: Added HELPDIR variable for interactive shells, as the help directory is distribution specific, and will be useful for using `run-help` --- nixos/modules/programs/zsh/zsh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b51104c16fa..1b8b7a79593 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -116,6 +116,8 @@ in done ${if cfg.enableCompletion then "autoload -U compinit && compinit" else ""} + + HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" ''; }; From ee16dba6303b69c1915bb930924544ef4676540b Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sat, 30 Jul 2016 12:42:36 +0200 Subject: [PATCH 005/168] motif: Add darwin support --- .../motif/Add-X.Org-to-bindings-file.patch | 7 ++++++ .../motif/Do-not-compile-demos.patch | 11 ++++++++++ ...move-unsupported-weak-refs-on-darwin.patch | 12 ++++++++++ .../motif/Use-correct-header-for-malloc.patch | 19 ++++++++++++++++ pkgs/development/libraries/motif/default.nix | 22 +++++++++---------- 5 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch create mode 100644 pkgs/development/libraries/motif/Do-not-compile-demos.patch create mode 100644 pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch create mode 100644 pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch diff --git a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch new file mode 100644 index 00000000000..84b62dcd4eb --- /dev/null +++ b/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch @@ -0,0 +1,7 @@ +--- a/bindings/xmbind.alias ++++ b/bindings/xmbind.alias +@@ -62,3 +62,4 @@ + "Sun Microsystems, Inc." sun + ! "Sun Microsystems, Inc." sun_at + "Tektronix, Inc." tek ++"The X.Org Foundation" tpc diff --git a/pkgs/development/libraries/motif/Do-not-compile-demos.patch b/pkgs/development/libraries/motif/Do-not-compile-demos.patch new file mode 100644 index 00000000000..1b8df94d007 --- /dev/null +++ b/pkgs/development/libraries/motif/Do-not-compile-demos.patch @@ -0,0 +1,11 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -27,7 +27,6 @@ SUBDIRS = bindings bitmaps \ + include \ + tools \ + clients \ +- doc \ +- demos ++ doc + AUTOMAKE_OPTIONS = 1.4 + ACLOCAL_AMFLAGS = -I . diff --git a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch new file mode 100644 index 00000000000..801310ba41c --- /dev/null +++ b/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch @@ -0,0 +1,12 @@ +--- a/lib/Xm/XmP.h ++++ b/lib/Xm/XmP.h +@@ -1437,7 +1437,7 @@ extern void _XmDestroyParentCallback( + + #endif /* NO_XM_1_2_BC */ + +-#if __GNUC__ ++#if __GNUC__ && ! __APPLE__ + # define XM_DEPRECATED __attribute__((__deprecated__)) + # define XM_ALIAS(sym) __attribute__((__weak__,alias(#sym))) + #else + diff --git a/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch b/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch new file mode 100644 index 00000000000..d91e43ba2d3 --- /dev/null +++ b/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch @@ -0,0 +1,19 @@ +--- a/demos/programs/workspace/xrmLib.c ++++ b/demos/programs/workspace/xrmLib.c +@@ -30,7 +30,14 @@ static char rcsid[] = "$XConsortium: xrmLib.c /main/6 1995/07/14 10:01:41 drk $" + #endif + + #include +-#include ++#if defined(__cplusplus) || defined(__STDC__) || defined(__EXTENSIONS__) ++# include ++# if defined(HAVE_MALLOC_H) ++# include ++# elif defined(HAVE_SYS_MALLOC_H) ++# include ++# endif ++#endif + #include + #include "wsm.h" + #include "wsmDebug.h" + diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 9d50fb3d3d1..08b59deff59 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -17,29 +17,29 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libtool + libtool xlibsWrapper xbitmaps libXrender libXmu libXt expat libjpeg libpng libiconv - ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ]; + ]; - nativeBuildInputs = [ flex ]; + nativeBuildInputs = [ pkgconfig flex ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ]; propagatedBuildInputs = [ libXp libXau ]; makeFlags = [ "CFLAGS=-fno-strict-aliasing" ]; - patchPhase = '' - rm lib/Xm/Xm.h - echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias - '' + stdenv.lib.optionalString (!demoSupport) - '' - sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am - ''; + prePatch = ''rm lib/Xm/Xm.h''; + + patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch + ./Use-correct-header-for-malloc.patch + ./Add-X.Org-to-bindings-file.patch + ] + ++ stdenv.lib.optional (!demoSupport) ./Do-not-compile-demos.patch; meta = with stdenv.lib; { homepage = http://motif.ics.com; description = "Unix standard widget-toolkit and window-manager"; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; license = with licenses; [ lgpl21 ]; maintainers = with maintainers; [ ]; }; From 3d3d607408fb2a6a134c5d3cfcb945b094fab71d Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sun, 31 Jul 2016 10:41:20 +0200 Subject: [PATCH 006/168] catclock: Add darwin support --- pkgs/applications/misc/catclock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 8df06980b47..75f5ab406fe 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://codefromabove.com/2014/05/catclock/; license = with licenses; mit; maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; } From 3a910eed61a50267fffe8ce2ea0110959a93cbd7 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sun, 31 Jul 2016 20:54:10 +0200 Subject: [PATCH 007/168] nedit: Add darwin support --- pkgs/applications/editors/nedit/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 14220956698..8a478b27593 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, xlibsWrapper, motif, libXpm }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "nedit-5.6a"; @@ -12,7 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ xlibsWrapper motif libXpm ]; - buildFlags = if stdenv.isLinux then "linux" else ""; + buildFlags = if stdenv.isLinux then "linux" else + # the linux config works fine on darwin too! + if stdenv.isDarwin then "linux" else ""; NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { cp -p source/nedit source/nc $out/bin ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.nedit.org; + platforms = with platforms; linux ++ darwin; }; } From 19af5b444ebc0a4bbd8e848081a6700e13ba08ef Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Mon, 1 Aug 2016 09:37:53 +0200 Subject: [PATCH 008/168] offlineimap's module: change UI to syslog The 'syslog' UI "allows better integration with systemd": http://www.offlineimap.org/doc/Changelog.html#offlineimap-v660-rc2-2015-10-15 --- nixos/modules/services/networking/offlineimap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/offlineimap.nix b/nixos/modules/services/networking/offlineimap.nix index 31ce9280f31..daf6196d370 100644 --- a/nixos/modules/services/networking/offlineimap.nix +++ b/nixos/modules/services/networking/offlineimap.nix @@ -54,7 +54,7 @@ in { description = "Offlineimap: a software to dispose your mailbox(es) as a local Maildir(s)"; serviceConfig = { Type = "oneshot"; - ExecStart = "${cfg.package}/bin/offlineimap -u basic -o -1"; + ExecStart = "${cfg.package}/bin/offlineimap -u syslog -o -1"; TimeoutStartSec = cfg.timeoutStartSec; }; path = cfg.path; From 9c4b23ba11fe6bc1f965195864fa85a3e3afb984 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 1 Aug 2016 13:31:08 -0700 Subject: [PATCH 009/168] truecrypt: update source url --- pkgs/applications/misc/truecrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 19fa85b279c..728bb6d4d63 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://fossies.org/unix/misc/TrueCrypt-7.1a-Source.tar.gz; + url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz; sha1 = "d43e0dbe05c04e316447d87413c4f74c68f5de24"; }; From ade00b3c4243c755d2f003a4b5f6143248f75dee Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 1 Aug 2016 13:32:11 -0700 Subject: [PATCH 010/168] truecrypt: change checksum from sha1 to sha256 --- pkgs/applications/misc/truecrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 728bb6d4d63..bc15b084cd9 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz; - sha1 = "d43e0dbe05c04e316447d87413c4f74c68f5de24"; + sha256 = "e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc"; }; pkcs11h = fetchurl { From 43fc394a5cd06c38ed43e857ed14496cafdde0b5 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 1 Aug 2016 15:36:03 +0200 Subject: [PATCH 011/168] grsecurity module: disable EFI runtime services by default Enabling EFI runtime services provides a venue for injecting code into the kernel. When grsecurity is enabled, we close this by default by disabling access to EFI runtime services. The upshot of this is that /sys/firmware/efi/efivars will be unavailable by default (and attempts to mount it will fail). This is not strictly a grsecurity related option, it could be made into a general option, but it seems to be of particular interest to grsecurity users (for non-grsecurity users, there are other, more immediate kernel injection attack dangers to contend with anyway). --- nixos/doc/manual/configuration/grsecurity.xml | 5 +++++ nixos/modules/security/grsecurity.nix | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/nixos/doc/manual/configuration/grsecurity.xml b/nixos/doc/manual/configuration/grsecurity.xml index 06e7617d58e..3c17fc19397 100644 --- a/nixos/doc/manual/configuration/grsecurity.xml +++ b/nixos/doc/manual/configuration/grsecurity.xml @@ -265,6 +265,11 @@ Issues and work-arounds + Access to EFI runtime services is disabled by default: + this plugs a potential code injection attack vector; use + to override + this behavior. + Virtualization: KVM is the preferred virtualization solution. Xen, Virtualbox, and VMWare are unsupported and most likely require a custom kernel. diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 6b4dbe8e11f..60e9058dd69 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -37,6 +37,18 @@ in ''; }; + disableEfiRuntimeServices = mkOption { + type = types.bool; + example = false; + default = true; + description = '' + Whether to disable access to EFI runtime services. Enabling EFI runtime + services creates a venue for code injection attacks on the kernel and + should be disabled if at all possible. Changing this option enters into + effect upon reboot. + ''; + }; + }; config = mkIf cfg.enable { @@ -45,6 +57,8 @@ in # required kernel config boot.kernelPackages = mkDefault pkgs.linuxPackages_grsec_nixos; + boot.kernelParams = optional cfg.disableEfiRuntimeServices "noefi"; + system.requiredKernelConfig = with config.lib.kernelConfig; [ (isEnabled "GRKERNSEC") (isEnabled "PAX") From 8eb4b3af105c9501a8842df706b40bf9a688ea0c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 2 Aug 2016 13:03:44 +0200 Subject: [PATCH 012/168] nvidia-x11: fix driSupport32Bit --- pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5edf03bf409..cbd4e466b70 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { [ gtk atk pango glib gdk_pixbuf cairo ] ); programPath = makeLibraryPath [ xorg.libXv ]; - patches = if versionAtLeast kernel.version "4.7" then [ ./365.35-kernel-4.7.patch ] else []; + patches = if (!libsOnly) && (versionAtLeast kernel.dev.version "4.7") then [ ./365.35-kernel-4.7.patch ] else []; buildInputs = [ perl nukeReferences ]; From e669521834c5670bb0e79d9b25f3e3d10aede156 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Aug 2016 20:38:24 +0300 Subject: [PATCH 013/168] gambatte: init at 2016-05-03 --- pkgs/games/gambatte/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/games/gambatte/default.nix diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix new file mode 100644 index 00000000000..969f231deda --- /dev/null +++ b/pkgs/games/gambatte/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, scons, qt4 }: + +stdenv.mkDerivation rec { + name = "gambatte-${version}"; + version = "2016-05-03"; + + src = fetchFromGitHub { + owner = "sinamas"; + repo = "gambatte"; + rev = "f8a810b103c4549f66035dd2be4279c8f0d95e77"; + sha256 = "1arv4zkh3fhrghsykl4blazc9diw09m44pyff1059z5b98smxy3v"; + }; + + buildInputs = [ scons qt4 ]; + + buildPhase = '' + ./build_qt.sh + ''; + + installPhase = '' + mkdir -p $out/bin + cp gambatte_qt/bin/gambatte_qt $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Portable, open-source Game Boy Color emulator"; + homepage = https://github.com/sinamas/gambatte; + license = licenses.gpl2; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7010c15db98..8aaeb9e095d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15630,6 +15630,8 @@ in wxGTK = wxGTK28.override { unicode = false; }; }; + gambatte = callPackage ../games/gambatte { }; + gav = callPackage ../games/gav { }; gemrb = callPackage ../games/gemrb { }; From b96fe03484ba8fa3091664246ec67a57f5703b1a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 17:41:28 +0300 Subject: [PATCH 014/168] treewide: Fix meta.platforms related typos --- pkgs/applications/editors/tweak/default.nix | 2 +- .../interpreters/picolisp/default.nix | 2 +- pkgs/development/libraries/assimp/default.nix | 3 +-- pkgs/development/libraries/zeromq/3.x.nix | 2 +- pkgs/development/web/valum/default.nix | 2 +- pkgs/servers/http/couchdb/default.nix | 2 +- pkgs/tools/audio/pasystray/default.nix | 2 +- pkgs/tools/filesystems/fatresize/default.nix | 2 +- pkgs/tools/misc/dvtm/default.nix | 16 ++++++++-------- pkgs/tools/networking/nylon/default.nix | 2 +- 10 files changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index 5ebe4672cab..f90eb609d44 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "An efficient hex editor"; homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; license = licenses.mit; - platform = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 5832bbea9b7..9c669ceed68 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "A simple Lisp with an integrated database"; homepage = http://picolisp.com/; license = licenses.mit; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ raskin tohl ]; }; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index ef75ad3fe87..3511c3331bc 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation { homepage = http://assimp.sourceforge.net/; license = licenses.bsd3; maintainers = with maintainers; [ ehmry ]; - platfroms = [ platforms.linux platforms.darwin ]; - inherit version; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 50eba33670f..54265d2f095 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 633d3086256..6348008ab92 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/valum-framework/valum; description = "Web micro-framework written in Vala"; - plaforms = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 8b3edb27c17..697c9d95884 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; homepage = "http://couchdb.apache.org"; license = licenses.asl20; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 01c6501f840..8b5427ed626 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/christophgysin/pasystray"; license = licenses.lgpl21Plus; maintainers = [ maintainers.exlevan ]; - platfoms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index 7fb60d2f388..f20f9aa2bab 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { meta = { description = "The FAT16/FAT32 non-destructive resizer"; homepage = http://sourceforge.net/projects/fatresize; - platform = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 767912ecc45..f25d134ca79 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -4,14 +4,6 @@ stdenv.mkDerivation rec { name = "dvtm-0.15"; - meta = with stdenv.lib; { - description = "Dynamic virtual terminal manager"; - homepage = http://www.brain-dump.org/projects/dvtm; - license = licenses.mit; - platfroms = platforms.linux; - maintainers = [ maintainers.vrthra ]; - }; - src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g"; @@ -31,4 +23,12 @@ stdenv.mkDerivation rec { installPhase = '' make PREFIX=$out install ''; + + meta = with stdenv.lib; { + description = "Dynamic virtual terminal manager"; + homepage = http://www.brain-dump.org/projects/dvtm; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.vrthra ]; + }; } diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index fc89ea8db51..4775d42d7a9 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; maintainers = with maintainers; [ edwtjo viric ]; - platform = platforms.linux; + platforms = platforms.linux; }; } From 1bf5ded1933b18af9a95dc263063756ed9d383ba Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 17:50:15 +0300 Subject: [PATCH 015/168] treewide: Lots of meta.hydraPlatforms -> meta.platforms In all of these files, there is no meta.platforms but only meta.hydraPlatforms, which doesn't seem to have any purpose except being inconsistent. --- pkgs/applications/science/math/fricas/default.nix | 2 +- pkgs/applications/version-management/subversion/default.nix | 2 +- pkgs/development/compilers/swi-prolog/default.nix | 2 +- pkgs/development/interpreters/lua-5/5.2.nix | 2 +- pkgs/development/interpreters/lua-5/5.3.nix | 2 +- pkgs/development/interpreters/lua-5/expat.nix | 2 +- pkgs/development/interpreters/lua-5/sec.nix | 2 +- pkgs/development/interpreters/maude/default.nix | 2 +- pkgs/development/libraries/libdaemon/default.nix | 2 +- pkgs/development/libraries/libgnurl/default.nix | 2 +- pkgs/development/libraries/libmng/default.nix | 2 +- pkgs/development/libraries/serf/default.nix | 2 +- pkgs/development/libraries/silgraphite/default.nix | 2 +- pkgs/development/libraries/silgraphite/graphite2.nix | 2 +- pkgs/development/libraries/tecla/default.nix | 2 +- pkgs/servers/mail/dovecot/default.nix | 2 +- pkgs/shells/dash/default.nix | 2 +- pkgs/tools/archivers/atool/default.nix | 2 +- pkgs/tools/backup/bup/default.nix | 2 +- pkgs/tools/compression/pigz/default.nix | 2 +- pkgs/tools/graphics/gnuplot/default.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- pkgs/tools/graphics/graphviz/default.nix | 2 +- pkgs/tools/networking/pdsh/default.nix | 2 +- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- pkgs/tools/typesetting/multimarkdown/default.nix | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 98012934f38..0dd1222b096 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "An advanced computer algebra system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.sprock ]; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index e0c7030a762..fcd95a1acfa 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -90,7 +90,7 @@ let description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index f9857fcc569..ae3e162910c 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "A Prolog compiler and interpreter"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index b5ac4157d65..37e12c9dc1c 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -97,6 +97,6 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index 27ca9c9160f..e2e24a11db4 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix index 243abae331a..fb0bb5e5ff5 100644 --- a/pkgs/development/interpreters/lua-5/expat.nix +++ b/pkgs/development/interpreters/lua-5/expat.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.flosse ]; }; } diff --git a/pkgs/development/interpreters/lua-5/sec.nix b/pkgs/development/interpreters/lua-5/sec.nix index 08eb1c89308..a4d14f7e9d7 100644 --- a/pkgs/development/interpreters/lua-5/sec.nix +++ b/pkgs/development/interpreters/lua-5/sec.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/brunoos/luasec"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.flosse ]; }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 3473a11e819..737ded6e1bb 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { rewriting logic computation. ''; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index cb8d07fec90..9d85f12a39a 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 943f276ed78..2495c1505f0 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "A fork of libcurl used by GNUnet"; homepage = https://gnunet.org/gnurl; maintainers = with maintainers; [ falsifian vrthra ]; - hydraPlatforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index b97ee6a4ced..284e82f9ad9 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.libmng.com; license = licenses.zlib; maintainers = with maintainers; [ marcweber urkud ]; - hydraPlatforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 86212eaeb47..48c70695909 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "HTTP client library based on APR"; license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; - hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index f124b313d74..05db104ecb7 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 4e23a36939d..a399db1b71f 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; - hydraPlatforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 6f30497d870..ddae2262dac 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Command-line editing library"; license = "as-is"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 8af4d4ccc8b..d55425779e6 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "http://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; maintainers = with stdenv.lib.maintainers; [viric peti rickynils]; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 1a95b4f42e6..0730674854c 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gondor.apana.org.au/~herbert/dash/; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; passthru = { diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 7e2934a8f88..700a4cc5cca 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/atool; description = "Archive command line helper"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index b7136c16fb3..efca158efc6 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { Capable of doing *fast* incremental backups of virtual machine images. ''; - hydraPlatforms = platforms.linux; + platforms = platforms.linux; maintainers = with maintainers; [ muflax ]; }; } diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 38e032494fb..1cadf393a8e 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 5c70d0e7d0a..8fa7af3b1f8 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://www.gnuplot.info/; description = "A portable command-line driven graphing utility for many platforms"; - hydraPlatforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 695ac898fe8..edbe9cd3374 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { interfaces for other technical domains. ''; - hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ]; inherit version; branch = "2.32"; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 9eccee536bd..975c5dc13e8 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { interfaces for other technical domains. ''; - hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ]; downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/"; inherit version; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index a5b548c8085..b2f2e20493f 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { while timeouts occur on some connections. ''; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index e623f67e64b..d446b722922 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -271,7 +271,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; - hydraPlatforms = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index d628d84ee9e..53e75ebd5ec 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # licensed under GPLv2+ or MIT: # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE license = with stdenv.lib.licenses; [ gpl2Plus ]; - hydraPlatforms = platforms.all; + platforms = platforms.all; maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; }; } From 17e94ebc6a46a9a3bce9e8f9aeff1e29049e19c6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 18:06:49 +0300 Subject: [PATCH 016/168] xorg.xcbutilcursor: Don't wipe out most meta attrs --- pkgs/servers/x11/xorg/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 14b1caed3d2..975cb2b69ab 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -266,7 +266,7 @@ in xcbutilcursor = attrs: attrs // { outputs = [ "dev" "out" ]; - meta.maintainers = [ stdenv.lib.maintainers.lovek323 ]; + meta = attrs.meta // { maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; }; xcbutilimage = attrs: attrs // { From db35d7b8ab7212bf52395f2f4816ea2fdacffbfe Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 18:34:11 +0300 Subject: [PATCH 017/168] koji, opensp: Some meta fixes --- pkgs/tools/package-management/koji/default.nix | 5 ++++- pkgs/tools/text/sgml/opensp/compat.nix | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/tools/package-management/koji/default.nix index 7f03ed1625e..28a1f3d00b7 100644 --- a/pkgs/tools/package-management/koji/default.nix +++ b/pkgs/tools/package-management/koji/default.nix @@ -17,5 +17,8 @@ stdenv.mkDerivation rec { rm -rf $out/nix ''; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + meta = { + maintainers = [ stdenv.lib.maintainers.mornfall ]; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix index 16498281181..2526273b812 100644 --- a/pkgs/tools/text/sgml/opensp/compat.nix +++ b/pkgs/tools/text/sgml/opensp/compat.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation { setupHook = opensp.setupHook; - meta.description = - "Compatibility wrapper for old programs looking for original sp programs"; + meta = opensp.meta // { + description = "Compatibility wrapper for old programs looking for original sp programs"; + }; } From 59ce9118103898ec53b7679a312552246afab8b7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 18:51:05 +0300 Subject: [PATCH 018/168] treewide: Some EOF-whitespace fixes --- pkgs/applications/misc/xmove/default.nix | 1 - .../networking/browsers/mozilla-plugins/gmtk/default.nix | 1 - pkgs/applications/science/electronics/fritzing/default.nix | 4 ++-- pkgs/applications/science/logic/sad/default.nix | 2 +- pkgs/build-support/mono-dll-fixer/default.nix | 2 +- pkgs/data/fonts/dejavu-fonts/default.nix | 1 - pkgs/development/libraries/giflib/libungif.nix | 1 - pkgs/development/libraries/java/jdom/default.nix | 2 +- pkgs/development/libraries/java/lucene/default.nix | 2 +- pkgs/development/libraries/t1lib/default.nix | 1 - pkgs/misc/emulators/atari++/default.nix | 4 ++-- pkgs/misc/emulators/atari800/default.nix | 4 ++-- pkgs/os-specific/linux/opengl/xorg-sys/default.nix | 1 - pkgs/os-specific/linux/systemd/libudev.nix | 1 - pkgs/tools/misc/mrtg/default.nix | 2 +- pkgs/tools/security/super/default.nix | 2 +- 16 files changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index a4427c11f6a..56558787cdd 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -12,4 +12,3 @@ stdenv.mkDerivation { buildInputs = [libX11 libXi imake xauth libXau]; } - diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix index d707f326745..1c5f128fc12 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix @@ -10,4 +10,3 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig gtk GConf alsaLib ]; } - diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 3f80ed2866d..4ac2710050b 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { preConfigure = '' cd fritzing-${version}.source ''; - + meta = { description = "An open source prototyping tool for Arduino-based projects"; homepage = http://fritzing.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.robberer ]; - }; + }; } diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index d9d36b99117..2d3b533a9a3 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -29,5 +29,5 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.schmitthenner ]; homepage = http://nevidal.org/sad.en.html; - }; + }; } diff --git a/pkgs/build-support/mono-dll-fixer/default.nix b/pkgs/build-support/mono-dll-fixer/default.nix index f7dbeb3c2b0..8f7d1e795d7 100644 --- a/pkgs/build-support/mono-dll-fixer/default.nix +++ b/pkgs/build-support/mono-dll-fixer/default.nix @@ -5,4 +5,4 @@ stdenv.mkDerivation { builder = ./builder.sh; dllFixer = ./dll-fixer.pl; inherit perl; -} \ No newline at end of file +} diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 9d5e25e0abd..76e9b03b9ab 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -40,4 +40,3 @@ stdenv.mkDerivation rec { done; ''; } - diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index ca2d0945722..725539a8131 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -7,4 +7,3 @@ stdenv.mkDerivation { sha256 = "5e65e1e5deacd0cde489900dbf54c6c2ee2ebc818199e720dbad685d87abda3d"; }; } - diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index bca165bb324..5211156fe7e 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -8,4 +8,4 @@ stdenv.mkDerivation { url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz; md5 = "ce29ecc05d63fdb419737fd00c04c281"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index 9380591636c..76e08696b0c 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -8,4 +8,4 @@ stdenv.mkDerivation { url = http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/lucene-1.4.1.tar.gz; md5 = "656a6f40f5b8f7d2e19453436848bfe8"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 5ed773c56d2..e1a62607103 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -30,4 +30,3 @@ stdenv.mkDerivation { postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? } - diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 89baadb6208..fc48d607bb2 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec{ (Linux, Solaris, Irix). ''; maintainers = [ maintainers.AndersonTorres ]; - license = licenses.gpl2Plus; - }; + license = licenses.gpl2Plus; + }; } diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index af8d64982a0..ce6c6f35a36 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec{ other systems supported by the SDL library. ''; maintainers = [ maintainers.AndersonTorres ]; - license = licenses.gpl2Plus; - }; + license = licenses.gpl2Plus; + }; } diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 7da890ae7e3..807ace86e78 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -14,4 +14,3 @@ stdenv.mkDerivation { neededLibs = map (p: p.out) [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; } - diff --git a/pkgs/os-specific/linux/systemd/libudev.nix b/pkgs/os-specific/linux/systemd/libudev.nix index 0fe45aee916..60115ddaba5 100644 --- a/pkgs/os-specific/linux/systemd/libudev.nix +++ b/pkgs/os-specific/linux/systemd/libudev.nix @@ -16,4 +16,3 @@ stdenv.mkDerivation { sed "/^includedir=/cincludedir=$dev/include" -i "$dev"/lib/pkgconfig/*.pc ''; } - diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 043cbf1edf1..bdd7a0674a4 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -19,5 +19,5 @@ stdenv.mkDerivation rec { homepage = http://oss.oetiker.ch/mrtg/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.robberer ]; - }; + }; } diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index c88efb23531..45c8f00dccf 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -31,5 +31,5 @@ stdenv.mkDerivation rec { in /etc/super.tab); and 2) “setuid”, which allows root to execute a command under a different uid. ''; - }; + }; } From 2258b21e4b40d42cbe36fd4b5946c19861a9ff95 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 19:06:29 +0300 Subject: [PATCH 019/168] treewide: Add lots of platforms to packages with no meta Build-tested on x86_64 Linux and on Darwin. --- pkgs/applications/audio/rubyripper/default.nix | 4 ++++ pkgs/applications/graphics/batik/default.nix | 4 ++++ pkgs/applications/misc/xautoclick/default.nix | 4 ++++ pkgs/applications/misc/xmove/default.nix | 4 ++++ pkgs/applications/misc/xpdf/libxpdf.nix | 3 +++ .../networking/browsers/mozilla-plugins/gmtk/default.nix | 4 ++++ pkgs/applications/networking/mumble/overlay.nix | 4 ++++ pkgs/applications/version-management/gitlab-shell/default.nix | 3 +++ .../version-management/gitlab-workhorse/default.nix | 4 ++++ pkgs/applications/window-managers/taffybar/default.nix | 4 ++++ pkgs/build-support/libredirect/default.nix | 4 ++++ pkgs/data/fonts/dejavu-fonts/default.nix | 4 ++++ pkgs/data/fonts/mph-2b-damase/default.nix | 4 ++++ pkgs/data/fonts/ttf-bitstream-vera/default.nix | 4 ++++ pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix | 4 ++++ pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix | 4 ++++ pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix | 4 ++++ pkgs/development/beam-modules/hex-registry-snapshot.nix | 4 ++++ pkgs/development/compilers/jikes/default.nix | 4 ++++ .../compilers/meta-environment/meta-build-env/default.nix | 4 ++++ pkgs/development/compilers/ocaml/3.08.0.nix | 4 ++++ pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix | 4 ++++ pkgs/development/libraries/beecrypt/default.nix | 4 ++++ pkgs/development/libraries/breakpad/default.nix | 4 ++++ pkgs/development/libraries/dclib/default.nix | 4 ++++ pkgs/development/libraries/giflib/libungif.nix | 4 ++++ pkgs/development/libraries/gtk-sharp/2.0.nix | 4 ++++ pkgs/development/libraries/gtk-sharp/3.0.nix | 4 ++++ pkgs/development/libraries/gtkmozembed-sharp/default.nix | 4 ++++ pkgs/development/libraries/gtkspell/default.nix | 4 ++++ pkgs/development/libraries/id3lib/default.nix | 4 ++++ pkgs/development/libraries/ilbc/default.nix | 3 +++ pkgs/development/libraries/imlib/default.nix | 4 ++++ pkgs/development/libraries/java/aterm/default.nix | 4 ++++ pkgs/development/libraries/java/dbus-java/default.nix | 4 ++++ pkgs/development/libraries/java/gwt-dragdrop/default.nix | 4 ++++ pkgs/development/libraries/java/gwt-widgets/default.nix | 4 ++++ pkgs/development/libraries/java/hsqldb/default.nix | 3 +++ pkgs/development/libraries/java/httpunit/default.nix | 4 ++++ pkgs/development/libraries/java/hydra-ant-logger/default.nix | 4 ++++ pkgs/development/libraries/java/javasvn/default.nix | 4 ++++ pkgs/development/libraries/java/jdom/default.nix | 4 ++++ pkgs/development/libraries/java/jjtraveler/default.nix | 4 ++++ pkgs/development/libraries/java/libmatthew-java/default.nix | 4 ++++ pkgs/development/libraries/java/lucene/default.nix | 4 ++++ pkgs/development/libraries/java/mockobjects/default.nix | 4 ++++ pkgs/development/libraries/java/saxon/default.nix | 4 ++++ pkgs/development/libraries/java/saxon/default8.nix | 4 ++++ pkgs/development/libraries/java/shared-objects/default.nix | 4 ++++ pkgs/development/libraries/java/smack/default.nix | 4 ++++ pkgs/development/libraries/lesstif/default.nix | 4 ++++ pkgs/development/libraries/libaccounts-glib/default.nix | 4 ++++ pkgs/development/libraries/libbluedevil/default.nix | 4 ++++ pkgs/development/libraries/libcdaudio/default.nix | 4 ++++ pkgs/development/libraries/libgdiplus/default.nix | 4 ++++ pkgs/development/libraries/libgtop/default.nix | 4 ++++ pkgs/development/libraries/libicns/default.nix | 4 ++++ pkgs/development/libraries/libjpeg/62.nix | 4 ++++ pkgs/development/libraries/libmilter/default.nix | 4 ++++ pkgs/development/libraries/libmpcdec/default.nix | 4 ++++ pkgs/development/libraries/libmsn/default.nix | 4 ++++ pkgs/development/libraries/libproxy/default.nix | 4 ++++ pkgs/development/libraries/libpwquality/default.nix | 4 ++++ pkgs/development/libraries/librsvg/default.nix | 4 ++++ pkgs/development/libraries/libtunepimp/default.nix | 4 ++++ pkgs/development/libraries/libusb/default.nix | 4 ++++ pkgs/development/libraries/libwnck/3.x.nix | 4 ++++ pkgs/development/libraries/libwpd/0.8.nix | 4 ++++ pkgs/development/libraries/minizip/default.nix | 4 ++++ pkgs/development/libraries/msilbc/default.nix | 4 ++++ pkgs/development/libraries/netcdf/default.nix | 4 ++++ pkgs/development/libraries/opencl-icd/default.nix | 3 +++ pkgs/development/libraries/pangoxsl/default.nix | 4 ++++ pkgs/development/libraries/pdf2xml/default.nix | 4 ++++ pkgs/development/libraries/qrupdate/default.nix | 4 ++++ pkgs/development/libraries/qt-3/default.nix | 4 ++++ pkgs/development/libraries/sdformat/default.nix | 4 ++++ pkgs/development/libraries/sofia-sip/default.nix | 4 ++++ pkgs/development/libraries/t1lib/default.nix | 3 +++ pkgs/development/libraries/taglib-extras/default.nix | 4 ++++ pkgs/development/libraries/telepathy/farstream/default.nix | 4 ++++ pkgs/development/libraries/tinyxml-2/default.nix | 4 ++++ pkgs/development/libraries/tre/default.nix | 3 +++ pkgs/development/libraries/xlibs-wrapper/default.nix | 4 ++++ pkgs/development/mobile/androidenv/androidndk.nix | 4 ++++ pkgs/development/mobile/androidenv/androidsdk.nix | 4 ++++ pkgs/development/python-modules/pyexiv2/default.nix | 4 ++++ pkgs/development/python-modules/pygtksourceview/default.nix | 4 ++++ pkgs/development/r-modules/wrapper.nix | 4 ++++ .../development/tools/build-managers/gnumake/3.80/default.nix | 4 ++++ .../development/tools/build-managers/gnustep/make/default.nix | 4 ++++ pkgs/development/tools/build-managers/mk/default.nix | 4 ++++ pkgs/development/tools/literate-programming/noweb/default.nix | 4 ++++ pkgs/development/tools/misc/sqitch/default.nix | 4 ++++ pkgs/misc/phabricator/default.nix | 4 ++++ pkgs/os-specific/linux/915resolution/default.nix | 4 ++++ pkgs/os-specific/linux/cramfsswap/default.nix | 4 ++++ pkgs/os-specific/linux/klibc/default.nix | 4 ++++ pkgs/os-specific/linux/klibc/shrunk.nix | 4 ++++ pkgs/os-specific/linux/libnscd/default.nix | 4 ++++ pkgs/os-specific/linux/libvolume_id/default.nix | 4 ++++ pkgs/os-specific/linux/lsscsi/default.nix | 4 ++++ pkgs/os-specific/linux/nss_ldap/default.nix | 4 ++++ pkgs/os-specific/linux/opengl/xorg-sys/default.nix | 4 ++++ pkgs/os-specific/linux/systemd/libudev.nix | 4 ++++ pkgs/os-specific/linux/wireless-tools/default.nix | 4 ++++ pkgs/servers/fingerd/bsd-fingerd/default.nix | 4 ++++ pkgs/servers/ftp/vsftpd/default.nix | 4 ++++ .../servers/http/apache-modules/tomcat-connectors/default.nix | 4 ++++ pkgs/servers/http/jboss/jdbc/mysql/default.nix | 4 ++++ pkgs/servers/http/tomcat/jdbc/mysql/default.nix | 4 ++++ pkgs/servers/rt/default.nix | 4 ++++ pkgs/servers/sql/mysql/jdbc/default.nix | 4 ++++ pkgs/tools/X11/virtualgl/default.nix | 4 ++++ pkgs/tools/X11/xmacro/default.nix | 4 ++++ pkgs/tools/X11/xrestop/default.nix | 4 ++++ pkgs/tools/filesystems/curlftpfs/default.nix | 4 ++++ pkgs/tools/graphics/glxinfo/default.nix | 4 ++++ pkgs/tools/graphics/transfig/default.nix | 4 ++++ pkgs/tools/misc/cloud-utils/default.nix | 4 ++++ pkgs/tools/misc/dmg2img/default.nix | 4 ++++ pkgs/tools/misc/fondu/default.nix | 4 ++++ pkgs/tools/misc/getopt/default.nix | 4 ++++ pkgs/tools/misc/xsel/default.nix | 4 ++++ pkgs/tools/misc/xvfb-run/default.nix | 4 ++++ pkgs/tools/networking/bsd-finger/default.nix | 4 ++++ pkgs/tools/networking/openconnect.nix | 4 ++++ pkgs/tools/networking/p2p/azureus/default.nix | 4 ++++ pkgs/tools/networking/ssmtp/default.nix | 4 ++++ pkgs/tools/networking/webalizer/default.nix | 4 ++++ pkgs/tools/networking/weighttp/default.nix | 4 ++++ pkgs/tools/security/dirmngr/default.nix | 4 ++++ pkgs/tools/security/gnupg/1compat.nix | 4 ++++ pkgs/tools/security/mktemp/default.nix | 3 +++ pkgs/tools/security/mpw/default.nix | 4 ++++ pkgs/tools/text/xml/sablotron/default.nix | 4 ++++ pkgs/tools/typesetting/tex/lkproof/default.nix | 4 ++++ pkgs/tools/typesetting/tex/pgfplots/default.nix | 4 ++++ pkgs/tools/typesetting/xmlroff/default.nix | 4 ++++ 139 files changed, 548 insertions(+) diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index 035bb876482..9e0a3712c97 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -16,4 +16,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${ruby}/bin" \ --prefix PATH : "${cdparanoia}/bin" ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index d776d433b37..3c121211e3f 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation { }; buildInputs = [unzip]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 611527153ee..19d8a15fbfa 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -21,4 +21,8 @@ stdenv.mkDerivation rec { ln -s ${qt4}/bin/moc .bin/moc-qt4 addToSearchPath PATH .bin ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 56558787cdd..32729d57475 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -11,4 +11,8 @@ stdenv.mkDerivation { installPhase = "cd xmove; make install install.man MANDIR=\${out}/man/man1 BINDIR=\${out}/bin; cd .. ; cd xmovectrl ; make install install.man MANDIR=\${out}/man/man1 BINDIR=\${out}/bin; cd .."; buildInputs = [libX11 libXi imake xauth libXau]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index 7987d26946d..cf6f5f32ee2 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -46,4 +46,7 @@ stdenv.mkDerivation { cp -v xpdf/*.h $out/include ''; + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix index 1c5f128fc12..d149cd40d8c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ intltool pkgconfig gtk GConf alsaLib ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index 23f78ff29b3..185672a21f8 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -21,4 +21,8 @@ in stdenv.mkDerivation { sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay sed -i '2iPATH="${binPath}:$PATH"' $out/bin/mumble-overlay ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index c2e746630da..0b0f59b0077 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -56,4 +56,7 @@ stdenv.mkDerivation rec { " *args)" ''; + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 06c05d9f3b3..e24ff31708e 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -23,4 +23,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin make install PREFIX=$out ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 66e880197bb..3181914c40f 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -12,4 +12,8 @@ in stdenv.mkDerivation { makeWrapper ${taffybarEnv}/bin/taffybar $out/bin/taffybar \ --set NIX_GHC "${taffybarEnv}/bin/ghc" ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index a8a497d46d7..bc777c7e6c7 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -11,4 +11,8 @@ stdenv.mkDerivation { ''; installPhase = "mkdir -p $out/lib; cp libredirect.so $out/lib"; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 76e9b03b9ab..3c38be90ded 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -39,4 +39,8 @@ stdenv.mkDerivation rec { cp $i $out/share/fonts/truetype; done; ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 0424f6e727c..49d857ec575 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation { mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index d448aa558eb..0ab7657cc6f 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -15,4 +15,8 @@ stdenv.mkDerivation { mkdir -p $fontDir cp *.ttf $fontDir ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index 6f29c78eca6..b7ab83aa577 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -30,4 +30,8 @@ stdenv.mkDerivation { unzip ${isoents} sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index 811515ee55b..424a44c1bc7 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -30,4 +30,8 @@ stdenv.mkDerivation { unzip ${isoents} sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } 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 5d5a622ba42..0df76cd2876 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 @@ -10,4 +10,8 @@ stdenv.mkDerivation { md5 = "e50f7d38caf4285965c7a247e026fa7c"; }; catalog = ./docbook-ebnf.cat; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix index b4f02a127c0..9f5cc3a63e6 100644 --- a/pkgs/development/beam-modules/hex-registry-snapshot.nix +++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix @@ -20,4 +20,8 @@ stdenv.mkDerivation rec { setupHook = writeText "setupHook.sh" '' export HEX_REGISTRY_SNAPSHOT="$1/var/hex/registry.ets" ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/compilers/jikes/default.nix b/pkgs/development/compilers/jikes/default.nix index b278bdfc494..1423bc8d51e 100644 --- a/pkgs/development/compilers/jikes/default.nix +++ b/pkgs/development/compilers/jikes/default.nix @@ -6,4 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/jikes/jikes-1.22.tar.bz2; md5 = "cda958c7fef6b43b803e1d1ef9afcb85"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix index 00d3075df3c..105844887f1 100644 --- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -4,4 +4,8 @@ url = http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz ; md5 = "827b54ace4e2d3c8e7605ea149b34293"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index a2581f29a3f..fd684fd93e8 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -12,4 +12,8 @@ stdenv.mkDerivation { configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; buildFlags = ["world" "bootstrap" "opt"]; checkTarget = ["opt.opt"]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix index 960cd86ec27..46dedb36de9 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix @@ -27,4 +27,8 @@ stdenv.mkDerivation rec { ''; makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1"; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index d90dae2dee0..a48de9a03f2 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { }; buildInputs = [m4]; configureFlags = "--disable-optimized --enable-static"; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/breakpad/default.nix b/pkgs/development/libraries/breakpad/default.nix index 9ae4f89bfc3..7f3117fac42 100644 --- a/pkgs/development/libraries/breakpad/default.nix +++ b/pkgs/development/libraries/breakpad/default.nix @@ -21,4 +21,8 @@ stdenv.mkDerivation { cp -r $breakpad_lss src/third_party/lss chmod +w -R src/third_party/lss ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index fb290cbcbeb..5a879e04c7d 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation { }; buildInputs = [libxml2 openssl bzip2]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index 725539a8131..4abd96fa3ce 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -6,4 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/giflib/libungif-4.1.4.tar.gz; sha256 = "5e65e1e5deacd0cde489900dbf54c6c2ee2ebc818199e720dbad685d87abda3d"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 0e659fb074b..20c79d7202e 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -46,4 +46,8 @@ stdenv.mkDerivation { passthru = { inherit gtk; }; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 380c43108de..9fb99c3f27e 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -45,4 +45,8 @@ stdenv.mkDerivation { passthru = { inherit gtk3; }; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix index b54f3cc2f61..512d443f9fc 100644 --- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix +++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix @@ -14,4 +14,8 @@ stdenv.mkDerivation { ]; inherit monoDLLFixer; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 030375938a6..daf400fdc5a 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation { }; buildInputs = [aspell pkgconfig gtk enchant intltool]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 9f880e3ea9f..199ac7c902b 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -14,4 +14,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index 0ea2949659c..cb83322ebb6 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -19,4 +19,7 @@ stdenv.mkDerivation rec { cp -v ${./CMakeLists.txt} CMakeLists.txt ''; + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index d8193926fef..e99fc2ca3f9 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation { --x-libraries=${libX11}/lib"; buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/aterm/default.nix b/pkgs/development/libraries/java/aterm/default.nix index 5a3f735b43a..f643c607cbd 100644 --- a/pkgs/development/libraries/java/aterm/default.nix +++ b/pkgs/development/libraries/java/aterm/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation { md5 = "abf475dae2f5efca865fcdff871feb5e"; }; buildInputs = [stdenv jdk sharedobjects jjtraveler]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 7b55f8b15a2..8ca3bf1cd34 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation { -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile ''; maintainers = [ stdenv.lib.maintainers.sander ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix index 034ac9afb26..b9d66fdc971 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar; sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix index de638ce9185..b182964f657 100644 --- a/pkgs/development/libraries/java/gwt-widgets/default.nix +++ b/pkgs/development/libraries/java/gwt-widgets/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz; sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 695616eca51..ad849a4d6d5 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -13,4 +13,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index 73eb33df812..221a2e93e4f 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { }; inherit unzip; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index c54c3f3a8ee..7d1fac39b1c 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation rec { mkdir -p $out/share/java cp -v *.jar $out/share/java ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/javasvn/default.nix b/pkgs/development/libraries/java/javasvn/default.nix index 2c43ba7043b..b698de6d5a7 100644 --- a/pkgs/development/libraries/java/javasvn/default.nix +++ b/pkgs/development/libraries/java/javasvn/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { }; inherit unzip; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 5211156fe7e..9f0440f0304 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz; md5 = "ce29ecc05d63fdb419737fd00c04c281"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/jjtraveler/default.nix b/pkgs/development/libraries/java/jjtraveler/default.nix index cb359fd9492..b9dc1d68860 100644 --- a/pkgs/development/libraries/java/jjtraveler/default.nix +++ b/pkgs/development/libraries/java/jjtraveler/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation { md5 = "35bf801ee61f042513ae88247fe1bf1d"; }; buildInputs = [stdenv jdk]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 3924b0cdc22..df4a19efd2c 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { PREFIX=''''${out}''; buildInputs = [ jdk ]; maintainers = [ stdenv.lib.maintainers.sander ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix index 76e08696b0c..d6e26a02d67 100644 --- a/pkgs/development/libraries/java/lucene/default.nix +++ b/pkgs/development/libraries/java/lucene/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { url = http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/lucene-1.4.1.tar.gz; md5 = "656a6f40f5b8f7d2e19453436848bfe8"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index 80afb0689b9..5681200c4fa 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar; md5 = "a0e11423bd5fcbb6ea65753643ea8852"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index b333624100c..464776569cb 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { inherit unzip; buildInputs = [unzip]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix index bf1ee340d46..7f1f0e260c0 100644 --- a/pkgs/development/libraries/java/saxon/default8.nix +++ b/pkgs/development/libraries/java/saxon/default8.nix @@ -19,4 +19,8 @@ exec ${jre}/bin/java -jar $out/saxon8.jar \"\\$@\" EOF chmod a+x $out/bin/saxon8 "; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/shared-objects/default.nix b/pkgs/development/libraries/java/shared-objects/default.nix index c0f12248b3c..9453aa0635c 100644 --- a/pkgs/development/libraries/java/shared-objects/default.nix +++ b/pkgs/development/libraries/java/shared-objects/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation { md5 = "c1f2c58bd1a07be32da8a6b89354a11f"; }; buildInputs = [stdenv jdk]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index 9d1d8f53533..081bcccdd7d 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_4_1.tar.gz; sha256 = "13jm93b0dsfxr62brq1hagi9fqk7ip3pi80svq10zh5kcpk77jf4"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index 67263d5ff5e..04e8eab4d28 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation rec { ./c-render_table_crash.patch ./c-xpmpipethrough.patch ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 2e2bdb11d50..e410b6d4aa5 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -24,4 +24,8 @@ stdenv.mkDerivation rec { ''; NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46 + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index 44b8d47b5e3..d2e4fe90d2c 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index a04815df490..aca2d056f8f 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -6,4 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz ; md5 = "63b49cf14d53eed31e7a87cca17a3963" ; }; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 60995046982..25c5a6d683d 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -27,4 +27,8 @@ stdenv.mkDerivation rec { libjpeg libpng libXrender libexif ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index e430dc967f8..ac5b4dec07b 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig perl intltool gobjectIntrospection ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 970a7a87497..08d80bcf985 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpng jasper ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libjpeg/62.nix b/pkgs/development/libraries/libjpeg/62.nix index fb92fe995b6..40e2ae62de7 100644 --- a/pkgs/development/libraries/libjpeg/62.nix +++ b/pkgs/development/libraries/libjpeg/62.nix @@ -26,4 +26,8 @@ stdenv.mkDerivation { md5 = "092a12aeb0c386dd7dae059109d950ba"; }) ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 23083ec77ac..a5db2d23572 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -31,4 +31,8 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ./sharedlib.patch]; buildInputs = [m4]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index 2916b00eea7..64cf460d75a 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -6,4 +6,8 @@ stdenv.mkDerivation { url = http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; md5 = "7f7a060e83b4278acf4b77d7a7b9d2c0"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix index 77fe3403de7..703c5e36b8b 100644 --- a/pkgs/development/libraries/libmsn/default.nix +++ b/pkgs/development/libraries/libmsn/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation rec { }; patches = [ ./fix-ftbfs-gcc4.7.diff ]; buildInputs = [ cmake openssl ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 0f080850639..76452af0c47 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ] # now some optional deps, but many more are possible ++ [ glib ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index fa272f2ec6f..3e4fe99df4c 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cracklib python ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 6147e847b33..d6a527ea315 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -52,4 +52,8 @@ stdenv.mkDerivation rec { cat ${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache rm $GDK_PIXBUF/loaders.cache.tmp ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libtunepimp/default.nix b/pkgs/development/libraries/libtunepimp/default.nix index e1279a56667..0d929941044 100644 --- a/pkgs/development/libraries/libtunepimp/default.nix +++ b/pkgs/development/libraries/libtunepimp/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation rec { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; sha256 = "0s141zmsxv8xlivcgcmy6xhk9cyjjxmr1fy45xiqfqrqpsh485rl"; }; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index b1872779b70..d5f08537e5b 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2; sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0"; }; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index a763af96667..20502e297bf 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -15,4 +15,8 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ libX11 gtk3 ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 536db35fb4e..49012f8bddf 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; nativeBuildInputs = [ pkgconfig bzip2 ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 22657cf3899..d9bac46230a 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; sourceRoot = "zlib-${zlib.version}/contrib/minizip"; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index 5f19fe2d1b2..1e868b79ce6 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -14,4 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig]; configureFlags = "ILBC_LIBS=ilbc ILBC_CFLAGS=-I${ilbc}/include"; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 70426c00237..06137bdad1f 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -28,4 +28,8 @@ in stdenv.mkDerivation rec { "--enable-shared" ] ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" ]); + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/opencl-icd/default.nix b/pkgs/development/libraries/opencl-icd/default.nix index 9f556739ae6..5cf144e198b 100644 --- a/pkgs/development/libraries/opencl-icd/default.nix +++ b/pkgs/development/libraries/opencl-icd/default.nix @@ -12,4 +12,7 @@ in stdenv.mkDerivation { sha256 = "1rgaixwnxmrq2aq4kcdvs0yx7i6krakarya9vqs7qwsv5hzc32hc"; }; + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index eeff238fcca..4a98704559b 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -12,4 +12,8 @@ stdenv.mkDerivation { glib pango ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 4ebb0cbcc26..52c785becc5 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -29,4 +29,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp exe/* $out/bin ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 89cf865be25..c8b01c46080 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -33,4 +33,8 @@ stdenv.mkDerivation { else "install"; buildInputs = [ gfortran openblas ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 3b6d2a3cc69..e7b4b907df9 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -69,4 +69,8 @@ stdenv.mkDerivation { ]; passthru = {inherit mysqlSupport;}; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix index 0245b47815e..a81ba17a3f5 100644 --- a/pkgs/development/libraries/sdformat/default.nix +++ b/pkgs/development/libraries/sdformat/default.nix @@ -20,4 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake boost ruby ignition.math2 tinyxml ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 950d1302dad..9fe88b771be 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib openssl ]; nativeBuildInputs = [ pkgconfig ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index e1a62607103..c6f3d68ebd6 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -29,4 +29,7 @@ stdenv.mkDerivation { postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 882116bd3f1..0059243890d 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 88eecd0703c..aed08435a14 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -11,4 +11,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus_glib telepathy_glib farstream ]; nativeBuildInputs = [ pkgconfig ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 29fa2739f24..6c77f6a004a 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -8,4 +8,8 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 97c02fb0397..5700a7d144e 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -7,4 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; }; + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index ffc58d9ad4b..049c54d792b 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -14,4 +14,8 @@ stdenv.mkDerivation { } // { # For compatability with XFree86. buildClientLibs = true; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 457dbdb8a85..fd11add80c7 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -77,4 +77,8 @@ stdenv.mkDerivation rec { wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}" done ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 0c09dc80926..86af875fa4d 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -232,4 +232,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ unzip makeWrapper ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix index d4402ec9ebd..1bdf61904eb 100644 --- a/pkgs/development/python-modules/pyexiv2/default.nix +++ b/pkgs/development/python-modules/pyexiv2/default.nix @@ -20,4 +20,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ python exiv2 scons boost ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index f282d3d3697..48019c62f3e 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation { patches = [ ./codegendir.patch ]; buildInputs = [ python pkgconfig pygobject glib pygtk gnome2.gtksourceview ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index b4b4c562873..3b9a9b18450 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -15,4 +15,8 @@ stdenv.mkDerivation { --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" done ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix index b0926a7f531..9422a74aedd 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation { md5 = "0bbd1df101bc0294d440471e50feca71"; }; patches = [./log.patch]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix index a58273e6086..5baa37b93a4 100644 --- a/pkgs/development/tools/build-managers/gnustep/make/default.nix +++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix @@ -31,4 +31,8 @@ stdenv.mkDerivation rec { . $out/Library/GNUstep/Makefiles/GNUstep.sh EOF ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index 6e40e4653ac..98ddd9d34e9 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation { md5 = "167fd4e0eea4f49def01984ec203289b"; }; builder = ./builder.sh; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 4f8691c40ad..756da8a8539 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -22,4 +22,8 @@ stdenv.mkDerivation { done ''; patches = [ ./no-FAQ.patch ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index bcdba402b2e..b7b42b59653 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -16,4 +16,8 @@ stdenv.mkDerivation { ''; dontStrip = true; postFixup = "wrapProgram $out/bin/sqitch --prefix PERL5LIB : $PERL5LIB"; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix index 72551e27fcf..435cf2e0c9a 100644 --- a/pkgs/misc/phabricator/default.nix +++ b/pkgs/misc/phabricator/default.nix @@ -25,4 +25,8 @@ stdenv.mkDerivation rec { cp -R ${srcArcanist} $out/arcanist cp -R ${srcPhabricator} $out/phabricator ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index cfb71690ad5..9bcfcf392f4 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { }; buildPhase = "rm *.o 915resolution; make"; installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/"; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index 440f99b0ad6..6f11a3bb7a7 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation { }; buildInputs = [zlib]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index a4c7f644be1..236f27765f8 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -44,4 +44,8 @@ stdenv.mkDerivation rec { ln -sv $file $out/lib/klibc/include done ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index 2ce833d104f..f01f3b6a4ec 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -21,4 +21,8 @@ stdenv.mkDerivation { done ''; # */ allowedReferences = ["out"]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/libnscd/default.nix b/pkgs/os-specific/linux/libnscd/default.nix index 0911044f2a6..a2dd25206cb 100644 --- a/pkgs/os-specific/linux/libnscd/default.nix +++ b/pkgs/os-specific/linux/libnscd/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation { url = http://ftp.suse.com/pub/people/kukuk/libnscd/libnscd-2.0.2.tar.bz2; sha256 = "0nxhwy42x44jlpdb5xq1prbvfjmds4hplmwv3687z0c4r9rn506l"; }; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index 0a52df0bee7..c82c892c462 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -17,4 +17,8 @@ stdenv.mkDerivation { rm $out/lib/libvolume_id.so.0 cp -f libvolume_id.so.0 $out/lib/ "; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 03a587cdd3e..833c032ccd2 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace Makefile.in --replace /usr "$out" ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index cc0382b58f4..70cbae88d69 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -28,4 +28,8 @@ stdenv.mkDerivation { ''; buildInputs = [ openldap perl ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 807ace86e78..f4043f70030 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -13,4 +13,8 @@ stdenv.mkDerivation { builder = ./builder.sh; neededLibs = map (p: p.out) [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/systemd/libudev.nix b/pkgs/os-specific/linux/systemd/libudev.nix index 60115ddaba5..a22ff806a0e 100644 --- a/pkgs/os-specific/linux/systemd/libudev.nix +++ b/pkgs/os-specific/linux/systemd/libudev.nix @@ -15,4 +15,8 @@ stdenv.mkDerivation { --replace "${systemd}" "$out" sed "/^includedir=/cincludedir=$dev/include" -i "$dev"/lib/pkgconfig/*.pc ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/os-specific/linux/wireless-tools/default.nix index b5f4faadd07..f5a51a4e096 100644 --- a/pkgs/os-specific/linux/wireless-tools/default.nix +++ b/pkgs/os-specific/linux/wireless-tools/default.nix @@ -11,4 +11,8 @@ stdenv.mkDerivation { preBuild = " makeFlagsArray=(PREFIX=$out) "; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index 2fab0fd9910..f7f2f93cf99 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -17,4 +17,8 @@ stdenv.mkDerivation rec { preBuild = "cd fingerd"; preInstall = '' mkdir -p $out/man/man8 $out/sbin ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 17c41a9a4d4..2386acf1b79 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -43,4 +43,8 @@ stdenv.mkDerivation rec { mkdir -pv $out/etc/xinetd.d install -v -m 644 xinetd.d/vsftpd $out/etc/xinetd.d/vsftpd ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index dee2fb3e4ff..61de807d8e8 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ apacheHttpd jdk ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index 8544ce050af..dbc5c73414c 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -6,4 +6,8 @@ stdenv.mkDerivation { builder = ./builder.sh; inherit mysql_jdbc; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index 975d5234aee..3562ea1e129 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -6,4 +6,8 @@ stdenv.mkDerivation { buildInputs = [ mysql_jdbc ]; inherit mysql_jdbc; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 4bb111e1893..deec6589dbb 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -21,4 +21,8 @@ stdenv.mkDerivation rec { cp -a {bin,docs,etc,lib,sbin,share} $out find $out -name '*.in' -exec rm '{}' \; ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index e6c66707c4e..3fb0c1e86eb 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { }; buildInputs = [ unzip ant ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index e30badd0a85..b0d017acf84 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -16,4 +16,8 @@ stdenv.mkDerivation { '' + lib.optionalString (virtualglLib_i686 != null) '' ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index ca010063cb1..758bf1729b1 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation { preInstall = "echo -e 'install:\n mkdir \${out}/bin;\n cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; "; buildInputs = [ libX11 libXtst xextproto libXi inputproto ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 2f18f678483..2bd6392456e 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig xorg.libX11 xorg.libXres xorg.libXext ncurses ]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 90832fc50b1..1897181e444 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation { sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; buildInputs = [fuse curl pkgconfig glib zlib]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index d2c2f30d6fc..a99e42891b6 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -24,4 +24,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp glxinfo glxgears $out/bin/ "; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index f540029cbc7..3e8e824d1c6 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -27,4 +27,8 @@ stdenv.mkDerivation rec { gensvgPatch = ./patch-fig2dev-dev-gensvg.c; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index fa03962bcdc..8bba00b564d 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -15,4 +15,8 @@ stdenv.mkDerivation { ''; dontInstall = true; dontPatchShebangs = true; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index 2030463885c..9ab9478e543 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -14,4 +14,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp dmg2img $out/bin ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 1f0b42b62b6..516abfd2eb5 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation rec { sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; }; makeFlags = "DESTDIR=$(out)"; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index ed4cde69eda..8221bec6cca 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { preBuild = '' export buildFlags=CC="$CC" # for darwin ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 3fe0f409f29..b95b95e4379 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -8,4 +8,8 @@ stdenv.mkDerivation { }; buildInputs = [xlibsWrapper]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index b7f8e4b2106..838831faaaf 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -20,4 +20,8 @@ stdenv.mkDerivation { --set FONTCONFIG_FILE "${fontsConf}" \ --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]} ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 808c738110e..25f795d52c2 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -17,4 +17,8 @@ stdenv.mkDerivation rec { preBuild = "cd finger"; preInstall = '' mkdir -p $out/man/man1 $out/bin ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix index 43e48e9a4cd..2160bdda9e1 100644 --- a/pkgs/tools/networking/openconnect.nix +++ b/pkgs/tools/networking/openconnect.nix @@ -30,4 +30,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 246a32f134c..4fcfc251f3f 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -9,4 +9,8 @@ stdenv.mkDerivation { }; # buildInputs = [unzip]; inherit jdk swt; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index e2e0880114f..7c47f2762dd 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -26,4 +26,8 @@ stdenv.mkDerivation { installTargets = [ "install" "install-sendmail" ]; buildInputs = stdenv.lib.optional tlsSupport openssl; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 99fde387129..5d31d35bd63 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -17,4 +17,8 @@ stdenv.mkDerivation { buildInputs = [zlib libpng gd geoip db]; configureFlags = "--enable-dns --enable-geoip --disable-static --enable-shared"; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix index cc0cc620d27..069c040f8ee 100644 --- a/pkgs/tools/networking/weighttp/default.nix +++ b/pkgs/tools/networking/weighttp/default.nix @@ -15,4 +15,8 @@ stdenv.mkDerivation rec { python waf build python waf install ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index 50eb6750a45..bd94c6786d7 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j"; }; buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index d875413cc79..7ff19c212e8 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -17,4 +17,8 @@ stdenv.mkDerivation { ${coreutils}/bin/ln -s gpg2 $out/bin/gpg ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix index 4017aa4f9f1..8b2a60fd765 100644 --- a/pkgs/tools/security/mktemp/default.nix +++ b/pkgs/tools/security/mktemp/default.nix @@ -11,4 +11,7 @@ stdenv.mkDerivation { sha256 = "1nfj89b0dv1c2fyqi1pg54fyzs3462cbp7jv7lskqsxvqy4mh9x1"; }; + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index a565c3b96e1..813c7e5c06c 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -39,4 +39,8 @@ in stdenv.mkDerivation { mkdir -p $out/bin mv mpw $out/bin/mpw ''; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/text/xml/sablotron/default.nix b/pkgs/tools/text/xml/sablotron/default.nix index a523ebe954c..aeb07d451bf 100644 --- a/pkgs/tools/text/xml/sablotron/default.nix +++ b/pkgs/tools/text/xml/sablotron/default.nix @@ -7,4 +7,8 @@ stdenv.mkDerivation { md5 = "72654c4b832e7562f8240ea675577f5e"; }; buildInputs = [expat]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index 936e4a31af1..844eadc4440 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -14,4 +14,8 @@ stdenv.mkDerivation { mkdir -p $out/share/texmf-nix/tex/generic/lkproof cp -prd *.sty $out/share/texmf-nix/tex/generic/lkproof "; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index d7c03967b0b..2fe3daee699 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -18,4 +18,8 @@ stdenv.mkDerivation { mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 5f118e636b8..7bd34f40250 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -36,4 +36,8 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/xmlroff/"; patches = [./xmlroff.patch]; + + meta = { + platforms = stdenv.lib.platforms.unix; + }; } From 63de40099f085b20f5607db530592bbea2492da1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 19:19:16 +0300 Subject: [PATCH 020/168] treewide: Move some meta sections to end-of-file That seems to be the overwhelming convention. --- .../networking/p2p/mldonkey/default.nix | 10 ++-- .../libraries/libctemplate/2.2.nix | 18 +++---- .../libraries/libmhash/default.nix | 26 +++++----- .../tools/misc/checkbashisms/default.nix | 12 ++--- pkgs/tools/security/steghide/default.nix | 47 +++++++++---------- pkgs/tools/typesetting/tex/auctex/default.nix | 10 ++-- 6 files changed, 61 insertions(+), 62 deletions(-) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index f2c17199f2a..280a0468753 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation (rec { name = "mldonkey-3.1.5"; - + src = fetchurl { url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl"; }; - + + buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ]; + configureFlags = [ "--disable-gui" ]; + meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = http://mldonkey.sourceforge.net/; license = stdenv.lib.licenses.gpl2; }; - - buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ]; - configureFlags = [ "--disable-gui" ]; } // (if !ocaml.nativeCompilers then { # Byte code compilation (the ocaml opt compiler is not supported in some platforms) diff --git a/pkgs/development/libraries/libctemplate/2.2.nix b/pkgs/development/libraries/libctemplate/2.2.nix index 36652f7abc7..4851dbf3c54 100644 --- a/pkgs/development/libraries/libctemplate/2.2.nix +++ b/pkgs/development/libraries/libctemplate/2.2.nix @@ -1,6 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { + pname = "ctemplate"; + version = "2.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://ctemplate.googlecode.com/files/${name}.tar.gz"; + sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4"; + }; + meta = { description = "A simple but powerful template language for C++"; longDescription = '' @@ -10,13 +19,4 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/google-ctemplate/; license = "bsd"; }; - - pname = "ctemplate"; - version = "2.2"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://ctemplate.googlecode.com/files/${name}.tar.gz"; - sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4"; - }; } diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index 565340ac271..256220fa211 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -1,6 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { + pname = "mhash"; + version = "0.9.9.9"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; + }; + + dontDisableStatic = true; + + patches = [ ./autotools-define-conflict-debian-fix.patch ]; + meta = { description = "Hash algorithms library"; longDescription = '' @@ -12,17 +25,4 @@ stdenv.mkDerivation rec { homepage = http://mhash.sourceforge.net; license = "LGPL"; }; - - pname = "mhash"; - version = "0.9.9.9"; - name = "${pname}-${version}"; - - dontDisableStatic = true; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; - }; - - patches = [ ./autotools-define-conflict-debian-fix.patch ]; } diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 1585b126961..338585122a5 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -10,12 +10,6 @@ stdenv.mkDerivation rec { sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd"; }; - meta = { - homepage = http://sourceforge.net/projects/checkbaskisms/; - description = "Check shell scripts for non-portable syntax"; - license = stdenv.lib.licenses.gpl2; - }; - # The link returns directly the script. No need for unpacking unpackPhase = "true"; @@ -29,4 +23,10 @@ stdenv.mkDerivation rec { fixupPhase = '' sed -e "s#/usr/bin/perl#$perl/bin/perl#" -i $out/bin/checkbashisms ''; + + meta = { + homepage = http://sourceforge.net/projects/checkbaskisms/; + description = "Check shell scripts for non-portable syntax"; + license = stdenv.lib.licenses.gpl2; + }; } diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index 03e8c727022..5d5e0fb4afc 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -1,30 +1,29 @@ { stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}: - stdenv.mkDerivation rec { - buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; - version = "0.5.1"; - name = "steghide-${version}"; +stdenv.mkDerivation rec { + buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; + version = "0.5.1"; + name = "steghide-${version}"; - meta = with stdenv.lib; { - homepage = http://steghide.sourceforge.net/; - description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; - license = licenses.gpl2; - }; + src = fetchurl { + url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ; + sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b"; + }; - src = fetchurl { - url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ; - sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b"; - }; + patches = [ + ./patches/steghide-0.5.1-gcc34.patch + ./patches/steghide-0.5.1-gcc4.patch + ./patches/steghide-0.5.1-gcc43.patch + ]; - patches = [ - ./patches/steghide-0.5.1-gcc34.patch - ./patches/steghide-0.5.1-gcc4.patch - ./patches/steghide-0.5.1-gcc43.patch - ]; + # AM_CXXFLAGS needed for automake + preConfigure = '' + export AM_CXXFLAGS="$CXXFLAGS -std=c++0x" + ''; - # AM_CXXFLAGS needed for automake - preConfigure = '' - export AM_CXXFLAGS="$CXXFLAGS -std=c++0x" - ''; - - } + meta = with stdenv.lib; { + homepage = http://steghide.sourceforge.net/; + description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 0d2282a4fd8..7707bece0ba 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -12,11 +12,6 @@ let auctex = stdenv.mkDerivation ( rec { outputs = [ "out" "tex" ]; - meta = { - description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; - homepage = http://www.gnu.org/software/auctex; - }; - src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq"; @@ -32,6 +27,11 @@ let auctex = stdenv.mkDerivation ( rec { "--with-lispdir=\${out}/share/emacs/site-lisp" "--with-texmf-dir=\${tex}" ]; + + meta = { + description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; + homepage = http://www.gnu.org/software/auctex; + }; }); in auctex // { pkgs = [ auctex.tex ]; } From 102ffa6be7de5e2e24142c3e10653f8f91d1564e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 19:38:04 +0300 Subject: [PATCH 021/168] treewide: Wrap some really long package descriptions --- pkgs/applications/science/biology/mrbayes/default.nix | 10 +++++++++- pkgs/development/libraries/fcppt/default.nix | 6 +++++- pkgs/misc/emulators/snes9x-gtk/default.nix | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 78295faf69a..70e3da696b4 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -13,7 +13,15 @@ stdenv.mkDerivation rec { meta = { description = "Bayesian Inference of Phylogeny"; - longDescription = ''Bayesian inference of phylogeny is based upon a quantity called the posterior probability distribution of trees, which is the probability of a tree conditioned on the observations. The conditioning is accomplished using Bayes's theorem. The posterior probability distribution of trees is impossible to calculate analytically; instead, MrBayes uses a simulation technique called Markov chain Monte Carlo (or MCMC) to approximate the posterior probabilities of trees.''; + longDescription = '' + Bayesian inference of phylogeny is based upon a + quantity called the posterior probability distribution of trees, which is + the probability of a tree conditioned on the observations. The conditioning + is accomplished using Bayes's theorem. The posterior probability + distribution of trees is impossible to calculate analytically; instead, + MrBayes uses a simulation technique called Markov chain Monte Carlo (or + MCMC) to approximate the posterior probabilities of trees. + ''; license = "GPL2"; homepage = http://mrbayes.csit.fsu.edu/; }; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 5f7d61f3601..38b306b577f 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { meta = { description = "Freundlich's C++ toolkit"; longDescription = '' - Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on improving general C++ code by providing better types, a strong focus on C++11 (non-conforming compilers are mostly not supported) and functional programming (which is both efficient and syntactically affordable in C++11). + Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on + improving general C++ code by providing better types, a strong focus on + C++11 (non-conforming compilers are mostly not supported) and functional + programming (which is both efficient and syntactically affordable in + C++11). ''; homepage = http://fcppt.org; license = stdenv.lib.licenses.boost; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index e5cd08b7f9d..46b1c51dca5 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -22,7 +22,12 @@ stdenv.mkDerivation rec { meta = { description = "A portable, freeware Super Nintendo Entertainment System (SNES) emulator"; - longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan."; + longDescription = '' + Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) + emulator. It basically allows you to play most games designed for the SNES + and Super Famicom Nintendo game systems on your PC or Workstation; which + includes some real gems that were only ever released in Japan. + ''; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.qknight ]; homepage = http://www.snes9x.com/; From 898c3436f3fb4d9ef3c79e5fc4820d0d4ebdc4bc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 19:38:21 +0300 Subject: [PATCH 022/168] kcov: Fix indentation --- pkgs/development/tools/analysis/kcov/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index ffb2896da35..fb68ce5d84b 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,5 @@ {stdenv, fetchurl, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, binutils}: + stdenv.mkDerivation rec { name = "kcov-${version}"; version = "29"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs src/bin-to-c-source.py"; buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ]; - + meta = with stdenv.lib; { description = "Code coverage tester for compiled programs, Python scripts and shell scripts"; @@ -26,6 +27,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.gal_bolle ]; - }; - - } + }; +} From 9b5dcffe22f82f0daebdec6ef7e3dff111a5669f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 19:38:28 +0300 Subject: [PATCH 023/168] retroarch: Propagate meta info to wrapper --- pkgs/misc/emulators/retroarch/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index e6eb930695a..58d41699854 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { preferLocalBuild = true; meta = with retroarch.meta; { - inherit license homepage; + inherit license homepage platforms maintainers; description = description + " (with cores: " + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores)) From 55b23aeff58cd45f6c50905e481af66fed685bf1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 21:30:17 +0300 Subject: [PATCH 024/168] icon-conv-tools: Don't depend on the .nix file at build time The `src = ./.;` would cause spurious rebuild of the package since the output hash now depends on the contents of the .nix file. --- pkgs/build-support/icon-conv-tools/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix index 739ec485159..50c3f5feb0b 100644 --- a/pkgs/build-support/icon-conv-tools/default.nix +++ b/pkgs/build-support/icon-conv-tools/default.nix @@ -3,23 +3,23 @@ stdenv.mkDerivation { name = "icon-conv-tools-0.0.0"; - src = ./.; + src = ./bin; buildInputs = [ icoutils ]; patchPhase = '' - substituteInPlace "./bin/extractWinRscIconsToStdFreeDesktopDir.sh" \ + substituteInPlace extractWinRscIconsToStdFreeDesktopDir.sh \ --replace "icotool" "${icoutils}/bin/icotool" \ --replace "wrestool" "${icoutils}/bin/wrestool" ''; buildPhase = '' mkdir -p "$out/bin" - cp -p "./bin/"* "$out/bin" + cp -p * "$out/bin" ''; installPhase = "true"; - + dontPatchELF = true; dontStrip = true; @@ -27,5 +27,4 @@ stdenv.mkDerivation { description = "Tools for icon conversion specific to nix package manager"; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; }; - -} \ No newline at end of file +} From 21f17d69f61e8239870bf97edf49e594198076a8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 20:50:55 +0300 Subject: [PATCH 025/168] treewide: Add lots of meta.platforms Build-tested on x86_64 Linux & Mac. --- maintainers/scripts/nixpkgs-lint.nix | 1 + pkgs/applications/altcoins/dogecoin.nix | 1 + pkgs/applications/audio/abcde/default.nix | 1 + .../applications/audio/cdparanoia/default.nix | 1 + pkgs/applications/audio/cmus/default.nix | 1 + pkgs/applications/audio/dirt/default.nix | 1 + pkgs/applications/audio/easytag/default.nix | 1 + pkgs/applications/audio/gjay/default.nix | 1 + pkgs/applications/audio/id3v2/default.nix | 1 + pkgs/applications/audio/kid3/default.nix | 1 + pkgs/applications/audio/klick/default.nix | 1 + pkgs/applications/audio/mpg123/default.nix | 1 + pkgs/applications/audio/normalize/default.nix | 1 + .../audio/nova-filters/default.nix | 1 + .../applications/audio/opus-tools/default.nix | 1 + pkgs/applications/audio/rkrlv2/default.nix | 1 + pkgs/applications/backup/areca/default.nix | 1 + pkgs/applications/editors/aewan/default.nix | 1 + pkgs/applications/editors/dhex/default.nix | 1 + pkgs/applications/editors/ed/default.nix | 1 + .../applications/editors/edbrowse/default.nix | 1 + pkgs/applications/editors/edit/default.nix | 1 + pkgs/applications/editors/hexedit/default.nix | 1 + pkgs/applications/editors/joe/default.nix | 1 + pkgs/applications/editors/ne/default.nix | 1 + .../applications/editors/netbeans/default.nix | 1 + pkgs/applications/editors/sigil/default.nix | 1 + .../applications/editors/vbindiff/default.nix | 1 + pkgs/applications/editors/vis/default.nix | 1 + pkgs/applications/editors/wily/default.nix | 1 + .../graphics/autopanosiftc/default.nix | 1 + pkgs/applications/graphics/fbida/default.nix | 1 + .../graphics/fontmatrix/default.nix | 1 + .../applications/graphics/gcolor2/default.nix | 1 + pkgs/applications/graphics/gqview/default.nix | 1 + .../graphics/minidjvu/default.nix | 1 + pkgs/applications/graphics/qiv/default.nix | 1 + .../graphics/screencloud/default.nix | 1 + pkgs/applications/graphics/xaos/default.nix | 1 + .../applications/graphics/xournal/default.nix | 1 + .../graphics/zgrviewer/default.nix | 1 + pkgs/applications/misc/albert/default.nix | 1 + pkgs/applications/misc/audio/soxr/default.nix | 1 + pkgs/applications/misc/cortex/default.nix | 1 + pkgs/applications/misc/eterm/default.nix | 1 + .../misc/garmin-plugin/default.nix | 1 + pkgs/applications/misc/gksu/default.nix | 1 + .../misc/gpscorrelate/default.nix | 1 + pkgs/applications/misc/gxneur/default.nix | 1 + .../misc/j4-dmenu-desktop/default.nix | 1 + pkgs/applications/misc/jigdo/default.nix | 1 + pkgs/applications/misc/jp2a/default.nix | 1 + pkgs/applications/misc/mdp/default.nix | 1 + pkgs/applications/misc/mrxvt/default.nix | 1 + .../applications/misc/nanoblogger/default.nix | 1 + pkgs/applications/misc/pinfo/default.nix | 1 + pkgs/applications/misc/pstree/default.nix | 1 + .../misc/quicksynergy/default.nix | 1 + pkgs/applications/misc/rofi/default.nix | 1 + .../urxvt-font-size/default.nix | 1 + .../urxvt-perl/default.nix | 1 + .../urxvt-perls/default.nix | 1 + .../urxvt-tabbedex/default.nix | 1 + .../urxvt-theme-switch/default.nix | 1 + .../misc/rxvt_unicode/default.nix | 1 + pkgs/applications/misc/stag/default.nix | 1 + pkgs/applications/misc/tangogps/default.nix | 1 + .../misc/thinking-rock/default.nix | 1 + pkgs/applications/misc/viking/default.nix | 1 + pkgs/applications/misc/wmname/default.nix | 7 +++--- pkgs/applications/misc/xchm/default.nix | 1 + pkgs/applications/misc/xcruiser/default.nix | 23 ++++++++++--------- .../misc/xkblayout-state/default.nix | 1 + pkgs/applications/misc/xneur/0.8.nix | 1 + pkgs/applications/misc/ykpers/default.nix | 1 + .../networking/browsers/elinks/default.nix | 1 + .../networking/browsers/lynx/default.nix | 1 + .../mozilla-plugins/mozplugger/default.nix | 1 + .../networking/browsers/w3m/default.nix | 1 + .../networking/dyndns/cfdyndns/default.nix | 1 + .../networking/ids/bro/default.nix | 1 + .../networking/ids/daq/default.nix | 1 + .../networking/ids/snort/default.nix | 1 + .../instant-messengers/amsn/default.nix | 1 + .../bitlbee-facebook/default.nix | 1 + .../bitlbee-steam/default.nix | 1 + .../instant-messengers/gajim/default.nix | 1 + .../instant-messengers/mcabber/default.nix | 1 + .../pidgin-plugins/msn-pecan/default.nix | 1 + .../pidgin-plugins/pidgin-mra/default.nix | 1 + .../purple-vk-plugin/default.nix | 1 + .../pidgin-plugins/skype4pidgin/default.nix | 1 + .../telegram-purple/default.nix | 1 + .../pidgin-plugins/tox-prpl/default.nix | 1 + .../pybitmessage/default.nix | 1 + .../instant-messengers/ricochet/default.nix | 1 + .../networking/iptraf/default.nix | 1 + .../networking/irc/bip/default.nix | 1 + .../networking/irc/ii/default.nix | 1 + .../networking/irc/irssi/otr/default.nix | 1 + .../networking/irc/sic/default.nix | 1 + .../networking/jmeter/default.nix | 1 + .../mailreaders/trojita/default.nix | 1 + .../networking/newsreaders/slrn/default.nix | 1 + .../networking/p2p/frostwire/default.nix | 1 + .../networking/p2p/ldcpp/default.nix | 1 + .../networking/p2p/mldonkey/default.nix | 1 + .../p2p/transmission-remote-cli/default.nix | 1 + .../networking/p2p/tribler/default.nix | 1 + .../networking/p2p/twister/default.nix | 1 + .../networking/remote/freerdp/default.nix | 1 + .../networking/remote/putty/default.nix | 1 + .../networking/sniffers/kismet/default.nix | 1 + pkgs/applications/networking/yafc/default.nix | 1 + .../science/biology/bwa/default.nix | 1 + .../science/biology/mrbayes/default.nix | 1 + .../science/electronics/fritzing/default.nix | 1 + .../science/electronics/qfsm/default.nix | 1 + .../science/geometry/drgeo/default.nix | 1 + .../science/geometry/tetgen/1.4.nix | 1 + .../science/geometry/tetgen/default.nix | 1 + pkgs/applications/science/logic/coq/8.3.nix | 1 + .../science/logic/hol/default.nix | 1 + .../science/logic/isabelle/default.nix | 1 + .../science/logic/logisim/default.nix | 1 + .../science/logic/sad/default.nix | 1 + .../science/math/csdp/default.nix | 1 + .../science/math/jags/default.nix | 1 + .../science/math/msieve/default.nix | 1 + .../science/math/weka/default.nix | 1 + .../science/misc/cytoscape/default.nix | 1 + .../molecular-dynamics/gromacs/default.nix | 1 + .../version-management/bazaar/tools.nix | 1 + .../version-management/cvs2svn/default.nix | 1 + .../git-and-tools/darcs-to-git/default.nix | 1 + .../git-and-tools/fast-export/default.nix | 1 + .../git-and-tools/git-crypt/default.nix | 1 + .../git-remote-gcrypt/default.nix | 1 + .../git-and-tools/git-remote-hg/default.nix | 1 + .../git-and-tools/git-stree/default.nix | 1 + .../git-and-tools/git2cl/default.nix | 1 + .../git-and-tools/hub/default.nix | 1 + .../git-and-tools/svn2git/default.nix | 1 + .../version-management/git-repo/default.nix | 1 + .../version-management/mercurial/default.nix | 1 + .../version-management/tkcvs/default.nix | 1 + pkgs/applications/video/dvdauthor/default.nix | 1 + pkgs/applications/video/dvdbackup/default.nix | 1 + pkgs/applications/video/kino/default.nix | 1 + pkgs/applications/video/kodi/wrapper.nix | 1 + pkgs/applications/video/lxdvdrip/default.nix | 1 + .../applications/video/obs-studio/default.nix | 1 + .../applications/video/tivodecode/default.nix | 3 ++- pkgs/applications/video/xine-ui/default.nix | 1 + .../virtualization/virtinst/default.nix | 1 + .../window-managers/fvwm/default.nix | 1 + .../window-managers/larswm/default.nix | 1 + .../window-managers/matchbox/default.nix | 1 + .../window-managers/windowmaker/default.nix | 1 + .../windowmaker/dockapps/wmcalclock.nix | 1 + .../windowmaker/dockapps/wmsystemtray.nix | 1 + .../window-managers/wmii-hg/default.nix | 1 + .../build-support/icon-conv-tools/default.nix | 1 + .../documentation/man-pages-posix/default.nix | 1 + pkgs/data/documentation/man-pages/default.nix | 1 + .../documentation/std-man-pages/default.nix | 1 + pkgs/data/fonts/arkpandora/default.nix | 1 + pkgs/data/fonts/baekmuk-ttf/default.nix | 1 + pkgs/data/fonts/bakoma-ttf/default.nix | 1 + pkgs/data/fonts/clearlyU/default.nix | 1 + pkgs/data/fonts/dosemu-fonts/default.nix | 1 + pkgs/data/fonts/gdouros/default.nix | 1 + pkgs/data/fonts/inconsolata/lgc.nix | 1 + pkgs/data/fonts/ipaexfont/default.nix | 1 + pkgs/data/fonts/ipafont/default.nix | 1 + pkgs/data/fonts/junicode/default.nix | 1 + pkgs/data/fonts/kawkab-mono/default.nix | 1 + pkgs/data/fonts/kochi-substitute/default.nix | 1 + pkgs/data/fonts/lmodern/default.nix | 1 + pkgs/data/fonts/lmodern/lmmath.nix | 1 + pkgs/data/fonts/lohit-fonts/default.nix | 1 + pkgs/data/fonts/nerdfonts/default.nix | 1 + .../fonts/redhat-liberation-fonts/default.nix | 1 + pkgs/data/fonts/source-han-sans/default.nix | 1 + pkgs/data/fonts/tipa/default.nix | 1 + pkgs/data/fonts/vista-fonts/default.nix | 1 + pkgs/data/misc/media-player-info/default.nix | 1 + pkgs/data/misc/miscfiles/default.nix | 1 + pkgs/data/misc/shared-mime-info/default.nix | 1 + .../misc/sound-theme-freedesktop/default.nix | 1 + .../schemas/xml-dtd/xhtml1/default.nix | 1 + pkgs/desktops/xfce/applications/terminal.nix | 1 + pkgs/desktops/xfce/core/libxfcegui4.nix | 1 + pkgs/desktops/xfce/core/xfce4-dev-tools.nix | 1 + .../arduino/platformio/chrootenv.nix | 11 +++++---- .../compilers/adobe-flex-sdk/default.nix | 1 + .../compilers/arachne-pnr/default.nix | 1 + pkgs/development/compilers/as31/default.nix | 1 + .../development/compilers/aspectj/default.nix | 1 + .../development/compilers/cmdstan/default.nix | 1 + pkgs/development/compilers/cmucl/binary.nix | 1 + pkgs/development/compilers/dev86/default.nix | 1 + pkgs/development/compilers/gwt/2.4.0.nix | 1 + pkgs/development/compilers/iasl/default.nix | 1 + pkgs/development/compilers/ocaml/3.10.0.nix | 1 + pkgs/development/compilers/opendylan/bin.nix | 1 + pkgs/development/compilers/ponyc/default.nix | 1 + .../development/compilers/serpent/default.nix | 1 + pkgs/development/compilers/yosys/default.nix | 1 + .../guile-modules/guile-cairo/default.nix | 1 + .../guile-modules/guile-gnome/default.nix | 1 + .../interpreters/ceptre/default.nix | 1 + .../interpreters/clojure/default.nix | 1 + .../interpreters/falcon/default.nix | 1 + .../interpreters/groovy/default.nix | 1 + .../interpreters/gtk-server/default.nix | 1 + pkgs/development/interpreters/guile/1.8.nix | 1 + .../interpreters/jruby/default.nix | 1 + .../interpreters/lolcode/default.nix | 1 + pkgs/development/interpreters/lua-5/5.0.3.nix | 1 + pkgs/development/interpreters/pixie/dust.nix | 1 + .../interpreters/qnial/default.nix | 1 + .../interpreters/rascal/default.nix | 1 + .../interpreters/scheme48/default.nix | 1 + .../development/interpreters/scsh/default.nix | 1 + .../interpreters/spidermonkey/17.0.nix | 1 + .../interpreters/spidermonkey/185-1.0.0.nix | 1 + .../interpreters/spidermonkey/24.2.nix | 1 + .../interpreters/spidermonkey/31.5.nix | 1 + .../libraries/SDL2_mixer/default.nix | 1 + .../libraries/SDL2_ttf/default.nix | 1 + .../development/libraries/SDL_net/default.nix | 1 + .../libraries/SDL_sound/default.nix | 1 + pkgs/development/libraries/Xaw3d/default.nix | 1 + pkgs/development/libraries/a52dec/default.nix | 1 + .../libraries/aacskeys/default.nix | 1 + pkgs/development/libraries/aalib/default.nix | 1 + .../libraries/accounts-qt/default.nix | 1 + .../libraries/accountsservice/default.nix | 1 + pkgs/development/libraries/agg/default.nix | 1 + .../libraries/apache-activemq/default.nix | 1 + .../libraries/apr-util/default.nix | 1 + pkgs/development/libraries/asio/default.nix | 1 + pkgs/development/libraries/atkmm/default.nix | 1 + .../libraries/audio/libbs2b/default.nix | 1 + pkgs/development/libraries/babl/default.nix | 1 + .../libraries/biblesync/default.nix | 1 + .../libraries/bullet/bullet283.nix | 1 + pkgs/development/libraries/bullet/default.nix | 1 + .../development/libraries/bwidget/default.nix | 1 + .../development/libraries/cairomm/default.nix | 1 + pkgs/development/libraries/catch/default.nix | 1 + .../libraries/ceres-solver/default.nix | 1 + .../development/libraries/cfitsio/default.nix | 1 + pkgs/development/libraries/chmlib/default.nix | 1 + pkgs/development/libraries/cl/default.nix | 1 + .../libraries/classads/default.nix | 1 + .../libraries/clucene-core/2.x.nix | 1 + .../libraries/clucene-core/default.nix | 1 + pkgs/development/libraries/cmark/default.nix | 1 + .../libraries/cminpack/default.nix | 1 + .../development/libraries/confuse/default.nix | 1 + .../development/libraries/cpptest/default.nix | 1 + pkgs/development/libraries/ctpp2/default.nix | 1 + .../libraries/dbus-glib/default.nix | 1 + .../libraries/despotify/default.nix | 1 + .../development/libraries/dotconf/default.nix | 1 + .../libraries/drumstick/default.nix | 1 + pkgs/development/libraries/eigen/2.0.nix | 1 + .../development/libraries/enchant/default.nix | 1 + pkgs/development/libraries/esdl/default.nix | 1 + .../libraries/eventlog/default.nix | 1 + pkgs/development/libraries/exosip/3.x.nix | 1 + pkgs/development/libraries/exosip/default.nix | 1 + pkgs/development/libraries/facile/default.nix | 1 + .../libraries/farsight2/default.nix | 1 + .../libraries/farstream/default.nix | 1 + .../libraries/fastjson/default.nix | 1 + pkgs/development/libraries/fcppt/default.nix | 1 + pkgs/development/libraries/ffms/default.nix | 1 + .../libraries/freealut/default.nix | 1 + .../development/libraries/fribidi/default.nix | 1 + .../libraries/funambol/default.nix | 1 + .../libraries/garmintools/default.nix | 1 + pkgs/development/libraries/gegl/3.0.nix | 1 + pkgs/development/libraries/giblib/default.nix | 1 + pkgs/development/libraries/giflib/4.1.nix | 1 + pkgs/development/libraries/gloox/default.nix | 1 + pkgs/development/libraries/gmime/default.nix | 1 + pkgs/development/libraries/gmm/default.nix | 1 + pkgs/development/libraries/gmock/default.nix | 1 + .../libraries/goocanvas/default.nix | 1 + pkgs/development/libraries/gsl/default.nix | 1 + pkgs/development/libraries/gsl/gsl-1_16.nix | 1 + .../gstreamer/legacy/gnonlin/default.nix | 1 + .../gstreamer/legacy/gst-ffmpeg/default.nix | 1 + .../gstreamer/legacy/gst-python/default.nix | 1 + .../gstreamer/legacy/gstreamer/default.nix | 1 + .../libraries/gtkimageview/default.nix | 1 + pkgs/development/libraries/hamlib/default.nix | 1 + pkgs/development/libraries/hawknl/default.nix | 1 + .../libraries/http-parser/default.nix | 1 + .../development/libraries/incrtcl/default.nix | 1 + .../libraries/iniparser/default.nix | 1 + .../libraries/irrlicht/default.nix | 1 + .../libraries/irrlicht/irrlicht3843.nix | 1 + pkgs/development/libraries/jama/default.nix | 3 ++- pkgs/development/libraries/jasper/default.nix | 1 + .../libraries/java/classpath/default.nix | 1 + .../libraries/java/commons/bcel/default.nix | 1 + .../libraries/java/commons/bsf/default.nix | 1 + .../java/commons/compress/default.nix | 1 + .../java/commons/fileupload/default.nix | 1 + .../libraries/java/commons/io/default.nix | 1 + .../libraries/java/commons/lang/default.nix | 1 + .../java/commons/logging/default.nix | 1 + .../libraries/java/commons/math/default.nix | 1 + .../libraries/java/geoipjava/default.nix | 1 + .../libraries/java/jflex/default.nix | 1 + .../libraries/java/jzmq/default.nix | 1 + .../libraries/java/rhino/default.nix | 1 + .../libraries/java/swt/default.nix | 1 + .../libraries/jbig2dec/default.nix | 1 + .../libraries/json-glib/default.nix | 1 + pkgs/development/libraries/judy/default.nix | 1 + pkgs/development/libraries/lcms/default.nix | 1 + .../libraries/leptonica/default.nix | 1 + pkgs/development/libraries/levmar/default.nix | 1 + pkgs/development/libraries/lib3ds/default.nix | 1 + .../development/libraries/libaacs/default.nix | 1 + pkgs/development/libraries/libaal/default.nix | 1 + pkgs/development/libraries/libao/default.nix | 1 + pkgs/development/libraries/libasr/default.nix | 1 + pkgs/development/libraries/libast/default.nix | 1 + .../libraries/libaudclient/default.nix | 1 + pkgs/development/libraries/libb64/default.nix | 1 + .../libraries/libbdplus/default.nix | 1 + .../libraries/libbluray/default.nix | 1 + pkgs/development/libraries/libbsd/default.nix | 1 + .../development/libraries/libburn/default.nix | 1 + .../development/libraries/libcaca/default.nix | 1 + .../development/libraries/libcddb/default.nix | 1 + pkgs/development/libraries/libcdio/0.82.nix | 1 + .../development/libraries/libcdio/default.nix | 1 + .../libraries/libcello/default.nix | 1 + .../libraries/libchardet/default.nix | 1 + .../libraries/libcrafter/default.nix | 1 + .../libraries/libcrossguid/default.nix | 3 ++- .../libraries/libctemplate/2.2.nix | 1 + .../libraries/libdivsufsort/default.nix | 1 + .../development/libraries/libdvdnav/4.2.1.nix | 1 + .../libraries/libdvdnav/default.nix | 1 + .../libraries/libdvdread/4.9.9.nix | 1 + .../libraries/libdvdread/default.nix | 1 + .../libraries/libdwarf/default.nix | 1 + .../libraries/libeatmydata/default.nix | 1 + pkgs/development/libraries/libeb/default.nix | 1 + .../libraries/libebur128/default.nix | 1 + .../libraries/libechonest/default.nix | 1 + pkgs/development/libraries/libee/default.nix | 1 + .../development/libraries/libexif/default.nix | 1 + .../libraries/libextractor/default.nix | 1 + pkgs/development/libraries/libf2c/default.nix | 1 + .../development/libraries/libftdi/default.nix | 1 + .../development/libraries/libgksu/default.nix | 1 + .../libraries/libid3tag/default.nix | 1 + .../libraries/libinfinity/default.nix | 1 + .../libraries/libiodbc/default.nix | 1 + .../libraries/libiptcdata/default.nix | 1 + .../libraries/libisoburn/default.nix | 1 + .../libraries/libisofs/default.nix | 1 + .../libraries/libixp-hg/default.nix | 1 + .../development/libraries/libjpeg/default.nix | 1 + .../libraries/libjreen/default.nix | 1 + .../development/libraries/libjson/default.nix | 1 + .../development/libraries/libkate/default.nix | 1 + .../libraries/libmatchbox/default.nix | 1 + pkgs/development/libraries/libmcs/default.nix | 1 + .../libraries/libmhash/default.nix | 1 + .../libraries/libmicrohttpd/default.nix | 1 + pkgs/development/libraries/libmkv/default.nix | 1 + .../libraries/libmowgli/default.nix | 1 + .../libraries/libmpeg2/default.nix | 1 + .../libraries/libmspack/default.nix | 1 + pkgs/development/libraries/libmx/default.nix | 1 + .../libraries/libnfsidmap/default.nix | 1 + .../development/libraries/libnice/default.nix | 1 + pkgs/development/libraries/libnih/default.nix | 1 + .../libraries/libnotify/default.nix | 1 + .../development/libraries/libnova/default.nix | 1 + pkgs/development/libraries/libofa/default.nix | 1 + .../development/libraries/liboggz/default.nix | 1 + pkgs/development/libraries/liboop/default.nix | 1 + .../libraries/libosmpbf/default.nix | 1 + .../libraries/libpaper/default.nix | 1 + .../development/libraries/libpar2/default.nix | 1 + .../development/libraries/libpcap/default.nix | 1 + pkgs/development/libraries/libpgf/default.nix | 1 + pkgs/development/libraries/libpng/12.nix | 1 + .../libraries/libpseudo/default.nix | 1 + pkgs/development/libraries/libpst/default.nix | 1 + pkgs/development/libraries/librdf/redland.nix | 1 + .../libraries/libresample/default.nix | 1 + pkgs/development/libraries/librsync/0.9.nix | 1 + .../libraries/libshout/default.nix | 1 + .../libraries/libsieve/default.nix | 1 + pkgs/development/libraries/libsigcxx/1.2.nix | 1 + pkgs/development/libraries/libsigsegv/2.5.nix | 1 + .../libraries/libsigsegv/default.nix | 1 + .../libraries/libsixel/default.nix | 1 + .../libraries/libspatialindex/default.nix | 1 + .../libraries/libspectre/default.nix | 1 + .../development/libraries/libsrs2/default.nix | 3 ++- .../libraries/libstroke/default.nix | 1 + pkgs/development/libraries/libtap/default.nix | 1 + .../libraries/libtermkey/default.nix | 1 + .../libraries/libtiger/default.nix | 1 + .../libraries/libtomcrypt/default.nix | 1 + .../libraries/libtommath/default.nix | 1 + .../libtorrent-rasterbar/generic.nix | 1 + pkgs/development/libraries/libtsm/default.nix | 1 + .../libraries/libtxc_dxtn/default.nix | 1 + .../libraries/libuchardet/default.nix | 1 + pkgs/development/libraries/libunique/3.x.nix | 1 + .../libraries/libunique/default.nix | 1 + .../libraries/libusbmuxd/default.nix | 1 + .../libraries/libviper/default.nix | 1 + pkgs/development/libraries/libwmf/default.nix | 1 + pkgs/development/libraries/libwpd/default.nix | 1 + .../libraries/libxdg-basedir/default.nix | 1 + .../libraries/libxkbcommon/default.nix | 1 + .../libraries/libxklavier/default.nix | 1 + .../libraries/lightning/default.nix | 1 + .../libraries/log4cplus/default.nix | 1 + .../development/libraries/log4cpp/default.nix | 1 + .../development/libraries/log4cxx/default.nix | 1 + .../libraries/loudmouth/default.nix | 1 + .../development/libraries/luabind/default.nix | 1 + .../libraries/lucene++/default.nix | 1 + .../libraries/mesa-glu/default.nix | 1 + .../libraries/miniball/default.nix | 1 + .../libraries/muparser/default.nix | 1 + pkgs/development/libraries/neon/0.29.nix | 1 + pkgs/development/libraries/neon/default.nix | 1 + .../libraries/netcdf-cxx4/default.nix | 1 + .../libraries/netcdf-fortran/default.nix | 1 + .../development/libraries/ocl-icd/default.nix | 1 + pkgs/development/libraries/ode/default.nix | 1 + .../libraries/ogrepaged/default.nix | 1 + .../libraries/oniguruma/default.nix | 1 + .../libraries/opencl-headers/default.nix | 1 + .../libraries/openh264/default.nix | 1 + .../libraries/pangox-compat/default.nix | 1 + pkgs/development/libraries/physfs/default.nix | 1 + .../libraries/pkcs11helper/default.nix | 1 + pkgs/development/libraries/plib/default.nix | 1 + .../libraries/pocketsphinx/default.nix | 1 + .../libraries/polkit-qt-1/qt-4.nix | 1 + .../libraries/polkit-qt-1/qt-5.nix | 1 + pkgs/development/libraries/popt/default.nix | 1 + .../libraries/portmidi/default.nix | 1 + pkgs/development/libraries/ppl/default.nix | 1 + .../libraries/protobuf/generic.nix | 1 + pkgs/development/libraries/pupnp/default.nix | 1 + .../development/libraries/qca-qt5/default.nix | 1 + pkgs/development/libraries/qca2/default.nix | 1 + pkgs/development/libraries/qhull/default.nix | 1 + .../libraries/qimageblitz/default.nix | 1 + .../libraries/qscintilla/default.nix | 1 + .../libraries/qt-mobility/default.nix | 1 + .../libraries/qtkeychain/default.nix | 1 + pkgs/development/libraries/readline/5.x.nix | 1 + pkgs/development/libraries/readline/6.2.nix | 1 + .../development/libraries/readosm/default.nix | 1 + pkgs/development/libraries/rlog/default.nix | 1 + .../libraries/science/math/arpack/default.nix | 1 + .../libraries/science/math/blas/default.nix | 1 + .../science/math/liblbfgs/default.nix | 1 + .../science/math/suitesparse/4.2.nix | 1 + .../science/math/suitesparse/default.nix | 1 + pkgs/development/libraries/sfml/default.nix | 1 + pkgs/development/libraries/sfsexp/default.nix | 1 + pkgs/development/libraries/slib/default.nix | 1 + pkgs/development/libraries/smpeg/default.nix | 1 + .../libraries/spatialite-tools/default.nix | 1 + pkgs/development/libraries/tcllib/default.nix | 1 + pkgs/development/libraries/tcltls/default.nix | 1 + .../libraries/telepathy/glib/default.nix | 1 + pkgs/development/libraries/tinyxml/2.6.2.nix | 1 + pkgs/development/libraries/tnt/default.nix | 3 ++- pkgs/development/libraries/tremor/default.nix | 1 + pkgs/development/libraries/ucl/default.nix | 1 + .../libraries/uhttpmock/default.nix | 1 + .../libraries/unittest-cpp/default.nix | 1 + pkgs/development/libraries/ustr/default.nix | 1 + .../libraries/vaapi-vdpau/default.nix | 1 + pkgs/development/libraries/vrpn/default.nix | 1 + pkgs/development/libraries/wcslib/default.nix | 1 + .../libraries/websocket++/default.nix | 1 + .../libraries/xapian/bindings/default.nix | 1 + pkgs/development/libraries/xapian/default.nix | 1 + .../libraries/xine-lib/default.nix | 1 + pkgs/development/libraries/zeromq/2.x.nix | 1 + pkgs/development/libraries/zimlib/default.nix | 1 + .../ocaml-modules/ocamlmake/default.nix | 1 + .../python-modules/libsexy/default.nix | 1 + .../python-modules/pyatspi/default.nix | 1 + .../python-modules/pygobject/3.nix | 1 + .../python-modules/pygobject/default.nix | 1 + .../python-modules/stringtemplate/default.nix | 1 + pkgs/development/tools/activator/default.nix | 1 + .../tools/analysis/checkstyle/default.nix | 1 + .../tools/analysis/emma/default.nix | 1 + .../tools/analysis/findbugs/default.nix | 1 + .../tools/analysis/kcov/default.nix | 1 + .../tools/analysis/pmd/default.nix | 1 + .../tools/analysis/smatch/default.nix | 1 + pkgs/development/tools/apktool/default.nix | 1 + .../build-managers/apache-maven/default.nix | 1 + .../tools/build-managers/bazel/default.nix | 1 + .../build-managers/colormake/default.nix | 1 + .../build-managers/gnumake/3.81/default.nix | 1 + .../tools/build-managers/gradle/default.nix | 1 + .../tools/build-managers/jam/default.nix | 1 + .../tools/database/liquibase/default.nix | 1 + .../tools/erlang/cuter/default.nix | 1 + pkgs/development/tools/flamegraph/default.nix | 1 + .../tools/github/github-release/default.nix | 1 + pkgs/development/tools/gnulib/default.nix | 1 + .../tools/guile/g-wrap/default.nix | 1 + pkgs/development/tools/heroku/default.nix | 1 + pkgs/development/tools/icestorm/default.nix | 1 + .../literate-programming/nuweb/default.nix | 1 + .../tools/misc/autoconf-archive/default.nix | 1 + pkgs/development/tools/misc/autoconf/2.13.nix | 1 + .../tools/misc/automake/automake-1.10.x.nix | 1 + .../tools/misc/automoc4/default.nix | 1 + .../development/tools/misc/ccache/default.nix | 1 + .../tools/misc/checkbashisms/default.nix | 1 + .../development/tools/misc/cproto/default.nix | 1 + .../tools/misc/dfu-programmer/default.nix | 1 + .../tools/misc/doclifter/default.nix | 1 + .../misc/editorconfig-core-c/default.nix | 1 + .../tools/misc/eggdbus/default.nix | 1 + pkgs/development/tools/misc/gnum4/default.nix | 1 + pkgs/development/tools/misc/gob2/default.nix | 1 + pkgs/development/tools/misc/gperf/default.nix | 1 + .../tools/misc/grafana/default.nix | 1 + .../tools/misc/gtkdialog/default.nix | 1 + .../development/tools/misc/indent/default.nix | 1 + .../tools/misc/jscoverage/default.nix | 1 + .../development/tools/misc/kibana/default.nix | 1 + .../tools/misc/libtool/default.nix | 1 + .../tools/misc/libtool/libtool2.nix | 1 + pkgs/development/tools/misc/lsof/default.nix | 1 + .../development/tools/misc/ltrace/default.nix | 1 + .../tools/misc/objconv/default.nix | 1 + .../tools/misc/pmccabe/default.nix | 1 + pkgs/development/tools/misc/premake/3.nix | 1 + pkgs/development/tools/misc/rman/default.nix | 1 + .../tools/misc/rolespec/default.nix | 1 + pkgs/development/tools/misc/texinfo/4.13a.nix | 1 + .../tools/parsing/byacc/default.nix | 1 + .../development/tools/parsing/flex/2.5.35.nix | 1 + .../tools/parsing/flex/default.nix | 1 + .../tools/parsing/jikespg/default.nix | 1 + .../tools/profiling/sysprof/default.nix | 1 + pkgs/development/tools/pypi2nix/default.nix | 1 + pkgs/development/tools/rtags/default.nix | 1 + pkgs/development/tools/toluapp/default.nix | 1 + pkgs/games/bzflag/default.nix | 1 + pkgs/games/chessdb/default.nix | 1 + pkgs/games/cockatrice/default.nix | 1 + pkgs/games/commandergenius/default.nix | 1 + pkgs/games/cuyo/default.nix | 1 + pkgs/games/eboard/default.nix | 1 + pkgs/games/eduke32/default.nix | 1 + pkgs/games/extremetuxracer/default.nix | 1 + pkgs/games/exult/default.nix | 1 + pkgs/games/freecell-solver/default.nix | 1 + pkgs/games/fsg/default.nix | 1 + pkgs/games/gav/default.nix | 1 + pkgs/games/gnugo/default.nix | 1 + pkgs/games/icbm3d/default.nix | 1 + pkgs/games/kobodeluxe/default.nix | 1 + pkgs/games/macopix/default.nix | 1 + pkgs/games/mars/default.nix | 1 + pkgs/games/njam/default.nix | 1 + pkgs/games/openlierox/default.nix | 1 + pkgs/games/pong3d/default.nix | 1 + pkgs/games/racer/default.nix | 1 + pkgs/games/rili/default.nix | 1 + pkgs/games/scummvm/default.nix | 1 + pkgs/games/super-tux-kart/default.nix | 1 + pkgs/games/super-tux/default.nix | 1 + pkgs/games/teetertorture/default.nix | 1 + pkgs/games/tome4/default.nix | 1 + pkgs/games/trackballs/default.nix | 1 + pkgs/games/uqm/default.nix | 1 + pkgs/games/vectoroids/default.nix | 1 + pkgs/misc/base16/default.nix | 1 + pkgs/misc/cups/drivers/cups-bjnp/default.nix | 1 + pkgs/misc/drivers/gutenprint/bin.nix | 1 + pkgs/misc/drivers/moltengamepad/default.nix | 1 + pkgs/misc/drivers/xboxdrv/default.nix | 1 + pkgs/misc/emulators/atari++/default.nix | 1 + pkgs/misc/emulators/atari800/default.nix | 1 + pkgs/misc/emulators/dlx/default.nix | 1 + pkgs/misc/emulators/dosbox/default.nix | 1 + .../emulators/emulationstation/default.nix | 1 + pkgs/misc/emulators/fakenes/default.nix | 1 + pkgs/misc/emulators/fceux/default.nix | 1 + pkgs/misc/emulators/fs-uae/default.nix | 1 + pkgs/misc/emulators/mgba/default.nix | 1 + pkgs/misc/emulators/mupen64plus/default.nix | 1 + pkgs/misc/emulators/retrofe/default.nix | 1 + pkgs/misc/emulators/snes9x-gtk/default.nix | 1 + pkgs/misc/emulators/uae/default.nix | 1 + pkgs/misc/emulators/vbam/default.nix | 1 + pkgs/misc/emulators/vice/default.nix | 1 + pkgs/misc/emulators/wine/winetricks.nix | 1 + pkgs/misc/emulators/zsnes/default.nix | 1 + pkgs/misc/gnuk/generic.nix | 1 + pkgs/misc/screensavers/rss-glx/default.nix | 1 + pkgs/misc/talkfilters/default.nix | 1 + pkgs/misc/themes/albatross/default.nix | 1 + pkgs/misc/themes/blackbird/default.nix | 1 + pkgs/misc/themes/greybird/default.nix | 1 + pkgs/misc/themes/orion/default.nix | 1 + pkgs/misc/urbit/default.nix | 1 + pkgs/os-specific/linux/acpitool/default.nix | 1 + .../linux/alsa-firmware/default.nix | 1 + pkgs/os-specific/linux/autofs/default.nix | 1 + pkgs/os-specific/linux/blktrace/default.nix | 1 + pkgs/os-specific/linux/bluez/default.nix | 1 + .../firmware/b43-firmware-cutter/default.nix | 1 + .../firmware/intel2200BGFirmware/default.nix | 1 + .../linux/firmware/rt5677/default.nix | 1 + .../firmware/rtl8723bs-firmware/default.nix | 1 + .../linux/firmware/zd1211/default.nix | 1 + pkgs/os-specific/linux/fxload/default.nix | 1 + pkgs/os-specific/linux/gogoclient/default.nix | 1 + .../linux/google-authenticator/default.nix | 1 + pkgs/os-specific/linux/hibernate/default.nix | 1 + pkgs/os-specific/linux/i7z/default.nix | 1 + pkgs/os-specific/linux/i810switch/default.nix | 1 + pkgs/os-specific/linux/jujuutils/default.nix | 1 + .../linux/kmod-blacklist-ubuntu/default.nix | 1 + .../linux/kmod-debian-aliases/default.nix | 1 + pkgs/os-specific/linux/lm-sensors/default.nix | 1 + pkgs/os-specific/linux/mdadm/default.nix | 1 + pkgs/os-specific/linux/open-isns/default.nix | 1 + pkgs/os-specific/linux/otpw/default.nix | 1 + pkgs/os-specific/linux/pam_ccreds/default.nix | 1 + pkgs/os-specific/linux/pam_usb/default.nix | 1 + .../os-specific/linux/pcmciautils/default.nix | 1 + pkgs/os-specific/linux/sdparm/default.nix | 1 + pkgs/os-specific/linux/shadow/default.nix | 1 + pkgs/os-specific/linux/sysfsutils/default.nix | 1 + pkgs/os-specific/linux/tunctl/default.nix | 1 + pkgs/os-specific/linux/uclibc/default.nix | 1 + pkgs/os-specific/linux/upstart/default.nix | 1 + .../linux/xf86-input-mtrack/default.nix | 1 + pkgs/servers/computing/storm/default.nix | 1 + pkgs/servers/dict/dictd-db.nix | 1 + pkgs/servers/elasticmq/default.nix | 1 + pkgs/servers/fcgiwrap/default.nix | 1 + pkgs/servers/freeradius/default.nix | 1 + pkgs/servers/ftp/pure-ftpd/default.nix | 1 + .../apache-modules/mod_python/default.nix | 1 + pkgs/servers/http/jboss/default.nix | 1 + pkgs/servers/http/spawn-fcgi/default.nix | 1 + pkgs/servers/http/thttpd/default.nix | 1 + pkgs/servers/http/tomcat/axis2/default.nix | 1 + pkgs/servers/icecast/default.nix | 1 + pkgs/servers/irc/ircd-hybrid/default.nix | 1 + pkgs/servers/limesurvey/default.nix | 1 + pkgs/servers/mail/archiveopteryx/default.nix | 1 + pkgs/servers/mail/popa3d/default.nix | 1 + pkgs/servers/mail/postfix/pfixtools.nix | 3 ++- pkgs/servers/mail/rmilter/default.nix | 1 + pkgs/servers/mail/rspamd/default.nix | 1 + pkgs/servers/misc/subsonic/default.nix | 1 + pkgs/servers/monitoring/longview/default.nix | 1 + pkgs/servers/nosql/hyperdex/default.nix | 1 + pkgs/servers/openxpki/default.nix | 1 + pkgs/servers/osrm-backend/default.nix | 1 + pkgs/servers/owncloud/default.nix | 1 + pkgs/servers/prayer/default.nix | 1 + pkgs/servers/sql/mysql/5.5.x.nix | 1 + pkgs/servers/sql/postgresql/jdbc/default.nix | 1 + .../sql/postgresql/psqlodbc/default.nix | 1 + pkgs/servers/squid/default.nix | 1 + pkgs/servers/xmpp/openfire/default.nix | 1 + pkgs/servers/xmpp/pyIRCt/default.nix | 1 + pkgs/servers/xmpp/pyMAILt/default.nix | 1 + pkgs/shells/fish-foreign-env/default.nix | 1 + pkgs/shells/zsh-prezto/default.nix | 1 + pkgs/tools/X11/dragon-drop/default.nix | 1 + pkgs/tools/X11/obconf/default.nix | 1 + pkgs/tools/X11/screen-message/default.nix | 1 + pkgs/tools/X11/x2vnc/default.nix | 1 + pkgs/tools/X11/x2x/default.nix | 1 + pkgs/tools/X11/xbrightness/default.nix | 1 + pkgs/tools/X11/xchainkeys/default.nix | 1 + pkgs/tools/X11/xinput_calibrator/default.nix | 1 + pkgs/tools/X11/xlaunch/default.nix | 1 + pkgs/tools/archivers/pxattr/default.nix | 1 + .../audio/acoustid-fingerprinter/default.nix | 1 + pkgs/tools/audio/dir2opus/default.nix | 11 +++++---- pkgs/tools/backup/httrack/default.nix | 1 + pkgs/tools/bluetooth/bluez-tools/default.nix | 1 + .../bluetooth/obex-data-server/default.nix | 1 + pkgs/tools/bluetooth/obexd/default.nix | 1 + pkgs/tools/cd-dvd/bchunk/default.nix | 1 + pkgs/tools/cd-dvd/cdrdao/default.nix | 1 + pkgs/tools/cd-dvd/cdrkit/default.nix | 1 + pkgs/tools/cd-dvd/dvd+rw-tools/default.nix | 1 + pkgs/tools/cd-dvd/lsdvd/default.nix | 1 + pkgs/tools/compression/gzrt/default.nix | 1 + pkgs/tools/compression/lrzip/default.nix | 1 + pkgs/tools/compression/lzop/default.nix | 1 + pkgs/tools/compression/ncompress/default.nix | 1 + pkgs/tools/compression/pxz/default.nix | 1 + pkgs/tools/compression/rzip/default.nix | 1 + pkgs/tools/compression/upx/default.nix | 1 + pkgs/tools/compression/zdelta/default.nix | 1 + pkgs/tools/filesystems/ciopfs/default.nix | 1 + pkgs/tools/filesystems/encfs/default.nix | 1 + pkgs/tools/filesystems/fatsort/default.nix | 1 + .../filesystems/reiser4progs/default.nix | 1 + .../filesystems/reiserfsprogs/default.nix | 1 + pkgs/tools/filesystems/s3backer/default.nix | 1 + pkgs/tools/filesystems/s3fs/default.nix | 1 + pkgs/tools/filesystems/snapraid/default.nix | 1 + pkgs/tools/filesystems/wdfs/default.nix | 1 + pkgs/tools/filesystems/zfstools/default.nix | 1 + pkgs/tools/graphics/bins/default.nix | 3 ++- pkgs/tools/graphics/briss/default.nix | 1 + pkgs/tools/graphics/cuneiform/default.nix | 1 + .../tools/graphics/enblend-enfuse/default.nix | 1 + pkgs/tools/graphics/exif/default.nix | 1 + pkgs/tools/graphics/exiftags/default.nix | 1 + pkgs/tools/graphics/gmic/default.nix | 1 + pkgs/tools/graphics/graphviz/2.0.nix | 1 + pkgs/tools/graphics/leela/default.nix | 1 + pkgs/tools/graphics/lprof/default.nix | 1 + pkgs/tools/graphics/optipng/default.nix | 1 + pkgs/tools/graphics/pgf/default.nix | 1 + pkgs/tools/graphics/ploticus/default.nix | 1 + pkgs/tools/graphics/welkin/default.nix | 1 + pkgs/tools/graphics/wkhtmltopdf/default.nix | 1 + pkgs/tools/graphics/xcftools/default.nix | 1 + pkgs/tools/misc/antimicro/default.nix | 1 + pkgs/tools/misc/autorandr/default.nix | 1 + pkgs/tools/misc/bibutils/default.nix | 1 + pkgs/tools/misc/bogofilter/default.nix | 1 + pkgs/tools/misc/cunit/default.nix | 1 + pkgs/tools/misc/cutecom/default.nix | 1 + pkgs/tools/misc/dbacl/default.nix | 1 + pkgs/tools/misc/debian-devscripts/default.nix | 1 + pkgs/tools/misc/disper/default.nix | 1 + pkgs/tools/misc/emv/default.nix | 1 + pkgs/tools/misc/figlet/default.nix | 1 + pkgs/tools/misc/fortune/default.nix | 1 + pkgs/tools/misc/gnuvd/default.nix | 1 + pkgs/tools/misc/hdf5/default.nix | 1 + pkgs/tools/misc/heatseeker/default.nix | 1 + pkgs/tools/misc/heimdall/default.nix | 1 + pkgs/tools/misc/kermit/default.nix | 1 + pkgs/tools/misc/man/default.nix | 1 + pkgs/tools/misc/mc/default.nix | 1 + pkgs/tools/misc/mdbtools/default.nix | 1 + pkgs/tools/misc/mdbtools/git.nix | 1 + pkgs/tools/misc/memtest86+/default.nix | 1 + pkgs/tools/misc/mmv/default.nix | 1 + pkgs/tools/misc/mpdscribble/default.nix | 1 + pkgs/tools/misc/mrtg/default.nix | 1 + pkgs/tools/misc/ms-sys/default.nix | 1 + pkgs/tools/misc/mysql2pgsql/default.nix | 1 + pkgs/tools/misc/plowshare/default.nix | 1 + pkgs/tools/misc/ponysay/default.nix | 1 + pkgs/tools/misc/proxytunnel/default.nix | 1 + pkgs/tools/misc/rcm/default.nix | 1 + pkgs/tools/misc/renameutils/default.nix | 1 + pkgs/tools/misc/slsnif/default.nix | 1 + pkgs/tools/misc/time/default.nix | 1 + pkgs/tools/misc/timidity/default.nix | 1 + pkgs/tools/misc/ttf2pt1/default.nix | 1 + pkgs/tools/misc/ttmkfdir/default.nix | 1 + pkgs/tools/misc/wv/default.nix | 1 + pkgs/tools/misc/xapian-omega/default.nix | 1 + pkgs/tools/misc/yank/default.nix | 1 + .../misc/zsh-navigation-tools/default.nix | 1 + pkgs/tools/networking/ahcpd/default.nix | 1 + pkgs/tools/networking/aiccu/default.nix | 1 + pkgs/tools/networking/asynk/default.nix | 1 + pkgs/tools/networking/babeld/default.nix | 1 + pkgs/tools/networking/bully/default.nix | 1 + .../tools/networking/carddav-util/default.nix | 1 + pkgs/tools/networking/corkscrew/default.nix | 1 + pkgs/tools/networking/darkstat/default.nix | 1 + pkgs/tools/networking/dnstop/default.nix | 1 + pkgs/tools/networking/email/default.nix | 3 ++- pkgs/tools/networking/gftp/default.nix | 1 + pkgs/tools/networking/imapproxy/default.nix | 1 + pkgs/tools/networking/jnettop/default.nix | 1 + pkgs/tools/networking/maildrop/default.nix | 1 + pkgs/tools/networking/netcat/default.nix | 1 + pkgs/tools/networking/netrw/default.nix | 1 + pkgs/tools/networking/netselect/default.nix | 1 + pkgs/tools/networking/noip/default.nix | 1 + .../networking/nss-pam-ldapd/default.nix | 1 + pkgs/tools/networking/nzbget/default.nix | 1 + .../networking/p2p/gtk-gnutella/default.nix | 1 + pkgs/tools/networking/pcapfix/default.nix | 15 ++++++------ pkgs/tools/networking/samplicator/default.nix | 1 + pkgs/tools/networking/sipsak/default.nix | 1 + pkgs/tools/networking/slimrat/default.nix | 1 + .../tools/networking/smbldaptools/default.nix | 1 + pkgs/tools/networking/ssh-ident/default.nix | 1 + pkgs/tools/networking/swec/default.nix | 1 + pkgs/tools/networking/tinc/default.nix | 1 + pkgs/tools/networking/vde2/default.nix | 1 + pkgs/tools/networking/vlan/default.nix | 1 + pkgs/tools/networking/wbox/default.nix | 1 + pkgs/tools/networking/wicd/default.nix | 1 + .../disnix/DisnixWebService/default.nix | 1 + .../package-management/disnix/default.nix | 1 + .../disnix/disnixos/default.nix | 1 + .../disnix/dysnomia/default.nix | 1 + pkgs/tools/security/bmrsa/11.nix | 1 + pkgs/tools/security/chntpw/default.nix | 1 + pkgs/tools/security/metasploit/default.nix | 1 + pkgs/tools/security/ossec/default.nix | 1 + pkgs/tools/security/pass/rofi-pass.nix | 1 + pkgs/tools/security/prey/default.nix | 1 + pkgs/tools/security/seccure/default.nix | 1 + pkgs/tools/security/secp256k1/default.nix | 1 + pkgs/tools/security/ssss/default.nix | 1 + pkgs/tools/security/steghide/default.nix | 1 + pkgs/tools/security/super/default.nix | 1 + pkgs/tools/system/bootchart/default.nix | 1 + pkgs/tools/system/mcron/default.nix | 1 + pkgs/tools/system/monit/default.nix | 1 + pkgs/tools/system/setserial/default.nix | 1 + pkgs/tools/system/suid-chroot/default.nix | 1 + pkgs/tools/system/symlinks/default.nix | 1 + pkgs/tools/system/syslog-ng/default.nix | 1 + pkgs/tools/text/ansifilter/default.nix | 1 + pkgs/tools/text/convertlit/default.nix | 1 + pkgs/tools/text/dadadodo/default.nix | 1 + pkgs/tools/text/diction/default.nix | 1 + pkgs/tools/text/diffutils/default.nix | 1 + pkgs/tools/text/discount/default.nix | 1 + pkgs/tools/text/highlight/default.nix | 1 + pkgs/tools/text/mawk/default.nix | 15 ++++++------ pkgs/tools/text/mpage/default.nix | 1 + pkgs/tools/text/multitran/data/default.nix | 1 + .../tools/text/multitran/libbtree/default.nix | 1 + .../tools/text/multitran/libfacet/default.nix | 1 + .../text/multitran/libmtquery/default.nix | 1 + .../text/multitran/libmtsupport/default.nix | 1 + pkgs/tools/text/replace/default.nix | 1 + pkgs/tools/text/sgml/openjade/default.nix | 1 + pkgs/tools/text/sgml/opensp/compat.nix | 1 + pkgs/tools/text/sgml/opensp/default.nix | 1 + pkgs/tools/text/txt2tags/default.nix | 1 + .../tools/text/xml/html-xml-utils/default.nix | 1 + pkgs/tools/text/xml/rxp/default.nix | 1 + pkgs/tools/text/xml/xmlstarlet/default.nix | 1 + pkgs/tools/text/xml/xpf/default.nix | 1 + pkgs/tools/text/xurls/default.nix | 1 + pkgs/tools/text/zimreader/default.nix | 1 + pkgs/tools/text/zimwriterfs/default.nix | 1 + .../typesetting/git-latexdiff/default.nix | 1 + pkgs/tools/typesetting/halibut/default.nix | 1 + pkgs/tools/typesetting/hevea/default.nix | 1 + pkgs/tools/typesetting/rubber/default.nix | 1 + pkgs/tools/typesetting/tex/auctex/default.nix | 1 + .../tools/typesetting/tex/dblatex/default.nix | 1 + pkgs/tools/typesetting/tex/pgf/1.x.nix | 1 + pkgs/tools/typesetting/tex/pgf/2.x.nix | 1 + pkgs/tools/typesetting/tex/pgf/3.x.nix | 1 + pkgs/tools/typesetting/tex/tex4ht/default.nix | 1 + pkgs/tools/typesetting/xmlto/default.nix | 1 + pkgs/tools/video/swfmill/default.nix | 1 + pkgs/tools/video/swftools/default.nix | 1 + pkgs/tools/video/vncrec/default.nix | 1 + pkgs/tools/virtualization/aws/default.nix | 1 + 890 files changed, 936 insertions(+), 46 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index 5eb7649d58d..be2a92509f8 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { maintainers = [ stdenv.lib.maintainers.eelco ]; description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index c74f7ce7f24..10bf5860834 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { homepage = http://www.dogecoin.com/; license = licenses.mit; maintainers = with maintainers; [ edwtjo offline AndersonTorres ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index dba813b39e1..2f8a6fcdad6 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -72,5 +72,6 @@ in Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack) format, and tags them, all in one go. ''; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 1658d9c7449..8d5ff663a54 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 826ba186cef..8e4a08bcacc 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { homepage = https://cmus.github.io/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.oxij ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 4da15a4b8e3..bb317ca7a40 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tidalcycles/Dirt"; license = licenses.gpl3; maintainers = with maintainers; [ anderspapitto ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 83ff7ecffa1..a6ba9eab48c 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://projects.gnome.org/easytag/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index f08de9d080a..93b23b2f763 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { homepage = http://gjay.sourceforge.net/; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 8780c013340..6653526c6e2 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://id3v2.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 4d79c3ebecf..d00dcafd7b8 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { homepage = http://kid3.sourceforge.net/; license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } # TODO: Qt5 support diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 20ac0f1aba6..1b31eed0699 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index eb1f8f4faa8..9ff4aef6083 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://mpg123.org; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index ca746f524c5..ad4a06cff99 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { homepage = http://normalize.nongnu.org/; description = "Audio file normalizer"; license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index f49f756ce3a..fff3582f7df 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = http://klingt.org/~tim/nova-filters/; description = "LADSPA plugins based on filters of nova"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index fb32674d3b4..cee86f45685 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://www.opus-codec.org/; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 084d187c347..40ff47b9ee1 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/ssj71/rkrlv2; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.joelmo ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index 364e13e97a9..76913356b04 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { description = "An Open Source personal backup solution"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 3e11f78e402..a46b52436a3 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "Ascii-art Editor Without A Name"; homepage = "http://aewan.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index 7a0e9e59d7e..ff9ec73a2ef 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://www.dettus.net/dhex/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 03ed4276df9..650a551cb60 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/ed/; maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 1d91a136876..e6f942dbfdd 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl1Plus; homepage = http://edbrowse.org/; maintainers = [ maintainers.schmitthenner maintainers.vrthra ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index 1a76ab40532..17fa75fe634 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = http://c9x.me/edit; license = licenses.publicDomain; maintainers = [ maintainers.vrthra ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index ee9f44d06da..24282b9ac8e 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "View and edit files in hexadecimal or in ASCII"; homepage = "http://prigaux.chez.com/hexedit.html"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 4ca4819787b..323059417ea 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "A full featured terminal-based screen editor"; homepage = http://joe-editor.sourceforge.net; license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 169e078edbd..c7dbff366db 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -30,5 +30,6 @@ UN*X machine. ne is easy to use for the beginner, but powerful and fully configu and most sparing in its resource usage. See the manual for some highlights of ne's features. ''; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 4fb4006c567..363da0d3826 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation { meta = { description = "An integrated development environment for Java, C, C++ and PHP"; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index ed72043d723..7a066b068e1 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3; inherit version; maintainers = with stdenv.lib.maintainers; [ ramkromberg ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index a03ce539d50..97bf0d5c237 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "A terminal visual binary diff viewer"; homepage = "http://www.cjmweb.net/vbindiff/"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 496f04142e1..41994563ee3 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { homepage = http://github.com/martanne/vis; license = licenses.isc; maintainers = [ maintainers.vrthra ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index fb4ae6afc09..ce67cc2d648 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://wily.sourceforge.net; license = licenses.artistic1; maintainers = [ maintainers.vrthra ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index 6d26dafae62..5fd1810bc28 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = http://hugin.sourceforge.net/; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index cdb5afaac31..65209cbd6ff 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = https://www.kraxel.org/blog/linux/fbida/; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 84986e0d900..14ab9c26d7d 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; homepage = http://fontmatrix.be/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 0af750ec989..c7113801b61 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -27,5 +27,6 @@ buildInputs = [ gtk perl perlXMLParser pkgconfig ]; homepage = http://gcolor2.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index a8132e30c72..58bae84cd50 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { description = "A fast image viewer"; homepage = http://gqview.sourceforge.net; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index e354837f4b8..d629c776194 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { description = "Black-and-white djvu page encoder and decoder that use interpage information"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 01b0a1414a7..35c0ca2aff9 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation (rec { description = "Quick image viewer"; homepage = http://spiegl.de/qiv/; inherit version; + platforms = stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 3ccbf7a404d..5934febb999 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { description = "Client for Screencloud, an easy to use screenshot sharing tool"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ forkk ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 44c8313d9c3..c53d755da07 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://xaos.sourceforge.net/; description = "Fractal viewer"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 56d46088669..9c93b9d7317 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Note-taking application (supposes stylus)"; maintainers = [ stdenv.lib.maintainers.guibert ]; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 724bddda6cf..85b05dd3b0a 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 1d964ab66b0..655fa5b9405 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Desktop agnostic launcher"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ericsagnes ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 941e1a393b1..12da125bb3e 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "An audio resampling library"; homepage = http://soxr.sourceforge.net; license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix index 2aad3b20e22..777a759177c 100644 --- a/pkgs/applications/misc/cortex/default.nix +++ b/pkgs/applications/misc/cortex/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation { description = "An ncurses reddit browser and monitor"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix index b622cf46cc8..386601f39bb 100644 --- a/pkgs/applications/misc/eterm/default.nix +++ b/pkgs/applications/misc/eterm/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index e2c9bf49459..db954a25463 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://www.andreas-diesner.de/garminplugin; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.ocharles ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 2f19f830282..a6e06c85ac7 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { homepage = "http://www.nongnu.org/gksu/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 9a59329871e..c6b48af5c06 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://freefoote.dview.net/linux_gpscorr.html; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 520b8304f63..1132f6b12f9 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { meta = { description = "GUI for XNEUR keyboard layout switcher"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index ad07c02f508..9a60cd060f5 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/enkore/j4-dmenu-desktop"; license = licenses.gpl3; maintainer = with maintainers; [ ericsagnes ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 1f2ecf91141..fd9077a619c 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { description = "Download utility that can fetch files from several sources simultaneously"; homepage = http://atterer.net/jigdo/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index e03d4b397da..e552ac9777f 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = https://csl.name/jp2a/; description = "A small utility that converts JPG images to ASCII"; license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 06eb883300c..a44f4bff83e 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A command-line based markdown presentation tool"; maintainers = with maintainers; [ matthiasbeyer vrthra ]; license = licenses.gpl3; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index e8bf2f7a14c..06f8b78c2bc 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { "; homepage = http://sourceforge.net/projects/materm; license = "GPL"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index e910c9ed22e..022829040b8 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "Small weblog engine written in Bash for the command line"; homepage = http://nanoblogger.sourceforge.net/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 9753e6d4475..86dbfc0c5fe 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { description = "A viewer for info files"; homepage = https://alioth.debian.org/projects/pinfo/; license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index cfa772e8b5e..a13f2bef0c6 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Show the set of running processes as a tree"; license = "GPL"; maintainers = [ stdenv.lib.maintainers.mornfall ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index 3c9bdcada15..bed1d1fc97c 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/quicksynergy/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.spinus ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 11c090cc389..491f09943b5 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = https://davedavenport.github.io/rofi; license = licenses.mit; maintainers = with maintainers; [ mbakke garbas ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix index bca87b12b9f..f81709b9739 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix index dfcdeaa9d4e..0c95acd7205 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index 03a505591b7..82c4f310352 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index e924c3127ab..5dc6ed65070 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; homepage = "https://github.com/mina86/urxvt-tabbedex"; maintainers = with maintainers; [ abbradar ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix index 1289679832b..17c41f233ec 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = ""; license = "CCBYNC"; maintainers = with maintainers; [ garbas ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 8fbe021cc8f..7cd318681e2 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation (rec { description = "A clone of the well-known terminal emulator rxvt"; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; maintainers = [ stdenv.lib.maintainers.mornfall ]; + platforms = stdenv.lib.platforms.unix; }; }) diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 5776cf698b8..0fe94b07450 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 0a2c1c88c23..1a42d9a90e6 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { #homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 9f84189e94b..1229990b1ab 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { description = "Task management system"; homepage = http://www.thinkingrock.com.au/; license = "CDDL"; # Common Development and Distribution License + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 291f18d5965..50749681f2c 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { homepage = http://viking.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 0f71a53075f..0861391294b 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; meta = { - description = "Prints or set the window manager name property of the root window"; - homepage = "http://tools.suckless.org/wmname"; - license = stdenv.lib.licenses.mit; + description = "Prints or set the window manager name property of the root window"; + homepage = "http://tools.suckless.org/wmname"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index c6bfa07cb88..74c9c807b81 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { description = "A viewer for Microsoft HTML Help files"; homepage = http://xchm.sourceforge.net; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 9a912353281..3a25147971a 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -16,15 +16,16 @@ stdenv.mkDerivation { makeFlagsArray=( BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults) ''; - meta = with stdenv.lib; - { description = "Filesystem visualization utility"; - longDescription = '' - XCruiser, formerly known as XCruise, is a filesystem visualization utility. - It constructs a virtually 3-D formed universe from a directory - tree and allows you to "cruise" within a visualized filesystem. - ''; - homepage = http://xcruiser.sourceforge.net/; - license = licenses.gpl2; - maintainers = with maintainers; [ ehmry ]; - }; + meta = with stdenv.lib; { + description = "Filesystem visualization utility"; + longDescription = '' + XCruiser, formerly known as XCruise, is a filesystem visualization utility. + It constructs a virtually 3-D formed universe from a directory + tree and allows you to "cruise" within a visualized filesystem. + ''; + homepage = http://xcruiser.sourceforge.net/; + license = licenses.gpl2; + maintainers = with maintainers; [ ehmry ]; + platforms = with platforms; linux; + }; } diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 69b98bc6f44..3f3865d7688 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/nonpop/xkblayout-state; license = licenses.gpl2; maintainers = [ maintainers.jagajaga ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix index 3eb84e6d4ea..39da756204f 100644 --- a/pkgs/applications/misc/xneur/0.8.nix +++ b/pkgs/applications/misc/xneur/0.8.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { meta = { description = "Utility for switching between keyboard layouts"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix index 53d260fdc75..0fa9b5f66b2 100644 --- a/pkgs/applications/misc/ykpers/default.nix +++ b/pkgs/applications/misc/ykpers/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec description = "YubiKey Personalization cross-platform library and tool"; license = "bsd"; maintainers = [ stdenv.lib.maintainers.calrama ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 7a12b1247cf..a785b859350 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { description = "Full-featured text-mode web browser"; homepage = http://elinks.or.cz; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 0d5d20b6579..06c00bec755 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://lynx.isc.org/; description = "A text-mode web browser"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index 17012850a31..a226cb6fa3b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Mozilla plugin for launching external program for handling in-page objects"; homepage = http://mozplugger.mozdev.org/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index bc2c4ab8eee..d3b7843f291 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { homepage = http://w3m.sourceforge.net/; description = "A text-mode web browser"; maintainers = [ maintainers.mornfall maintainers.cstrahan ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index 43d257d7b0e..d3be9c28df3 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -26,5 +26,6 @@ buildRustPackage rec { homepage = https://github.com/colemickens/cfdyndns; license = stdenv.lib.licenses.mit; maintainers = with maintainers; [ colemickens ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 8d4ae68b0a5..10243e5f1d8 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.bro.org/; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 9f11290fdb1..5261bd451e0 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 2904f50d6fc..434ae803f0a 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 770f0952e1f..623dc838233 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { description = "Instant messaging (MSN Messenger clone)"; homepage = http://amsn-project.net; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 1427cc06ce4..bfd4e11ccac 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/jgeboski/bitlbee-facebook; license = licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 2674dd52132..61e7203a83c 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/jgeboski/bitlbee-steam; license = licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index fa61876bf16..b6adcfc1910 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -79,5 +79,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin maintainers.aszlig ]; downloadPage = "http://gajim.org/downloads.php"; updateWalker = true; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index df1d0ee5e78..4ef2c81449a 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Small Jabber console client"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index a63468a9ee7..4a86ea9e068 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation { meta = { description = "Alternative MSN protocol plug-in for Pidgin IM"; homepage = http://code.google.com/p/msn-pecan/; + platforms = stdenv.lib.platforms.linux; }; makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index c25bfb42eb1..574c01c2cde 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/dreadatour/pidgin-mra; description = "Mail.ru Agent plugin for Pidgin / libpurple"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index 0a96d8749ae..e54af933a08 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin; description = "Vk (russian social network) plugin for Pidgin / libpurple"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index a83589bf75e..bb1ed52baba 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/novas0x2a/skype4pidgin; license = stdenv.lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 8cce3fae1bb..1a036c3083b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { description = "Telegram for Pidgin / libpurple"; license = stdenv.lib.licenses.gpl2; maintainers = stdenv.lib.maintainers.jagajaga; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 367c837228a..90f6655d145 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://tox.dhs.org/; description = "Tox plugin for Pidgin / libpurple"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 17462cb75ad..703447594ed 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { description = "The official Bitmessage client"; license = licenses.mit; maintainers = with maintainers; [ jgillich ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 52da021000d..15cc5a0f093 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://ricochet.im"; license = licenses.bsd3; maintainers = [ maintainers.codsl maintainers.jgillich ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index 11655d0e28d..1d67fa3dcf5 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://iptraf.seul.org/; license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 6f816e1db17..ee9a6392e07 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -43,5 +43,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; downloadPage= "https://projects.duckcorp.org/projects/bip/files"; inherit version; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 224f639cc15..c6bb2479bfc 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://tools.suckless.org/ii/; license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 6bbe9c6c140..38c2c3c2930 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/cryptodotis/irssi-otr; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index fef2b6c4cac..7c13b04e670 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "Simple IRC client"; homepage = http://tools.suckless.org/sic/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 4f936f2677e..db36c8dca61 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.garbas ]; priority = 1; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 892d9d8fa57..fa6e4db0a0d 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { description = "A Qt IMAP e-mail client"; homepage = http://trojita.flaska.net/; license = with lib.licenses; [ gpl2 gpl3 ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index f29493beb00..d761be2d7ac 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { homepage = http://slrn.sourceforge.net/index.html; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 434a2c78550..99ba36ca715 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { description = "BitTorrent Client and Cloud File Downloader"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.gavin ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 14b68d71e79..53b7b7748b2 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "Direct Connect client"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 280a0468753..416995f120c 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation (rec { description = "Client for many p2p networks, with multiple frontends"; homepage = http://mldonkey.sourceforge.net/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } // (if !ocaml.nativeCompilers then { diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix index e9770da6390..ddb37a3f64b 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Curses interface for the Transmission BitTorrent daemon"; homepage = https://github.com/fagga/transmission-remote-cli; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index b2a578ddc1d..210dbaf41c8 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { homepage = http://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 6f8ebb994c5..43ec9a5b022 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -58,5 +58,6 @@ in stdenv.mkDerivation rec { homepage = "http://www.twister.net.co/"; description = "Peer-to-peer microblogging"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index f773cf6755e..cf1a8552b25 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -61,5 +61,6 @@ stdenv.mkDerivation rec { homepage = http://www.freerdp.com/; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index ccabb5c77a8..05019f83353 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.chiark.greenend.org.uk/~sgtatham/putty/; license = licenses.mit; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 1bff834791d..8af1662b275 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Wireless network sniffer"; homepage = http://www.kismetwireless.net/; license = "GPL"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index f283631cb07..45bb5518f9c 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://www.yafc-ftp.com; maintainers = [ stdenv.lib.maintainers.page ]; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index d7b8aca2ff5..4e163a5b3f8 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; homepage = http://bio-bwa.sourceforge.net/; maintainers = with maintainers; [ luispedro ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 70e3da696b4..1dd92af58eb 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { ''; license = "GPL2"; homepage = http://mrbayes.csit.fsu.edu/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 4ac2710050b..0f817a71a70 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = http://fritzing.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.robberer ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 8b09b7dd37d..95b312a4438 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Graphical editor for finite state machines"; homepage = "http://qfsm.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index f0be5258ce4..048f34d7abf 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Interactive geometry program"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index d542bf87c79..9dd25473683 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 8a0565fce10..904fb6c7d49 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; license = stdenv.lib.licenses.agpl3Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix index adae2dd067a..b434063cae9 100644 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ b/pkgs/applications/science/logic/coq/8.3.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation { license = licenses.lgpl21; branch = "8.3"; maintainers = with maintainers; [ roconnor vbgl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index c7fb4ffbb97..40fb9bfb160 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation { homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ mudri ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 6c51fb5192d..7f128340bf3 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation { homepage = http://isabelle.in.tum.de/; license = "LGPL"; maintainers = [ stdenv.lib.maintainers.jwiegley ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index c71ed73a992..27c8947b8cc 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 2d3b533a9a3..51ea9b9c0e7 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.schmitthenner ]; homepage = http://nevidal.org/sad.en.html; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 67a0834c00d..7aafe9da41e 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = lib.licenses.cpl10; maintainers = [ lib.maintainers.roconnor ]; description = "A C Library for Semidefinite Programming"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index ceebfa458a8..a30343dd0b9 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { license = "GPL2"; homepage = http://www-ice.iarc.fr/~martyn/software/jags/; maintainers = [stdenv.lib.maintainers.andres]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 5a6d3dd5404..e01b9654711 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.publicDomain; homepage = http://msieve.sourceforge.net/; maintainers = [ stdenv.lib.maintainers.roconnor ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 78ed209b1f6..4ac3500b6d9 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "Collection of machine learning algorithms for data mining tasks"; license = stdenv.lib.licenses.gpl2Plus; maintainer = [stdenv.lib.maintainers.mimadrid]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 108a089d981..3eaf91be58f 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "A general platform for complex network analysis and visualization"; license = stdenv.lib.licenses.lgpl21; maintainers = [stdenv.lib.maintainers.mimadrid]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5724db9f306..351bcccd45d 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation { See: http://www.gromacs.org/About_Gromacs for details. ''; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index 4e03371ff19..68b69f335b6 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Bazaar plugins"; homepage = http://wiki.bazaar.canonical.com/BzrTools; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 952d9b7f21a..2bfde38af29 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "A tool to convert CVS repositories to Subversion repositories"; homepage = http://cvs2svn.tigris.org/; maintainers = [ lib.maintainers.makefu ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index abd10285da5..f7c6ef25b73 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation rec { description = "Converts a Darcs repository into a Git repository"; homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } 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 b0b3c94f5ac..bb3bc806a68 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 @@ -36,5 +36,6 @@ stdenv.mkDerivation { homepage = http://repo.or.cz/w/fast-export.git; license = licenses.gpl2; maintainers = [ maintainers.koral ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 5ce665dda0f..fbe509675a1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; version = "0.5.0"; maintainers = [ maintainers.dochang ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 0f4e143324c..2ee34d3c6e3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { description = "GNU Privacy Guard-encrypted git remote"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ ellis ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index e90fc9ad258..68c680ca979 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { description = "Semi-official Mercurial bridge from Git project, once installed, it allows you to clone, fetch and push to and from Mercurial repositories as if they were Git ones"; license = licenses.gpl2; maintainers = [ maintainers.garbas ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index ef33b82e5c6..6a52983e83c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://deliciousinsights.github.io/git-stree; license = licenses.mit; maintainers = [ maintainers.benley ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index ade9ac1312a..afb01ff4a89 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { homepage = "http://josefsson.org/git2cl/"; description = "Convert git logs to GNU style ChangeLog files"; + platforms = stdenv.lib.platforms.unix; }; } 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 17e4b9b29f0..a1ae5e732d9 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = https://hub.github.com/; maintainers = with maintainers; [ the-kenny ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 9a19b358c90..d613e97d550 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.the-kenny ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index dc5c2231a7a..ad3311d967a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = { homepage = "http://source.android.com/source/downloading.html"; description = "Android's repo management tool"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index f2e47178775..682f4cfc6ba 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; updateWalker = true; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index b3bfe8a22e6..83116569dbe 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation homepage = http://www.twobarleycorns.net/tkcvs.html; description = "TCL/TK GUI for cvs and subversion"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 1711503314e..7559c4c70e7 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec{ description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index cb2a69b53ca..4712dfac757 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://dvdbackup.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bradediger ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 2f3193a5617..2503d78183f 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -91,5 +91,6 @@ stdenv.mkDerivation { description = "Non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 716eef466fb..efd0f257ca0 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation { + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) + ")"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 6e7b874841f..a56eba3bf5a 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Command line tool to make a copy from a video DVD for private use"; homepage = http://sourceforge.net/projects/lxdvdrip; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index c1faaded94c..80676b3cd0a 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -67,5 +67,6 @@ in stdenv.mkDerivation rec { homepage = "https://obsproject.com"; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl2; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index bc724102511..b158bc92460 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; homepage = http://tivodecode.sourceforge.net; + platforms = stdenv.lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index f8a35734534..b417489c14c 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xine-project.org/; description = "Xlib-based interface to Xine, a video player"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index d3c2e9e806a..36fe43b1d3d 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 2385fd3c41f..b374c982931 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index c88603892b5..7a6c44abb55 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://larswm.fnurt.net/; description = "9wm-like tiling window manager"; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 0e88944bb69..dc624f44986 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "X window manager for non-desktop embedded systems"; homepage = http://matchbox-project.org/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index c5ecefdcfc8..86f798e07e9 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix index 1d2683c40fd..40e41407f7b 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index 358f3d22f39..c28d090e0bd 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = "http://wmsystemtray.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 5a1f583b653..0ca38b9b04e 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; inherit version; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix index 50c3f5feb0b..0ea18d8768a 100644 --- a/pkgs/build-support/icon-conv-tools/default.nix +++ b/pkgs/build-support/icon-conv-tools/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { meta = { description = "Tools for icon conversion specific to nix package manager"; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index 3fb21a241bf..b45edf7947b 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "POSIX man-pages (0p, 1p, 3p)"; homepage = https://www.kernel.org/doc/man-pages/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 54b344f5068..b02c9162c1c 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.kernel.org/doc/man-pages/; repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index c438f839dbd..ce38dd9c61a 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "C++ STD manual pages"; homepage = http://gcc.gnu.org/; license = "GPL/LGPL"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 55420e2d344..59be4fd14c8 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Font, metrically identical to Arial and Times New Roman"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index acd16478fcf..d44517247dd 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "Korean font"; homepage = "http://kldp.net/projects/baekmuk/"; license = "BSD-like"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index fb1459831f6..bffa7edb604 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index b4750c90faa..9334468d76c 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { meta = { description = "A Unicode font"; maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 08888767c77..84c57fc7e8f 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "Various fonts from the DOSEmu project"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index 7cbad019d2f..35c53659c6e 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -50,6 +50,7 @@ let # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. license = stdenv.lib.licenses.free; homepage = http://users.teilar.gr/~g1951d/; + platforms = stdenv.lib.platforms.unix; }; }; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index ffa55a33e8e..670cb2317b4 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.avnik ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index ab163dcca9f..e6d4b6734bf 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://ipafont.ipa.go.jp/; license = licenses.ipa; maintainers = with maintainers; [ gebner ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index fe23b04c551..1f37630835d 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { homepage = http://ipafont.ipa.go.jp/ipafont/; license = stdenv.lib.licenses.ipa; maintainers = [ stdenv.lib.maintainers.auntie ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 45025701a1d..875d63ee8ce 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://junicode.sourceforge.net/; description = "A Unicode font"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index 4f6e430f7a2..3680205e23b 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { description = "An arab fixed-width font"; homepage = "http://makkuk.com/kawkab-mono/"; license = stdenv.lib.licenses.ofl; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index 574bc7f2921..6337387b376 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation { homepage = http://sourceforge.jp/projects/efont/; license = stdenv.lib.licenses.wadalab; maintainers = [ stdenv.lib.maintainers.auntie ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 543a4894f30..e694ba4db75 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { meta = { description = "Latin Modern font"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix index 90132272dd1..6e136c39eb0 100644 --- a/pkgs/data/fonts/lmodern/lmmath.nix +++ b/pkgs/data/fonts/lmodern/lmmath.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { meta = { description = "Latin Modern font"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix index 3642bf2eabc..c0454bc2730 100644 --- a/pkgs/data/fonts/lohit-fonts/default.nix +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -49,6 +49,7 @@ let # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. priority = 5; + platforms = stdenv.lib.platforms.unix; }; }; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index e719676564a..1f8d17509f7 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ryanoasis/nerd-fonts"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 80af5ab52d9..e914501721b 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix index 2fb4787774f..11132710a90 100644 --- a/pkgs/data/fonts/source-han-sans/default.nix +++ b/pkgs/data/fonts/source-han-sans/default.nix @@ -26,6 +26,7 @@ let description = "${language} subset of an open source Pan-CJK typeface"; homepage = https://github.com/adobe-fonts/source-han-sans; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; }; in diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix index 1049e6924bd..45d88901ea7 100644 --- a/pkgs/data/fonts/tipa/default.nix +++ b/pkgs/data/fonts/tipa/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { meta = { description = "Phonetic font for TeX"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index b2854b399f6..5fea1f795fd 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation { # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. priority = 5; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 9cfb89914b1..2bdeb297764 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -28,5 +28,6 @@ in homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/"; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index a40856e5910..30fede80251 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 46be9a6060b..3791305871c 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "A database of common MIME types"; homepage = http://freedesktop.org/wiki/Software/shared-mime-info; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index 986f3d35b7d..7c3f045b1b7 100644 --- a/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS: license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ]; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index 8e626e3bc52..f1cad801cdf 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.w3.org/TR/xhtml1/; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index 15d90be3131..1a6b585a22a 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/projects/terminal; description = "A modern terminal emulator primarily for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index d9e5cce25e8..bab89e7d9ec 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index da7369decc4..de55509aa40 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/; description = "Tools and M4 macros for Xfce4 developers"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index 4aad955ec24..187899b8964 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -22,11 +22,12 @@ buildFHSUserEnv { python27Packages.platformio ]); - meta = with stdenv.lib; { - description = "An open source ecosystem for IoT development"; - homepage = http://platformio.org; - maintainers = with maintainers; [ mog ]; - license = licenses.asl20; + meta = with stdenv.lib; { + description = "An open source ecosystem for IoT development"; + homepage = http://platformio.org; + maintainers = with maintainers; [ mog ]; + license = licenses.asl20; + platforms = with platforms; linux; }; runScript = "platformio"; diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index 69557019f15..03cfee61ce4 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; license = stdenv.lib.licenses.mpl11; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 76df7c2828f..d180de87cad 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/cseed/arachne-pnr; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.shell ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix index a7f37976ec4..4db3b1b5a8d 100644 --- a/pkgs/development/compilers/as31/default.nix +++ b/pkgs/development/compilers/as31/default.nix @@ -26,5 +26,6 @@ in stdenv.mkDerivation { homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31"; description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats"; maintainers = with maintainers; [ aneeshusa ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 24d0c43a39c..264e76d038c 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.eclipse.org/aspectj/; description = "A seamless aspect-oriented extension to the Java programming language"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 4bfe72c7acd..6ac5165b7e9 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { ''; homepage = http://mc-stan.org/interfaces/cmdstan.html; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 186cd908351..63290735f41 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.free; # public domain homepage = http://www.cons.org/cmucl/; maintainers = [stdenv.lib.maintainers.tohl]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index c9d58e433f6..d17a5775db2 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Linux 8086 development environment"; homepage = http://v3.sk/~lkundrak/dev86/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 588861ee42d..4705c327b42 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/webtoolkit/; description = "A development toolkit for building and optimizing complex browser-based applications"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 973a07b1295..934fbeeb6f9 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { description = "Intel ACPI Compiler"; homepage = http://www.acpica.org/; license = stdenv.lib.licenses.iasl; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 2734bc3235d..cd18f48ed48 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation (rec { homepage = http://caml.inria.fr/ocaml; license = with stdenv.lib.licenses; [ qpl lgpl2 ]; description = "Most popular variant of the Caml language"; + platforms = stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 492b1c4b333..49d1c64bfb9 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { homepage = http://opendylan.org; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 30b96822cab..e5f7612c487 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation { homepage = http://www.ponylang.org; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.doublec ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index 5d0b9052dba..e9c6b706e5a 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/ethereum/wiki/wiki/Serpent; license = with licenses; [ wtfpl ]; maintainers = with maintainers; [ chris-martin ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 7c44e03d701..d0b8ae7cf82 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = http://www.clifford.at/yosys/; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.shell ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 4a1111d5f6e..6ba1a59d545 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = http://home.gna.org/guile-cairo/; maintainers = [ ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index a70049094da..3e9736fff52 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ taktoa amiloradovsky ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 409a93447f8..1f25a2031f2 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A linear logic programming language for modeling generative interactive systems"; homepage = https://github.com/chrisamaphone/interactive-lp; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 05d896db383..c088f02ed69 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation { system that ensure clean, correct, multithreaded designs. ''; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index d9ce07f16f7..bed5b0ef0b3 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Programming language with macros and syntax at once"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 30a2f05f0e0..27368580de0 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = http://groovy-lang.org/; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index a318498ca64..277912f7667 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://www.gtk-server.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.tohl]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 55f1b1840fa..5db3f10fb07 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 1d05f9406b4..e17dd363873 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Ruby interpreter written in Java"; homepage = http://jruby.org/; license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index 6f7330eed67..0db23e0efed 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; maintainers = [ maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index 8a1d35a6c07..76e02f90f5f 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 87743023910..1aea9f44039 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; homepage = src.meta.homepage; license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 70f18740f68..0e368b31cdf 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = http://www.nial.com; license = stdenv.lib.licenses.artistic1; maintainers = [ stdenv.lib.maintainers.vrthra ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 6818a996d62..b079ff00334 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Command-line REPL for the Rascal metaprogramming language"; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 4630828fe87..1bfe8124104 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation { homepage = http://s48.org/; description = "Scheme 48"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = with stdenv.lib.platforms; unix; }; src = fetchurl { diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 0e6c06bbecd..8da41ea1a9c 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = http://www.scsh.net/; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index cbe2c47594d..330d8e334ac 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index b3fa96d756a..8279a4cd0df 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix index 96d73b69e62..13257a3eb33 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.2.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.5.nix index 0a71dc567b2..2334e1b6b7f 100644 --- a/pkgs/development/interpreters/spidermonkey/31.5.nix +++ b/pkgs/development/interpreters/spidermonkey/31.5.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index dcfa130de3a..1a7ce841d0c 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "SDL multi-channel audio mixer library"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 8d11689aba5..84944c0aa66 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "SDL TrueType library"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 6def7a92efc..045ad8925d9 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "SDL networking library"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 624faacde4f..5ca64730f51 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "SDL sound library"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 6084e7074fe..ca225b3381b 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation { meta = { description = "3D widget set based on the Athena Widget set"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 7d5c5fab393..5c7cd9fddc6 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "ATSC A/52 stream decoder"; homepage = http://liba52.sourceforge.net/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix index 0b20d8a41ea..b90db614e4a 100644 --- a/pkgs/development/libraries/aacskeys/default.nix +++ b/pkgs/development/libraries/aacskeys/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation { meta = { homepage = http://forum.doom9.org/showthread.php?t=123311; description = "A library and program to retrieve decryption keys for HD discs"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index a6cdf9eb860..0d698672721 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { meta = { description = "ASCII art graphics library"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index a16a0ef8cf5..4f74c5fca35 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = "http://code.google.com/p/accounts-sso/"; license = licenses.lgpl21; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 3ba91ccaa1a..83e3a0b2c59 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://www.freedesktop.org/wiki/Software/AccountsService; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 48e96aeea26..549310931f9 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.antigrain.com/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 0e3a1ccd3c4..04938868d10 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { homepage = http://activemq.apache.org/; description = "Messaging and Integration Patterns server written in Java"; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 8df7be4a7d1..b0d75d37e08 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -61,5 +61,6 @@ stdenv.mkDerivation rec { homepage = http://apr.apache.org/; description = "A companion library to APR, the Apache Portable Runtime"; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index b996069466b..76ef5ff1d98 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { homepage = http://asio.sourceforge.net/; description = "Cross-platform C++ library for network and low-level I/O programming"; license = stdenv.lib.licenses.boost; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 86cde42dfa1..a10d730d06e 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "C++ wrappers for ATK accessibility toolkit"; license = stdenv.lib.licenses.lgpl21Plus; homepage = http://gtkmm.org; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index e43a5acb6bd..d81bceffffb 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://bs2b.sourceforge.net/"; description = "Bauer stereophonic-to-binaural DSP library"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index f5de02e22bb..02b1af5ab52 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index d7b82764fc0..9cf4bb22e58 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec{ ''; license = licenses.publicDomain; maintainers = [ maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/bullet/bullet283.nix b/pkgs/development/libraries/bullet/bullet283.nix index ea792b98a32..36790dbe3a2 100644 --- a/pkgs/development/libraries/bullet/bullet283.nix +++ b/pkgs/development/libraries/bullet/bullet283.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/bulletphysics/bullet3; license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ aforemny ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 541115b1ff1..37b403548c9 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/bullet/; license = stdenv.lib.licenses.zlib; maintainers = with stdenv.lib.maintainers; [ aforemny ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 72b60391f4f..a3233c03712 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://tcl.activestate.com/software/tcllib/"; description = "High-level widget set for Tcl/Tk"; license = stdenv.lib.licenses.tcltk; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 67ae3b08ed8..9953f283924 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; license = with licenses; [ lgpl2Plus mpl10 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 3ab520fd4a6..090d03a1d14 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://catch-lib.net"; license = licenses.boost; maintainers = with maintainers; [ edwtjo ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 4dce56a8f1a..24d30937204 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation { homepage = "http://ceres-solver.org"; maintainers = with stdenv.lib.maintainers; [ giogadi ]; inherit version; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 54e5988eda6..a3d1a46e818 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { # Permissive BSD-style license. license = "permissive"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index 319892237ae..e572db68e83 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { homepage = http://www.jedrea.com/chmlib; license = "LGPL"; description = "A library for dealing with Microsoft ITSS/CHM format files"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index c166a6e4acf..1fa45992aee 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/tonyrog/cl; description = "OpenCL binding for Erlang"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 6c673a7dc02..32a4a574ed6 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://www.cs.wisc.edu/condor/classad/; description = "The Classified Advertisements library provides a generic means for matching resources"; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 90ee1cd03ca..0ba9e1545fb 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = http://clucene.sourceforge.net; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 33a789266d4..90cfbb1865c 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = http://clucene.sourceforge.net; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index be60c18353e..303a6ccaeb8 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "CommonMark parsing and rendering library and program in C"; homepage = https://github.com/jgm/cmark; maintainers = [ stdenv.lib.maintainers.michelk ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index 892e32777ea..a13b42a08a8 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html; license = stdenv.lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix index e11e0ae0a1c..95af4d94cf5 100644 --- a/pkgs/development/libraries/confuse/default.nix +++ b/pkgs/development/libraries/confuse/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/confuse/; description = "Configuration file parser library"; license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix index e5aab430829..56b23153dcf 100644 --- a/pkgs/development/libraries/cpptest/default.nix +++ b/pkgs/development/libraries/cpptest/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "Simple C++ unit testing framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.lgpl3; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index ab5cd2beff3..00b5f7a8f13 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A high performance templating engine"; homepage = http://ctpp.havoc.ru; maintiainers = with stdenv.lib.maintainers; [ robbinch ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 376c4de3b5f..3ee1edf519c 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = with stdenv.lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix index e774a9e923b..43c8d18eb88 100644 --- a/pkgs/development/libraries/despotify/default.nix +++ b/pkgs/development/libraries/despotify/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://despotify.se"; license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index f44a4a37fa7..61a85c7cd60 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pSub ]; homepage = http://www.azzit.de/dotconf/; license = licenses.lgpl21Plus; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index b5be3a40a0f..8675b046b20 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { description = "MIDI libraries for Qt5/C++"; homepage = http://drumstick.sourceforge.net/; license = licenses.gpl2Plus; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 4ea9f068d39..04e7b5e38cb 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://eigen.tuxfamily.org ; maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; branch = "2"; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix index 78756deb55e..02a422c2c84 100644 --- a/pkgs/development/libraries/enchant/default.nix +++ b/pkgs/development/libraries/enchant/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.abisource.com/enchant; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix index 63fc169355c..af8258a0196 100644 --- a/pkgs/development/libraries/esdl/default.nix +++ b/pkgs/development/libraries/esdl/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://esdl.sourceforge.net/; description = "Erlang binding to SDL that includes a binding to OpenGL"; license = "BSD"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index 12da7e89603..8825df657d2 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { ''; homepage = "http://www.balabit.com/support/community/products/"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix index 63afd22bcf8..aa55a7f0d1d 100644 --- a/pkgs/development/libraries/exosip/3.x.nix +++ b/pkgs/development/libraries/exosip/3.x.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 02349bc0267..9cf49b3c2c0 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix index 5e3776afbc0..4050bdfd9eb 100644 --- a/pkgs/development/libraries/facile/default.nix +++ b/pkgs/development/libraries/facile/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.recherche.enac.fr/log/facile; license = "LGPL"; description = "A Functional Constraint Library"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index 3467ac2cc3b..5c2ef0f6b4e 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://farsight.freedesktop.org/wiki/; description = "Audio/Video Communications Framework"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index eabb9789d79..a57c3da333e 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://www.freedesktop.org/wiki/Software/Farstream; description = "Audio/Video Communications Framework formely known as farsight"; maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 4c325198547..1b591efb578 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rsyslog/libfastjson"; license = licenses.mit; maintainers = with maintainers; [ nequissimus ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 38b306b577f..ac785d65c4e 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://fcppt.org; license = stdenv.lib.licenses.boost; maintainers = with stdenv.lib.maintainers; [ pmiddend ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index faf38ff4295..3fc3f37d2aa 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Libav/ffmpeg based source library for easy frame accurate access"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 25ba89994e5..39d63a8bd69 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 23795e9633e..669d023dde8 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { homepage = http://fribidi.org/; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 1fc2b21b5e5..161d836bf31 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "SyncML client sdk by Funambol project"; homepage = http://www.funambol.com; maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index 1f68131efd5..f1df8c5ff7f 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -10,5 +10,6 @@ stdenv.mkDerivation { homepage = https://code.google.com/p/garmintools; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ocharles ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 1ca0a2b5925..f66ade28da9 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index b6e515fef80..9a73b82f888 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://linuxbrit.co.uk/giblib/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index 13cd1c79b6a..2f9d54c0b4e 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { }; meta = { branch = "4.1"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 6d43ea9a309..12460f4f2d2 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://camaya.net/gloox"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index ee81aec0797..c9e78a9d56c 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://spruce.sourceforge.net/gmime/; description = "A C/C++ library for manipulating MIME messages"; maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index cf62b6a224b..47345e2a22c 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = http://home.gna.org/getfem/gmm_intro.html; license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix index 926832dbada..139cfab6e0c 100644 --- a/pkgs/development/libraries/gmock/default.nix +++ b/pkgs/development/libraries/gmock/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/googlemock/; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.auntie ]; + platforms = stdenv.lib.platforms.unix; }; passthru = { source = src; }; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 77af66f9724..5a367e1d593 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; homepage = http://goocanvas.sourceforge.net/; license = ["GPL" "LGPL"]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index f5fdf4eec44..4ab1b0cf56c 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index dbea97a0271..ede2b51c559 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 777f4a06313..2e30782f44b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 89b6e73e6b6..18d483594ef 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; description = "GStreamer's plug-in using FFmpeg"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index 889f55e5000..b0ac9e799e9 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index 07b846f35b4..adda7697ffc 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 52df259616b..d88160361ca 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index e0a6e23c972..185780e3716 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; homepage = http://hamlib.sourceforge.net; maintainers = with stdenv.lib.maintainers; [ relrod ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 372a8b8c112..77c1ca07dc9 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { homepage = http://hawksoft.com/hawknl/; description = "Free, open source, game oriented network API"; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index ddbcc3a26c2..e8a8ecee95e 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -42,5 +42,6 @@ in stdenv.mkDerivation { homepage = https://github.com/joyent/http-parser; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index a8f29b60c2b..b9781ba9aa0 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://incrtcl.sourceforge.net/; description = "Object Oriented Enhancements for Tcl/Tk"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index bd2f328e257..256d7cbdc87 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec{ homepage = http://ndevilla.free.fr/iniparser; description = "Free standalone ini file parsing library"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 8acd872fcb3..71bb871a45d 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = http://irrlicht.sourceforge.net/; license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/irrlicht/irrlicht3843.nix b/pkgs/development/libraries/irrlicht/irrlicht3843.nix index a682b3a6b82..c6e5b35f9e2 100644 --- a/pkgs/development/libraries/irrlicht/irrlicht3843.nix +++ b/pkgs/development/libraries/irrlicht/irrlicht3843.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { homepage = http://irrlicht.sourceforge.net/; license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 6e775d5cef2..55f44df2b4f 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://math.nist.gov/tnt/; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; + platforms = stdenv.lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 50bebca6b31..2dca5fa2240 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index 215234f9176..889137d6284 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2ClasspathPlus; maintainers = [ ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 0bcd164a525..8d9b4e54fe8 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix index b2928683184..e3c464482c7 100644 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { description = "Interface to scripting languages, including JSR-223"; homepage = http://commons.apache.org/proper/commons-bsf/; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 4e04ba47c85..a35eaa0b260 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 2018e3f11f2..6fddc3cfe0c 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 5c80bcadf4b..d49165ac521 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A library of utilities to assist with developing IO functionality"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index 82806871a62..a336ab50364 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Provides additional methods to manipulate standard Java library classes"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index ee407470202..4e3fa265502 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { description = "Wrapper around a variety of logging API implementations"; homepage = http://commons.apache.org/proper/commons-logging; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index ed04e2f410b..d43dcd2a91d 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A library of lightweight, self-contained mathematics and statistics components"; maintainers = with stdenv.lib.maintainers; [ copumpkin ]; license = stdenv.lib.licenses.asl20; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 5c83a0ba357..13b4df395e5 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { description = "GeoIP Java API"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 12f9995b56a..6947536fafb 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://www.jflex.de/; description = "Lexical analyzer generator for Java, written in Java"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index 3f0f13a4555..d7316ba3927 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.zeromq.org"; description = "Java bindings for ZeroMQ"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 960af32d359..37ab6b4f8fd 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation { homepage = http://www.mozilla.org/rhino/; license = with licenses; [ mpl11 /* or */ gpl2Plus ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index e91c8bbca7b..37b8b502c3b 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -67,5 +67,6 @@ in stdenv.mkDerivation rec { description = "An widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented"; license = licenses.epl10; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 83d3149a50f..123379d788d 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { homepage = http://jbig2dec.sourceforge.net/; description = "Decoder implementation of the JBIG2 image compression format"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 99dcb377620..9505192ef8a 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; license = licenses.lgpl2; maintainers = with maintainers; [ lethalman ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 6e2c085f3ba..1e687ff722b 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { homepage = http://judy.sourceforge.net/; license = stdenv.lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 9365cf0b5f0..4a0852f6a06 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { description = "Color management engine"; homepage = http://www.littlecms.com/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 270403cbb74..eacab92d36b 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { homepage = http://www.leptonica.org/; # Its own license: http://www.leptonica.org/about-the-license.html license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index c5b0c715620..b814f077f30 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = http://www.ics.forth.gr/~lourakis/levmar/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index a470dac24e1..32fecd3d99c 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; homepage = http://lib3ds.sourceforge.net/; license = "LGPL"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index e12929e9f69..229eca5e597 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index 36d1ddc7151..88396786ed7 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Support library for Reiser4"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 776cd0f5b91..b2404d4ef7f 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://xiph.org/ao/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix index 2f4a122d61e..a06ae978d51 100644 --- a/pkgs/development/libraries/libasr/default.nix +++ b/pkgs/development/libraries/libasr/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Free, simple and portable asynchronous resolver library"; license = licenses.isc; maintainers = [ maintainers.koral ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index d392f9a38e1..ccc2af8c394 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { homepage = "http://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index c44639d1f39..8b3522e2092 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://audacious-media-player.org/; license = licenses.bsd2; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 793c4992c3f..c02e345346d 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { inherit version; description = "ANSI C routines for fast base64 encoding/decoding"; license = stdenv.lib.licenses.publicDomain; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 67428f13249..1f47e5f8dcd 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 08905455d35..729fc27a0d3 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; maintainers = [ maintainers.abbradar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 541f70cabb8..8597e0d9cf1 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -19,5 +19,6 @@ in stdenv.mkDerivation { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index 5103d669408..cedc376972b 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 7a905d9c82a..ad93ebd3a46 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = http://libcaca.zoy.org/; description = "A graphics library that outputs text instead of pixels"; license = stdenv.lib.licenses.wtfpl; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 9a284d8988d..8645fa37c33 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { description = "C library to access data on a CDDB server (freedb.org)"; license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix index 2b4be7ae230..9cfc5f307ed 100644 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 4188306128e..f0cff815c44 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index f45fb378374..96c3db6ae43 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { homepage = http://libcello.org/; description = "Higher level programming in C"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index 6fc17256a39..b12b642668b 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = ftp://ftp.oops.org/pub/oops/libchardet/index.html; license = licenses.mpl11; maintainers = [ maintainers.abbradar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index 95339be7f3e..fff31a96ce7 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "High level C++ network packet sniffing and crafting library"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.lethalman ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix index cf142ac68c4..e5c09675c4b 100644 --- a/pkgs/development/libraries/libcrossguid/default.nix +++ b/pkgs/development/libraries/libcrossguid/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; homepage = https://github.com/graeme-hill/crossguid; + platforms = with platforms; linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libctemplate/2.2.nix b/pkgs/development/libraries/libctemplate/2.2.nix index 4851dbf3c54..7440039eec9 100644 --- a/pkgs/development/libraries/libctemplate/2.2.nix +++ b/pkgs/development/libraries/libctemplate/2.2.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { embed application logic in this template language. ''; homepage = http://code.google.com/p/google-ctemplate/; license = "bsd"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 62c7d432252..d171f57eb1b 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { homepage = http://code.google.com/p/libdivsufsort/; license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index 9b4e912772b..0d3f8349413 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { description = "A library that implements DVD navigation features such as DVD menus"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; + platforms = stdenv.lib.platforms.linux; }; passthru = { inherit libdvdread; }; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 5c931f4d6f4..a26b927a883 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "A library that implements DVD navigation features such as DVD menus"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; + platforms = stdenv.lib.platforms.linux; }; passthru = { inherit libdvdread; }; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix index eb5a48a99f1..fbe56023a91 100644 --- a/pkgs/development/libraries/libdvdread/4.9.9.nix +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { description = "A library for reading DVDs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index ef717fedb22..72b582a90ad 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A library for reading DVDs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 44eec24cb41..2378eb915a8 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://reality.sgiweb.org/davea/dwarf.html; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index ac75e6c8baa..f40f45d0e41 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.flamingspork.com/projects/libeatmydata/; license = stdenv.lib.licenses.gpl3Plus; description = "Small LD_PRELOAD library to disable fsync and friends"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix index ba3c6fb1a8f..293b1c28e93 100644 --- a/pkgs/development/libraries/libeb/default.nix +++ b/pkgs/development/libraries/libeb/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; maintainers = with maintainers; [ gebner ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index db8363d8522..e5461d90dd9 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/jiixyj/libebur128; license = licenses.mit; maintainers = [ maintainers.andrewrk ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix index 42a3c5f243b..0dae76243a8 100644 --- a/pkgs/development/libraries/libechonest/default.nix +++ b/pkgs/development/libraries/libechonest/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "A C++/Qt wrapper around the Echo Nest API"; homepage = "http://projects.kde.org/projects/playground/libs/libechonest"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index f3ea67ce93e..f5809b39197 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 4843b65c4d3..ebcba0fa155 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { homepage = http://libexif.sourceforge.net/; description = "A library to read and manipulate EXIF data in digital photographs"; license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 2b6571290df..6f1981d0ece 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 3123bb33d45..97168c3ae6c 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "F2c converts Fortran 77 source code to C"; homepage = http://www.netlib.org/f2c/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 6293632452c..36f4a04c9df 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "A library to talk to FTDI chips using libusb"; homepage = http://www.intra2net.com/en/developer/libftdi/; license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 249997d430f..90d1b21cd3f 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { homepage = "http://www.nongnu.org/gksu/"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index 4cc2f65440c..b03d7643f0f 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://mad.sourceforge.net/; license = licenses.gpl2; maintainers = [ maintainers.fuuzetsu ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index ad0fa8589f3..3e88ed99b85 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { description = "An implementation of the Infinote protocol written in GObject-based C"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index b97d4becb62..0cf07d0769a 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "iODBC driver manager"; homepage = http://www.iodbc.org; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 158962d3294..8e1ca68a69e 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { description = "Library for reading and writing the IPTC metadata in images and other files"; homepage = http://libiptcdata.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index 20a779b8050..e113d62c5f7 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; license = licenses.gpl2Plus; maintainers = with maintainers; [ vrthra ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index e680e6ae51e..85e32cc1af1 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 80fe974fcf2..6245a810c1d 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ kovirobi ]; license = stdenv.lib.licenses.mit; inherit version; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 025be200959..1529daa77bf 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { homepage = http://www.ijg.org/; description = "A library that implements the JPEG image file format"; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 04e37fd14f1..dec800da169 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "C++ Jabber library using Qt framework"; homepage = "https://qutim.org/jreen/"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index a22ae64dfde..bc23e1f2958 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -15,5 +15,6 @@ in stdenv.mkDerivation rec { homepage = "http://libjson.sourceforge.net/"; description = "A JSON reader and writer"; longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language."; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 1100c03e08f..aee95b1f1af 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { them.''; homepage = http://code.google.com/p/libkate; maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 6cb7defb097..fcecd3a9d13 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Library of the matchbox X window manager"; homepage = http://matchbox-project.org/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix index 5d13aa9a3cf..23f333562dc 100644 --- a/pkgs/development/libraries/libmcs/default.nix +++ b/pkgs/development/libraries/libmcs/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications"; homepage = http://www.atheme.org/projects/mcs.shtml; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index 256220fa211..d3f30a75273 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { ''; homepage = http://mhash.sourceforge.net; license = "LGPL"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 7ee0cbe1bd9..af1be85f592 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/libmicrohttpd/; maintainers = [ maintainers.eelco maintainers.vrthra ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 84e484fcc3d..ab451fcd5fd 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/saintdev/libmkv; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index 71611e2ad5b..06a98bcdceb 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "A development framework for C providing high performance and highly flexible algorithms"; homepage = http://www.atheme.org/projects/mowgli.shtml; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 19d912e5523..dac7cf48aac 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 1b981edcdcd..09d41c8bbe9 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { description = "A de/compression library for various Microsoft formats"; homepage = http://www.cabextract.org.uk/libmspack; license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index ab2a2d2afdd..49760f7fc53 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { file.''; license = licenses.lgpl21; maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libnfsidmap/default.nix b/pkgs/development/libraries/libnfsidmap/default.nix index 7ffca47fa00..74562ebe132 100644 --- a/pkgs/development/libraries/libnfsidmap/default.nix +++ b/pkgs/development/libraries/libnfsidmap/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://www.citi.umich.edu/projects/nfsv4/linux/; description = "Library for holding mulitiple methods of mapping names to id's and visa versa, mainly for NFSv4"; license = "BSD"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 003b2acc920..a9d07701dd9 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index ab6931c63ca..fdbc2ac8800 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "A small library for C application development"; homepage = https://launchpad.net/libnih; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 2b82fe2a4bc..c26a64ec804 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://galago-project.org/; # very obsolete but found no better description = "A library that sends desktop notifications to a notification daemon"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index b56697865a7..a66a1a88c74 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = http://libnova.sf.net; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 6ffef2140ec..a59420a7045 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio fingerprint created and provided by MusicIP''; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 857455fb4f3..0689be2c621 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { support the Ogg Vorbis audio format but now used for many free codecs including Dirac, FLAC, Speex and Theora.''; maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index a963288e869..73d51ec49ff 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { description = "Event loop library"; homepage = http://liboop.ofb.net/; license = "LGPL"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 334748d668c..54ee86f0a39 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/scrosby/OSM-binary; description = "C library to read and write OpenStreetMap PBF files"; license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index ab8e03b89a0..7bc4b316673 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "Library for handling paper characteristics"; homepage = "http://packages.debian.org/unstable/source/libpaper"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 89d9a3de02f..1c88167078f 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://parchive.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index b8985bbed82..d23d123a99c 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tcpdump.org; description = "Packet Capture Library"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index 964896131c9..f8c91df6468 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { homepage = http://www.libpgf.org/; description = "Progressive Graphics Format"; license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index e52f209dd3c..e181d680eff 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.libpng; maintainers = [ maintainers.fuuzetsu ]; branch = "1.2"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 8d1288f98ce..34e9bb12754 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://libpseudo.sourceforge.net/; description = "Simple, thread-safe messaging between threads"; license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 78c65d03bfd..a67395182e1 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "A library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2; maintainers = [maintainers.tohl]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 34eabfe6473..8e6fa005635 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://librdf.org/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 831292bf1d9..3684fd924f7 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.lgpl2Plus; homepage = https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix index 76daf7d748b..9738794b6b1 100644 --- a/pkgs/development/libraries/librsync/0.9.nix +++ b/pkgs/development/libraries/librsync/0.9.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { homepage = http://librsync.sourceforge.net/; license = stdenv.lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 956b3148ad7..1cf937586c3 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jcumming ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index 32fec68ad01..122ece574e6 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { description = "An interpreter for RFC 3028 Sieve and various extensions"; homepage = "http://sodabrew.com/libsieve/"; license = licenses.lgpl21; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 896b321272a..842471a263d 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://libsigc.sourceforge.net/; description = "A typesafe callback system for standard C++"; branch = "1.2"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix index 81b563bb022..0712ba92f60 100644 --- a/pkgs/development/libraries/libsigsegv/2.5.nix +++ b/pkgs/development/libraries/libsigsegv/2.5.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { homepage = http://libsigsegv.sf.net; description = "A library for handling page faults in user mode"; branch = "2.5"; + platforms = stdenv.lib.platforms.linux; }; doCheck = true; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index cabdd1385d7..be3cbe39a30 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 86f6a7f2479..b57247b8fa2 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://saitoha.github.com/libsixel; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index bd38c37a57b..660d7e16310 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Extensible spatial index library in C++"; homepage = http://libspatialindex.github.io/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 5c10fff50ad..a04c5631ecb 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index 19b490a0f18..a2e94c33ce3 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "The next generation SRS library from the original designer of SRS"; license = with lib.licenses; [ gpl2 bsd3 ]; homepage = http://www.libsrs2.org/; + platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index 3a09a0de4bf..29fa8fc339f 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { easy to work with, and notably used by FVWM. ''; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index a81d5a686bc..35d3d759ea8 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec{ homepage = "http://www.shlomifish.org/open-source/projects/libtap/"; license = licenses.bsd3; maintainers = [ maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index bbc7c9a6094..43c8292a200 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal keypress reading library"; license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 5461421769b..58e92f11018 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/libtiger/; authors = [ "Vincent Penquerc'h" ]; description = "A rendering library for Kate streams using Pango and Cairo"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 896c907bbc8..0c53a3e3dad 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { meta = { homepage = "http://libtom.org/?page=features&newsitems=5&whatfile=crypt"; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 8e9b79b39d3..8b7c06b98dc 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://math.libtomcrypt.com/; description = "A library for integer-based number-theoretic applications"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index e8ccbbee488..d0b69e0348f 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index b1d149a0445..da8fe507540 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 33e01f86dac..170af8f172e 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://dri.freedesktop.org/wiki/S3TC; repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 4b81152a432..ea411d73b31 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = https://www.byvoid.com/zht/project/uchardet; license = licenses.mpl11; maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index eea8d70e15d..8d1077ee6a0 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "A library for writing single instance applications"; license = licenses.lgpl21; maintainers = [ maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index f60043f18b1..0cdcbd72bae 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = http://live.gnome.org/LibUnique; description = "A library for writing single instance applications"; license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 458798f9382..478052dd536 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.libimobiledevice.org"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index c0880ee896f..90c1f07da5a 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://libviper.sourceforge.net/; description = "Simple window creation and management facilities for the console"; license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index bdede8f18cf..229563d46af 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { description = "WMF library from wvWare"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 01ae59efdf4..56c598ca7de 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "A library for importing and exporting WordPerfect documents"; homepage = http://libwpd.sourceforge.net/; license = licenses.lgpl21; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix index 4b0c4db2d9c..a8a6200519e 100644 --- a/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/pkgs/development/libraries/libxdg-basedir/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { homepage = http://n.ethz.ch/student/nevillm/download/libxdg-basedir/; description = "Implementation of the XDG Base Directory specification"; license = "BSD"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 7087142a2aa..205ebc85a12 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = http://xkbcommon.org; license = licenses.mit; maintainers = with maintainers; [ garbas ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index f074b31bb68..46fe515faaf 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Library providing high-level API for X Keyboard Extension known as XKB"; homepage = http://freedesktop.org/wiki/Software/LibXklavier; license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 3805e8c1ce8..5868fdf8b63 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index fbae5245b6d..133bc13d1cc 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { homepage = "http://log4cplus.sourceforge.net/"; description = "A port the log4j library from Java to C++"; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index d4400d840c0..b5a6ecac9cf 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { homepage = http://log4cpp.sourceforge.net/; description = "A logging framework for C++ patterned after Apache log4j"; license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index cae6e5c0a55..7e5a62e63f4 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = http://logging.apache.org/log4cxx/index.html; description = "A logging framework for C++ patterned after Apache log4j"; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 1e3ed216f5a..dfb3077f58f 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight C library for the Jabber protocol"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index e03535ba979..50baad6a7a0 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/luabind/luabind; description = "A library that helps you create bindings between C++ and Lua"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 74c7b5e7261..9f9b6aa4482 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 8d433461d0c..a0d17666d52 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "OpenGL utility library"; homepage = http://cgit.freedesktop.org/mesa/glu/; license = stdenv.lib.licenses.sgi-b-20; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index 57fb2cef35e..791cc9f3f91 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = https://www.inf.ethz.ch/personal/gaertner/miniball.html; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.erikryb ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index b68f04f642f..53f348f93f8 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://muparser.sourceforge.net; description = "An extensible high performance math expression parser library written in C++"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index 1be9f453bb4..fbd0c053f04 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { meta = { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 0ca64c9bb07..bd27790447a 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { meta = { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 9b2364e7090..bf7b5397345 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "C++ API to manipulate netcdf files"; homepage = "http://www.unidata.ucar.edu/software/netcdf/"; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index e7215555475..53b2b635864 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = "http://www.unidata.ucar.edu/software/netcdf/"; license = stdenv.lib.licenses.free; maintainers = stdenv.lib.maintainers.bzizou; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index ac26ac7126f..1cb8408416d 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "OpenCL ICD Loader"; homepage = https://forge.imag.fr/projects/ocl-icd/; license = licenses.bsd2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index e7d2f2984fb..b6728829660 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Open Dynamics Engine"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index bff367f750b..d42677254e3 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Paged Geometry for Ogre3D"; homepage = http://code.google.com/p/ogre-paged/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index d12423ffc27..62b0080fce0 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "Regular expressions library"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 9b931894f66..228e628aa19 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Khronos OpenCL headers"; homepage = https://www.khronos.org/registry/cl/; license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 71983b30a2c..8232af3e789 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "A codec library which supports H.264 encoding and decoding"; homepage = http://www.openh264.org; license = stdenv.lib.licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index 6d79587abcb..eb3c1202367 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.pango.org/; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 78cfeb13a2c..a7551afd212 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 4092783b0c9..fa373a7e97f 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; license = with licenses; [ "BSD" gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index eba74c0adc1..51e59fda5ac 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; homepage = http://plib.sourceforge.net/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index 77d3abd4a5e..ac4041ee964 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Voice recognition library written in C"; homepage = http://cmusphinx.sourceforge.net; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index fa5c77aa27a..523189c3b2e 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { meta = { description = "A Qt wrapper around PolKit"; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix index bdeb175b89f..3c69c71d017 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { meta = { description = "A Qt wrapper around PolKit"; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 02d758f89f2..441da25836d 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Command line option parsing library"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 518eeee9253..6ca35ab3c57 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { homepage = "http://portmedia.sourceforge.net/portmidi/"; description = "Platform independent library for MIDI I/O"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 96388c3a35a..d6e699929ba 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index f67d877cda0..d4b7c77a5fe 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { license = "mBSD"; homepage = https://developers.google.com/protocol-buffers/; + platforms = stdenv.lib.platforms.unix; }; passthru.version = version; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index c5e26c1dfad..9d47b557551 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = "BSD-style"; homepage = http://pupnp.sourceforge.net/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 7ee11591605..9433eb87109 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://delta.affinix.com/qca; maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 4e6b50502d6..431fd432ecb 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = "LGPL"; homepage = http://delta.affinix.com/qca; maintainers = [ maintainers.sander maintainers.urkud ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index f98c7bdb97e..58d11c04fcc 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.qhull.org/; description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index dcf453fd8e1..4e74e31e3ec 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { description = "Graphical effect and filter library for KDE4"; license = stdenv.lib.licenses.bsd2; homepage = "http://${pn}.sourceforge.net"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index bc44f53fa6e..d5f4389169b 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.riverbankcomputing.com/software/qscintilla/intro; license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index 0cb62914b7f..5cf49450422 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { description = "Qt Mobility"; homepage = http://qt.nokia.com/products/qt-addons/mobility; maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 6ab29fa9ac5..329cea9ff2a 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Platform-independent Qt API for storing passwords securely"; homepage = "https://github.com/frankosterfeld/qtkeychain"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index 13916040fba..9e7c5c1d4e3 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation { patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; meta = { branch = "5"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index fd8a0764f49..65ab4ed24ce 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (rec { maintainers = [ ]; branch = "6.2"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index f5e7f23c108..cabd89dc935 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "An open source library to extract valid data from within an Open Street Map input file"; homepage = https://www.gaia-gis.it/fossil/readosm; license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix index aae67868884..f96addffb1a 100644 --- a/pkgs/development/libraries/rlog/default.nix +++ b/pkgs/development/libraries/rlog/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.arg0.net/rlog; description = "A C++ logging library used in encfs"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index c9f9bcfa9a7..217bf4422e0 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 376c80962cd..ce35743e8bc 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { description = "Basic Linear Algebra Subprograms"; license = stdenv.lib.licenses.publicDomain; homepage = "http://www.netlib.org/blas/"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index bb33eed6142..fe90fa2e171 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = http://www.chokkan.org/software/liblbfgs/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 16174a80212..070e2b1be1f 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 7dc6c32a8db..f81df2a6c02 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation { description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 480cc81c53c..934137a8b6d 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; maintainers = [ maintainers.astsmtl ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix index 57124f575a1..a9bd719fdc2 100644 --- a/pkgs/development/libraries/sfsexp/default.nix +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = "http://sexpr.sourceforge.net/"; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 36b6aff8105..5ab681b21b2 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { homepage = http://people.csail.mit.edu/jaffer/SLIB; maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 2f300abebbf..388b34d31e1 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 94c3687e2d4..6f7d154bbe8 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = https://www.gaia-gis.it/fossil/spatialite-tools; license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index b2c2f0d0851..2c1e3a2dfc9 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://tcl.activestate.com/software/tcllib/"; description = "Tcl-only library of standard routines for Tcl"; license = stdenv.lib.licenses.tcltk; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index 278fed37514..7d445408fa2 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = "http://tls.sourceforge.net/"; description = "An OpenSSL / RSA-bsafe Tcl extension"; license = stdenv.lib.licenses.tcltk; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index bb187ce1202..69d833064ed 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://telepathy.freedesktop.org; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 231550cd557..7fc403f0739 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -69,5 +69,6 @@ in stdenv.mkDerivation { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 51e3ac45267..5e3d1600000 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://math.nist.gov/tnt/; description = "Template Numerical Toolkit: C++ headers for array and matrices"; + platforms = stdenv.lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index aa4a5578691..fec256e703f 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://xiph.org/tremor/; description = "Fixed-point version of the Ogg Vorbis decoder"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index 05acc6f5308..c9133b64846 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { homepage = http://www.oberhumer.com/opensource/ucl/; description = "Portable lossless data compression library"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 81ca7e75021..6105db73bc7 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/groups/uhttpmock/; license = licenses.lgpl21; maintainers = with maintainers; [ DamienCassou ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index e0ce2ab224e..bc9035d479b 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Lightweight unit testing framework for C++"; license = licenses.mit; maintainers = [maintainers.tohl]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index 9a7475969c6..b0a4cc07bc6 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { description = "Micro String API for C language"; license = licenses.bsd2; maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 02a4155947f..c7b8ddd8d6f 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index d07c1d55047..ce0fd327304 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.boost; # see # + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 08258f677a4..6bbc7705671 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { astronomy.''; license = stdenv.lib.licenses.lgpl3Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 7146ec4bb5b..ebd9d51208a 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = "http://www.zaphoyd.com/websocketpp/"; description = "C++/Boost Asio based websocket client/server library"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index ed7c1e046d5..eeb480e6847 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -69,5 +69,6 @@ composableDerivation.composableDerivation {} rec { homepage = xapian.meta.homepage; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 8a09d835f3d..7c4b699e615 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://xapian.org/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 3a37afc1cbe..83c75dcfa8a 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xine-project.org/; description = "A high-performance, portable and reusable multimedia playback engine"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/zeromq/2.x.nix b/pkgs/development/libraries/zeromq/2.x.nix index 59a7ed17110..dd7404486d3 100644 --- a/pkgs/development/libraries/zeromq/2.x.nix +++ b/pkgs/development/libraries/zeromq/2.x.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { branch = "2"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index c0b50c490ff..24cbc818cdd 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { homepage = http://www.openzim.org/wiki/Zimlib; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ robbinch ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index 3f91901d9b6..a7757d1eacd 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -24,5 +24,6 @@ in stdenv.mkDerivation { homepage = "http://www.ocaml.info/home/ocaml_sources.html"; description = "Generic OCaml Makefile for GNU Make"; license = "LGPL"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index b0fa789d157..cdf5a73768d 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "Python libsexy bindings"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 598056a0c36..012c8c42d6a 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus; license = licenses.gpl2; maintainers = with maintainers; [ jgeerds ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 77a52990646..a6a4d367f1f 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://live.gnome.org/PyGObject; description = "Python bindings for Glib"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index b5cad09d9e1..3faba55d6a8 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://live.gnome.org/PyGObject; description = "Python bindings for Glib"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 5e372535b8e..18b92038194 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.stringtemplate.org/"; description = "Text Templating Library"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix index cd878a35897..a992a90623e 100644 --- a/pkgs/development/tools/activator/default.nix +++ b/pkgs/development/tools/activator/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://typesafe.com/activator"; license = licenses.asl20; maintainers = with maintainers; [ edwtjo cko ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index fc1e8e5d54e..b481c1e80e5 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://checkstyle.sourceforge.net/; license = licenses.lgpl21; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 8275beff88d..c4e37e5c700 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://emma.sourceforge.net/; description = "A code coverage tool for Java"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index aab47dadc90..a5a3d243918 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { description = "A static analysis tool to find bugs in Java programs automatically"; homepage = http://findbugs.sourceforge.net/; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index fb68ce5d84b..cf5b974b50f 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.gal_bolle ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 7098771cc6e..e5bed62d324 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Scans Java source code and looks for potential problems"; homepage = http://pmd.sourceforge.net/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 1730eb6a683..e2cb2c85b62 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { description = "A semantic analysis tool for C"; homepage = "http://smatch.sourceforge.net/"; license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */ + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 71e8dcc4953..9d97b0f9f31 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/android-apktool/; license = licenses.asl20; maintainers = with maintainers; [ offline ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 96bbc2be0b2..bdd50421c1f 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "Build automation tool (used primarily for Java projects)"; homepage = http://maven.apache.org/; license = licenses.asl20; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index ff23390d79c..c103d11ac6e 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "Build tool that builds code quickly and reliably"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.philandstuff ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index edc901858b8..9f4cb366e23 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Simple wrapper around make to colorize the output"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix index 7281f4509db..333ff352927 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 533808243a2..07cdf3fbd6d 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -47,6 +47,7 @@ rec { ''; homepage = http://www.gradle.org/; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; }; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 9c7a7287cfd..18cbe7731c0 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { homepage = http://public.perforce.com/wiki/Jam; license = stdenv.lib.licenses.free; description = "Just Another Make"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 7d89555085d..27c9cc7955f 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "http://www.liquibase.org/"; license = licenses.asl20; maintainers = with maintainers; [ nequissimus ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index 7d05a56bfdf..4d4dac0c834 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3; homepage = "https://github.com/aggelgian/cuter"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 1a57afbfa90..434348473ef 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/pkgs/development/tools/flamegraph/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = licenses.cddl; homepage = http://www.brendangregg.com/flamegraphs.html; description = "Visualization for profiled code"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix index f7e95503d06..1ccd1061a13 100644 --- a/pkgs/development/tools/github/github-release/default.nix +++ b/pkgs/development/tools/github/github-release/default.nix @@ -47,5 +47,6 @@ in stdenv.mkDerivation rec { license = licenses.mit; homepage = https://github.com/aktau/github-release; maintainers = with maintainers; [ ardumont ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index fdeafcbb4fe..e6a317a2f88 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { homepage = "http://www.gnu.org/software/gnulib/"; description = "Central location for code to be shared among GNU packages"; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 6cce86a8062..a1564859e84 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/g-wrap/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.taktoa ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 1a23f1ba233..0993ee7b544 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { description = "Everything you need to get started using Heroku"; maintainers = with maintainers; [ aflatter mirdhyn ]; license = licenses.mit; + platforms = with platforms; unix; }; src = fetchurl { diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 8435c3f4b9a..8195aea8b38 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.clifford.at/icestorm/; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.shell ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix index 5930d4789a4..00397978054 100644 --- a/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec{ homepage = http://nuweb.sourceforge.net; license = licenses.free; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } # TODO: nuweb.el Emacs integration diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 70dccdcd626..fc97113bc47 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "Archive of autoconf m4 macros"; homepage = http://www.gnu.org/software/autoconf-archive/; license = licenses.gpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 29939a423af..0b32f02f258 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix index a06426e9cf4..2d9937bc48c 100644 --- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index 860ea220799..608c17f9214 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "KDE Meta Object Compiler"; license = licenses.bsd2; maintainers = [ maintainers.sander maintainers.urkud ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index bc1f348040c..f538c213892 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -63,6 +63,7 @@ let ccache = stdenv.mkDerivation rec { downloadPage = https://ccache.samba.org/download.html; license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; }; }; in ccache diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 338585122a5..b00b9cc9910 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/checkbaskisms/; description = "Check shell scripts for non-portable syntax"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index a7298214926..e79326eeba4 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { description = "Tool to generate C function prototypes from C source code"; homepage = http://cproto.sourceforge.net/; license = stdenv.lib.licenses.publicDomain; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index f63a726f73b..1c0f80e1ddd 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = http://dfu-programmer.sourceforge.net/; maintainers = [ maintainers.the-kenny ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 6c80e6faf5e..28b108c743f 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { description = "Lift documents in nroff markups to XML-DocBook"; homepage = http://www.catb.org/esr/doclifter; license = "BSD"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index 8b07f554c6a..aae4a2fd5a1 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 bsd3 ]; version = "0.12.1"; maintainers = [ maintainers.dochang ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 9f04e283722..30cbc0daab9 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://hal.freedesktop.org/releases/; description = "D-Bus bindings for GObject"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index eda98091fc6..0670428005e 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index c1ab6ebe074..4ea939b0156 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Preprocessor for making GObjects with inline C code"; homepage = http://www.jirka.org/gob.html; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index f0fd081ec5f..bfada264d50 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/gperf/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix index ecfd0e1fb8b..fc98d9703ef 100644 --- a/pkgs/development/tools/misc/grafana/default.nix +++ b/pkgs/development/tools/misc/grafana/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.offline ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index d58ba8cddf2..b9d03445286 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = http://gtkdialog.googlecode.com/; description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index c66455791e8..b533f6214f3 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { homepage = https://www.gnu.org/software/indent/; description = "A source code reformatter"; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index 07ef5ffc082..cecc25355ca 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { homepage = http://siliconforks.com/jscoverage/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index f356827a93a..f3fe7e40623 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.elasticsearch.org/overview/kibana; license = licenses.asl20; maintainers = with maintainers; [ offline rickynils ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 262d8aad23b..88a33bb5dcc 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/libtool/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 27ec2772e09..a81255212da 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ab43184a725..ed2f0f10165 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { from it). ''; maintainers = [ stdenv.lib.maintainers.mornfall ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index c8f888f6dff..e1602b0d24e 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Library call tracer"; homepage = http://www.ltrace.org/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index 8e9825d72d8..bae9f07bda4 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.agner.org/optimize/; license = licenses.gpl2; maintainers = with maintainers; [ vrthra ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index a71afd5d472..18f3fe375cb 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { trees or files; and vifn, to invoke vi given a function name rather than a file name. ''; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix index 59ce43bf891..77f61386874 100644 --- a/pkgs/development/tools/misc/premake/3.nix +++ b/pkgs/development/tools/misc/premake/3.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { homepage = http://industriousone.com/premake; description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix index 1d2a3cda2b6..01e4b22e5f1 100644 --- a/pkgs/development/tools/misc/rman/default.nix +++ b/pkgs/development/tools/misc/rman/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { meta = { description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; license = "artistic"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index ccfe19496c1..f9254abe102 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; version = "20160105"; maintainers = [ maintainers.dochang ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 6eb384f51e3..2e0d020688e 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/texinfo/; branch = "4.13"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 5be797507c0..fdfac484bf1 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { description = "Berkeley YACC"; homepage = http://dickey.his.com/byacc/byacc.html; license = stdenv.lib.licenses.publicDomain; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 14209225bc6..97ee871c87e 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { branch = "2.5.35"; homepage = http://flex.sourceforge.net/; description = "A fast lexical analyser generator"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index dc25633005b..64d5f2f551b 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://flex.sourceforge.net/; description = "A fast lexical analyser generator"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index ea66204d9cd..7cfb39ebded 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://jikes.sourceforge.net/; description = "The Jikes Parser Generator"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 826ca93aa7d..e3dc3d77abc 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { do not need to be recompiled. In fact they don't even have to be restarted. ''; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 108688b782a..02ab4c06a50 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -81,5 +81,6 @@ in stdenv.mkDerivation rec { homepage = https://github.com/garbas/pypi2nix; description = "A tool that generates nix expressions for your python packages, so you don't have to."; maintainers = with stdenv.lib.maintainers; [ garbas ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index a62f92df98a..9b24a8fe8ea 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/andersbakken/rtags; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 4ae814022d6..c11e1b34f1a 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = http://www.codenix.com/~tolua/; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 0798173a64d..7015bf55761 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "Multiplayer 3D Tank game"; homepage = http://bzflag.org/; license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 224eb6f594a..28cea5e0c77 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { meta = { homepage = http://chessdb.sourceforge.net/; description = "A free chess database"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 53aab088da0..170778b72a9 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A cross-platform virtual tabletop for multiplayer card games"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ spencerjanssen ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 007167dc696..a6e7c183fba 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/gerstrong/Commander-Genius"; maintainers = with stdenv.lib.maintainers; [ hce ]; license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index 0bc38f876f4..84ba7b4b7d8 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { homepage = http://karimmi.de/cuyo; description = "Stacking blocks game, with different rules for each level"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 3d070c5eafb..1a99fcd9c24 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.bergo.eng.br/eboard/; description = "Chess interface for Unix-like systems"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index a4f296da039..69d87411da6 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -71,5 +71,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://eduke32.com; maintainers = with maintainers; [ nckx sander ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index f2417428880..26323636402 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://sourceforge.net/projects/extremetuxracer/; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index a79b6f8d5d8..27ffcf2e742 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { homepage = http://exult.sourceforge.net/; description = "A reimplementation of the Ultima VII game engine"; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 1c641f55c47..de245913861 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec{ homepage = http://fc-solve.shlomifish.org/; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 12182b8712c..db18bc7c249 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation { meta = { description = "Cellular automata engine tuned towards the likes of Falling Sand"; maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index d26dfc2401c..20e3f69152c 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { description = "Remake of AV Arcade Volleyball"; homepage = http://gav.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 3f1d52c5fc0..4e6163d7163 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { description = "GNU Go - A computer go player"; homepage = "http://http://www.gnu.org/software/gnugo/"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index 7bdcc7afecd..ba9173c0492 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { homepage = http://www.newbreedsoftware.com/icbm3d/; description = "3D vector-based clone of the atari game Missile Command"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 8fe7591cde0..f45f9e9dcb2 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = http://olofson.net/kobodl/; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index ce0691dae1b..5718ed1918e 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "Mascot Constructive Pilot for X"; homepage = http://rosegray.sakura.ne.jp/macopix/index-e.html; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index fc101ba792a..dff005c0095 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "A game about fighting with ships in a 2D space setting"; license = licenses.gpl3Plus; maintainers = [ maintainers.astsmtl ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 88cfbe98851..ba17fe28e35 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://trackballs.sourceforge.net/; description = "Cross-platform pacman-like game"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 04b74b4214f..6aaadf077fd 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { homepage = http://openlierox.net; description = "Real-time game with Worms-like shooting"; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index 98cf0dbeed8..74e5e50b4e8 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { homepage = http://www.newbreedsoftware.com/3dpong/; description = "One or two player 3d sports game based on Pong from Atari"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index 06e43fd273f..db0b81f5567 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Car racing game"; homepage = http://hippo.nipax.cz/download.en.php; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index e0e6de6b8ef..abad2188a0d 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -24,5 +24,6 @@ You drive a toy wood engine in many levels and you must collect all the coaches to win. ''; maintainers = with stdenv.lib.maintainers; [ jcumming ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index b8a8fae633b..a51b51395db 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; homepage = http://www.scummvm.org/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 29e923108e1..25038f0f740 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { homepage = http://supertuxkart.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix index 163320d8ae2..1981d3474d1 100644 --- a/pkgs/games/super-tux/default.nix +++ b/pkgs/games/super-tux/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://supertux.github.io/; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index e5d9e5e9751..7933ef2f069 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { homepage = http://www.newbreedsoftware.com/teetertorture/; description = "Simple shooting game with your cannon is sitting atop a teeter totter"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 3123d81af16..a118c0f0452 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Tales of Maj'eyal (rogue-like game)"; maintainers = [ stdenv.lib.maintainers.chattered ]; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 7cf741f2fab..65e8f82178e 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://trackballs.sourceforge.net/; description = "3D Marble Madness clone"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 9d233d38338..d6bcb787d60 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -104,5 +104,6 @@ in stdenv.mkDerivation rec { homepage = http://sc2.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ jcumming aszlig ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index f87633e299b..f1e9c13f86b 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { homepage = http://www.newbreedsoftware.com/vectoroids/; description = "Clone of the classic arcade game Asteroids by Atari"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/base16/default.nix b/pkgs/misc/base16/default.nix index 6b53f952aad..9699065864a 100644 --- a/pkgs/misc/base16/default.nix +++ b/pkgs/misc/base16/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/chriskempson/base16"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 60d15ec1282..f38ed7f0309 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { Canon printer. The design is based on reverse engineering of the protocol. ''; homepage = http://cups-bjnp.sourceforge.net; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index b5ab61edb95..ac3e96e2658 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation { meta = { description = "Some additional CUPS drivers including Canon drivers"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index 7cf70cf9555..61d7810c2d4 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Flexible Linux input device translator, geared for gamepads"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index a6f99cca8cc..4e0b609fdb0 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -22,6 +22,7 @@ in stdenv.mkDerivation { description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ maintainers.fuuzetsu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index fc48d607bb2..9d4a142cf2e 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec{ ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index ce6c6f35a36..1cf52368d62 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec{ ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index 60854f8550b..01c5f866e1b 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 00202f85df7..ebbb1fe7c31 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.dosbox.com/; description = "A DOS emulator"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 529e5d3d0a2..57a5591f93a 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "http://emulationstation.org"; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 5462f772703..1f986430b81 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { homepage = http://fakenes.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 64d5dfd69a7..42469c5daf4 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { description = "A Nintendo Entertainment System (NES) Emulator"; license = stdenv.lib.licenses.gpl2; homepage = http://www.fceux.com/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 89f4e2338b4..0f85331bdd5 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec{ license = licenses.gpl2Plus; homepage = http://fs-uae.net; maintainers = [ maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; }; } # TODO: testing and Python GUI support diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index a35b7a846b1..a38576dcbe4 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 571e14347b4..a51d97773e4 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index a13cc49b572..3a537aafa76 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { homepage = http://retrofe.com; license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 46b1c51dca5..99de1ae0d17 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.qknight ]; homepage = http://www.snes9x.com/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index f877eff5c64..b57a2143cc2 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 9c79852a4aa..82193bc350b 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lassulus ]; homepage = http://vba-m.com/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 143c23ee86c..dd2c2380a8e 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { homepage = http://www.viceteam.org; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 2d729f7185f..357d65aed53 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21; homepage = http://code.google.com/p/winetricks/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index be7666487b9..8ad0ca39b07 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -70,5 +70,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index 14d487da82b..22aaa2d1cb5 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation { description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 73b987baeb0..25994ba3562 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { original collection, plus a few others. ''; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index f2fda02f9ae..7447620e71b 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { homepage = "http://http://www.hyperrealm.com/${name}"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix index 969f21d6ec1..965ee82a826 100644 --- a/pkgs/misc/themes/albatross/default.nix +++ b/pkgs/misc/themes/albatross/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A desktop Suite for Xfce"; homepage = http://shimmerproject.org/our-projects/albatross/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index 0b907f747a8..5c2d68dfd96 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = http://github.com/shimmerproject/Blackbird; license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 173b392d22a..fbf55cfc529 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = http://shimmerproject.org/our-projects/greybird/; license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/misc/themes/orion/default.nix index da46beb0fb0..4872d62ae51 100644 --- a/pkgs/misc/themes/orion/default.nix +++ b/pkgs/misc/themes/orion/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/shimmerproject/Orion; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index abfeb4dd22d..a3a58d8eccf 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { homepage = http://urbit.org; license = licenses.mit; maintainers = with maintainers; [ mudri ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index 083ff3213fe..9b2a984f3ae 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -46,5 +46,6 @@ in stdenv.mkDerivation rec { homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.guibert ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index ab81ece5f71..5871d1c6990 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = http://www.alsa-project.org/main/index.php/Main_Page; description = "Soundcard firmwares from the alsa project"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 3a8aa08d8a3..6ae9d8d2667 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -37,5 +37,6 @@ in stdenv.mkDerivation { homepage = http://www.linux-consulting.com/Amd_AutoFS/autofs.html; license = stdenv.lib.licenses.gpl2; executables = [ "automount" ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index 3871630758c..886aa503abb 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { meta = { description = "Block layer IO tracing mechanism"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 4f30bc19caf..ea979ed0c22 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.bluez.org/; description = "Bluetooth support for Linux"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 701b9742b6a..224239a4aff 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Firmware extractor for cards supported by the b43 kernel module"; homepage = http://wireless.kernel.org/en/users/Drivers/b43; license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index f5b6abdd9c7..bfcef1d9c1a 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { homepage = http://ipw2200.sourceforge.net/firmware.php; license = stdenv.lib.licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ lukasepple ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix index fe083d2ad65..af0c07d1059 100644 --- a/pkgs/os-specific/linux/firmware/rt5677/default.nix +++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { description = "Firmware for Realtek rt5677 device"; license = licenses.unfreeRedistributableFirmware; maintainers = [ maintainers.zohl ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index dd30003aa40..33bf58c234d 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { homepage = https://github.com/hadess/rtl8723bs; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ elitak ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 2298cbd13c5..9605fb26999 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; homepage = http://sourceforge.net/projects/zd1211/; license = "GPL"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index d21cdd78daf..8485b0e6032 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { meta = { homepage = http://linux-hotplug.sourceforge.net/?selected=usb; description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index a627a8cbcc9..c33d9cfae9e 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { homepage = http://gogonet.gogo6.com; description = "Client to connect to the Freenet6 IPv6 tunnel broker service"; maintainers = [stdenv.lib.maintainers.bluescreen303]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 0e38d94e1ed..3402f7a7013 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/p/google-authenticator/; description = "Two-step verification, with pam module"; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 6c5dd330f65..15bdabcc3dc 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -40,5 +40,6 @@ in license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.tuxonice.net/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 1ca200a1121..dcbf3232e94 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { repositories.git = https://github.com/ajaiantilal/i7z.git; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 00f27a43e65..6b4841305b3 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index a47b59e9e56..8ccaaa66304 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = "http://code.google.com/p/jujuutils/"; description = "Utilities around FireWire devices connected to a Linux computer"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index c750006fcd2..ca113114693 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { meta = { homepage = http://packages.ubuntu.com/source/saucy/kmod; description = "Linux kernel module blacklists from Ubuntu"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index 0fbf7821147..eac3fb92001 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = https://packages.debian.org/source/sid/kmod; description = "Linux configuration file for modprobe"; maintainers = with lib.maintainers; [ mathnerd314 ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 90e373c7ee0..a1f00531cee 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lm-sensors.org/; description = "Tools for reading hardware sensors"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 3a04466ce41..3fa7e2ba8d1 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { meta = { description = "Programs for managing RAID arrays under Linux"; homepage = http://neil.brown.name/blog/mdadm; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 2ef08cd13ce..49100fc5a44 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "iSNS server and client for Linux"; license = stdenv.lib.licenses.lgpl21; homepage = https://github.com/gonzoleeman/open-isns; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index 27d0510a657..ff5367b9839 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html; description = "A one-time password login package"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index 7f84918156c..d2b52822a55 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.padl.com/OSS/pam_ccreds.html"; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index f5fdc567087..67d9894a2a0 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { homepage = http://pamusb.org/; description = "Authentication using USB Flash Drives"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 3e41df9465f..8a5171824d0 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { hotpluggable bus system. "; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix index fb6cc4d9eac..39bec26e07f 100644 --- a/pkgs/os-specific/linux/sdparm/default.nix +++ b/pkgs/os-specific/linux/sdparm/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "A utility to access SCSI device parameters"; license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index ec3e9b14d2a..8c0dc57b61b 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pkg-shadow.alioth.debian.org/; description = "Suite containing authentication-related tools such as passwd and su"; + platforms = stdenv.lib.platforms.linux; }; passthru = { diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index 99e6c4ff380..485f3d94a73 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { device tree. ''; license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index fe79c23dc44..ded9ec0281d 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { homepage = http://tunctl.sourceforge.net/; description = "Utility to set up and maintain TUN/TAP network interfaces"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 472d432bc63..ab5f149c512 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -105,5 +105,6 @@ stdenv.mkDerivation { homepage = http://www.uclibc.org/; description = "A small implementation of the C library"; license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 1b3366f86f8..938f4edd2fb 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://upstart.ubuntu.com/"; description = "An event-based replacement for the /sbin/init daemon"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index ac7e782444f..ef6e3f4c67f 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation { description = "An Xorg driver for multitouch trackpads"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index cf57e653c49..81d0f494955 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -61,5 +61,6 @@ stdenv.mkDerivation rec { description = "Distributed realtime computation system"; license = licenses.asl20; maintainers = with maintainers; [ edwtjo vizanto ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index fda81b0ff81..ed462b95382 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { [doInstall doForceShare doPropagate]); meta = { description = "${name} dictionary for dictd"; + platforms = stdenv.lib.platforms.linux; }; }; # Probably a bug in some FreeDict release files, but easier to trivially diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix index 0fec6a5fe0e..9e0335ed441 100644 --- a/pkgs/servers/elasticmq/default.nix +++ b/pkgs/servers/elasticmq/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { Default.scala included in the distribution as a template. ''; license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index 5dcaf5a65fe..7ff0584818d 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = https://nginx.localdomain.pl/wiki/FcgiWrap; description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ lethalman ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 810f274579c..50d3f0d53ad 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { description = "A modular, high performance free RADIUS suite"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ sheenobu ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 0cbf920cb72..e56669645c3 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { homepage = https://www.pureftpd.org; license = licenses.isc; # with some parts covered by BSD3(?) maintainers = [ maintainers.lethalman ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index d156576b21a..bbd74de773a 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://modpython.org/; description = "An Apache module that embeds the Python interpreter within the server"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index d0d336ad08e..2dd9d544a03 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { description = "Open Source J2EE application server"; license = licenses.lgpl21; maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index b39e2b8fbf7..b5d5d5f7992 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Provides an interface to external programs that support the FastCGI interface"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 030aa486daa..692bba846ea 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "Tiny/turbo/throttling HTTP server"; homepage = "http://www.acme.com/software/thttpd/"; license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 50e6b298704..f751fd7846c 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 4a89c5ad83b..9beb961de20 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.icecast.org; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jcumming ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 603c765854f..1f11f1526f9 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { meta = { description = "An IPv6-capable IRC server"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index 89ce5a644d8..270844730d8 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = https://www.limesurvey.org; maintainers = with maintainers; [offline]; + platforms = with platforms; unix; }; } diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index bb2ab16ae66..50f94e4688c 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "An advanced PostgreSQL-based IMAP/POP server"; license = licenses.postgresql; maintainers = [ maintainers.phunehehe ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index 3dcfa3a22db..998dce88286 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.openwall.com/popa3d/"; description = "Tiny POP3 daemon with security as the primary goal"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index c8202b35455..3e7ef9f23db 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation { description = "A collection of postfix-related tools"; license = with lib.licenses; [ bsd3 ]; homepage = https://github.com/Fruneau/pfixtools; + platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix index 90d5e87fd7d..5c41f84c683 100644 --- a/pkgs/servers/mail/rmilter/default.nix +++ b/pkgs/servers/mail/rmilter/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { postfix or sendmail ''; maintainers = with maintainers; [ avnik fpletz ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 648bc043d4a..c978c9566a3 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "Advanced spam filtering system"; maintainers = with maintainers; [ avnik fpletz ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index 1495693b16b..b84dd21c357 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { description = "Personal media streamer"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ telotortium ]; + platforms = with stdenv.lib.platforms; unix; }; phases = ["unpackPhase" "installPhase"]; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index fd8a009b167..f657ccdcd55 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.rvl ]; inherit version; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix index c375fb29626..73a2dfc1f18 100644 --- a/pkgs/servers/nosql/hyperdex/default.nix +++ b/pkgs/servers/nosql/hyperdex/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { description = "A scalable, searchable key-value store"; homepage = http://hyperdex.org; license = licenses.bsd3; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 83f9347cd15..5646afe8e21 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -76,5 +76,6 @@ buildPerlPackage { description = "Enterprise-grade PKI/Trustcenter software"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 23c3b237c57..8846f50c886 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Project-OSRM/osrm-backend/wiki; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index 3e92cd848ab..296a6144532 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -25,6 +25,7 @@ let homepage = https://owncloud.org; maintainers = with stdenv.lib.maintainers; [ matejc ]; license = stdenv.lib.licenses.agpl3Plus; + platforms = with stdenv.lib.platforms; unix; }; }); diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 447d63c731d..e4b457d0c17 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 29c82bfd1ff..0849e25057b 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index ba5a9ead698..35ec5b0c110 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://jdbc.postgresql.org/; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd3; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix index 72221c0eec0..111b1be80f8 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://psqlodbc.projects.postgresql.org/; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 7546fe37afe..e12d7e9b97d 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index 53924f9888c..9ae159a453d 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "XMPP server in Java"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index f732e29acc9..2a87eeb7cb5 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { meta = { description = "IRC transport module for XMPP"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index f5a91b28633..deb8b8ce7d1 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { meta = { description = "Email transport module for XMPP"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish-foreign-env/default.nix index f3e08924150..b950e85916b 100644 --- a/pkgs/shells/fish-foreign-env/default.nix +++ b/pkgs/shells/fish-foreign-env/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "A foreign environment interface for Fish shell"; license = licenses.mit; maintainers = with maintainers; [ jgillich ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh-prezto/default.nix index 0a2e784b17d..80886e1038b 100644 --- a/pkgs/shells/zsh-prezto/default.nix +++ b/pkgs/shells/zsh-prezto/default.nix @@ -41,5 +41,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/sorin-ionescu/prezto"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 0aa1c8a8b5a..7105b4742cb 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mwh/dragon"; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index e1a2e0dd496..272143791f2 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { homepage = "http://openbox.org/wiki/ObConf"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lhvwb ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index 02a35b73c1e..1bb381826a1 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Displays a short text fullscreen in an X11 window"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.fpletz ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index b377369f464..a0d1013b872 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://fredrik.hubbe.net/x2vnc.html; description = "A program to control a remote VNC server"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index 237ea614059..06d08195688 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { description = "Allows the keyboard, mouse on one X display to be used to control another X display"; homepage = http://x2x.dottedmag.net; license = "BSD"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index e7c5c5baf45..e66b184c04c 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { description = "X11 brigthness and gamma software control"; homepage = http://shallowsky.com/software; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index eab21f2d221..3d228fedfb7 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = "https://code.google.com/p/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index eda19b7a5bf..9b50f00beef 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A generic touchscreen calibration program for X.Org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.flosse ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index ccf998951a3..b7927ca8cb8 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -59,5 +59,6 @@ EOF meta = { description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session''; maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index a72b067e9aa..715efe71992 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Provides a single interface to extended file attributes"; maintainers = [ stdenv.lib.maintainers.vrthra ]; license = [ stdenv.lib.licenses.mit ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 07319fe4c39..208b4c2b38b 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ ehmry ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index 98bcfb3048f..169f419cd67 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; - meta = with stdenv.lib; - { homepage = https://github.com/ehmry/dir2opus; - maintainers = [ maintainers.ehmry ]; - license = licenses.gpl2; - }; + meta = with stdenv.lib; { + homepage = https://github.com/ehmry/dir2opus; + maintainers = [ maintainers.ehmry ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; } diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index e7ebdb3fcdd..74544b9cd63 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Easy-to-use offline browser utility"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index 890220d2051..4640e3c4a61 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "Command line bluetooth manager for Bluez5"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.dasuxullebt ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 15167ee57b1..35f46b47bc8 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://wiki.muiline.com/obex-data-server; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index a3486569b51..4d872c3d9ac 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.bluez.org/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index b70ad1fa685..4b8510773a3 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://he.fi/bchunk/; description = "A program that converts CD-ROM images in BIN/CUE format into a set of ISO and CDR tracks"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 375bbcda7e4..95d0f1051be 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { meta = { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = http://cdrdao.sourceforge.net/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index bcf9ec2c0cc..5353a8d432f 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = http://cdrkit.org/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix index 047624513e4..ecadcc2b001 100644 --- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix +++ b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://fy.chalmers.se/~appro/linux/DVD+RW/tools; description = "Tools for burning DVDs"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 33677d5b10d..6d8c3e1a3c2 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { homepage = "http://sourceforge.net/projects/lsdvd/"; shortDescription = "Display information about audio, video, and subtitle tracks on a DVD"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 44073f84a5d..59a11e2d4d7 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.urbanophile.com/arenn/hacking/gzrt/; description = "The gzip Recovery Toolkit"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index e95afac9443..e3a01647afb 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "The CK LRZIP compression program (LZMA + RZIP)"; license = stdenv.lib.licenses.gpl2Plus; inherit version; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 7d49bde68c1..a929ca4dfd7 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation { homepage = http://www.lzop.org; description = "Fast file compressor"; license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 3d3ad80e25d..e2b03e6f382 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://ncompress.sourceforge.net/; license = stdenv.lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index f6424b5e880..e731d91f6d6 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation { cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence on compression ratio''; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 733634da652..2737966b83e 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { homepage = http://rzip.samba.org/; description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c012be7c56d..b5e7f6652de 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { homepage = http://upx.sourceforge.net/; description = "The Ultimate Packer for eXecutables"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index db47cf71910..01050c5ee82 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -10,5 +10,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://cis.poly.edu/zdelta; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 97548442eba..674f462b967 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://www.brain-dump.org/projects/ciopfs/; description = "A case-insensitive filesystem layered on top of any other filesystem"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 158050f6291..d0d9fa02178 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "Provides an encrypted filesystem in user-space via FUSE"; license = licenses.lgpl2; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 02087ff97b2..3e4425847fa 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; inherit version; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 662ceba03b8..cd32025e5b6 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { inherit version; homepage = http://www.namesys.com/; description = "Reiser4 utilities"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index e41318a982c..e23dd5f0bd1 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.namesys.com/; description = "ReiserFS utilities"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index f3f8877db2c..d7e9c02d1ab 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 4c40d5e4983..edc8dd00f3e 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mount an S3 bucket as filesystem through FUSE"; license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index bcbafb613f1..c4dc72644d9 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "A backup program for disk arrays"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.makefu ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index a28d5394fc1..50f758bceba 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec meta = { homepage = "http://noedler.de/projekte/wdfs/"; description = "User-space filesystem that allows to mount a webdav share"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix index 9bfbb902fea..7a056f503e2 100644 --- a/pkgs/tools/filesystems/zfstools/default.nix +++ b/pkgs/tools/filesystems/zfstools/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { for ZFS, which also supports auto snapshotting mysql databases. ''; license = licenses.bsd2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix index 63bf9aae552..d41df87fb6d 100644 --- a/pkgs/tools/graphics/bins/default.nix +++ b/pkgs/tools/graphics/bins/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation { description = "Generates static HTML photo albums"; homepage = http://bins.sautret.org; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index 2af2a9a8757..ba28b67d75b 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -27,5 +27,6 @@ in stdenv.mkDerivation { homepage = http://sourceforge.net/projects/briss/; description = "Java application for cropping PDF files"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index c357c96fac8..6ae6df35a51 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Multi-language OCR system"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index cf0fd55ad15..00cc5e385fe 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index dd749c05e4a..2534a9cbefa 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://libexif.sourceforge.net/; description = "A utility to read and manipulate EXIF data in digital photographs"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index ea729d71be2..47312f0f997 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { description = "Displays EXIF data from JPEG files"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index f0115239f00..798c9d80395 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { homepage = http://gmic.eu/; license = licenses.cecill20; maintainers = [ maintainers.rycee ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 43ad863e90a..5fa78a3e3b8 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "A program for visualising graphs"; homepage = http://www.graphviz.org/; branch = "2.0"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index fa151420ebb..333b0f95b72 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = https://github.com/TrilbyWhite/Leela; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index 31eaebc0fa1..0aee233e79b 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation { description = "Little CMS ICC profile construction set"; homepage = "http://sourceforge.net/projects/lprof"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 767ea0e5425..0f7f7e2da2a 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = http://optipng.sourceforge.net/; description = "A PNG optimizer"; license = licenses.zlib; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index c4fc91edad4..c91c18e3f0b 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { homepage = http://www.libpgf.org/; description = "Progressive Graphics Format command line program"; license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 2619387df8b..ff28959148f 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; homepage = http://ploticus.sourceforge.net/; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 6e268ef5941..2882ae960de 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { ]; hydraPlatforms = []; license = stdenv.lib.licenses.free; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 8e0217ca839..24c4f2433c6 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -128,5 +128,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ jb55 ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index 457f47f75d6..749631999e4 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { require the Gimp to even be installed. ''; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 343559bb1e1..bf89e303744 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Ryochan7/antimicro"; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 46c056ef0c0..1fab8a493bb 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -44,5 +44,6 @@ in description = "Automatic display configuration selector based on connected devices"; homepage = https://github.com/wertarbyte/autorandr; maintainers = [ stdenv.lib.maintainers.coroa ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index fb83e6996e3..824021094b4 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://sourceforge.net/p/bibutils/home/Bibutils/"; license = licenses.gpl2; maintainers = [ maintainers.garrison ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 52d80a8812e..c192e9f42ab 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { filter. ''; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index ac9685b83f5..3bfb7bf65f1 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://cunit.sourceforge.net/; license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index 37d5b6cbc7f..de9604200ba 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { homepage = http://cutecom.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bennofs ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index fd0f647bf5d..bb1267d62f4 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = [ stdenv.lib.maintainers.garbas ]; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 27a608a8402..ea56e59ba89 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { description = ''Debian package maintenance scripts''; license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with maintainers; [raskin]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 449f0f20b80..793fb8a04d8 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "On-the-fly display switch utility"; homepage = http://willem.engen.nl/projects/disper/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index ee8b12ad89b..369ec81be8d 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://www.i0i0.de/toolchest/emv"; description = "Editor Move: Rename files with your favourite text editor"; license = stdenv.lib.licenses.publicDomain; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index ac812fb9881..f68ae1ec245 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { description = "Program for making large letters out of ordinary text"; homepage = http://www.figlet.org/; license = stdenv.lib.licenses.afl21; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 941aa756420..5e6db9fdc20 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { meta = { description = "A program that displays a pseudorandom message from a database of quotations"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 359f04673ea..32e796966c9 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { meta = { description = "Command-line dutch dictionary application"; homepage = http://www.djcbsoftware.nl/code/gnuvd/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 11e1609ff0e..0fd33fc3e39 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; homepage = http://www.hdfgroup.org/HDF5/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 9183f1290ea..20f199ae73f 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -24,5 +24,6 @@ buildRustPackage rec { homepage = https://github.com/rschmitt/heatseeker; license = stdenv.lib.licenses.mit; maintainers = [ maintainers.michaelpj ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 09018108d89..1d75db59289 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation { homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index 3b2e71fd01c..a021064a5ff 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { description = "Portable Scriptable Network and Serial Communication Software"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix index 12e888813fb..2f61a30714e 100644 --- a/pkgs/tools/misc/man/default.nix +++ b/pkgs/tools/misc/man/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://primates.ximian.com/~flucifredi/man/; description = "Tool to read online Unix documentation"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index e1072754b23..8616a40df43 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/MidnightCommander/mc.git; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index ee9dc4f28b6..165780a5fa1 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { description = ".mdb (MS Access) format tools"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 2dd90e4bcaf..4f76306ab5f 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { meta = { description = ".mdb (MS Access) format tools"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 7e382426336..f9c8ac4b838 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = http://www.memtest.org/; description = "A tool to detect memory errors"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 2d2d4e4a741..ed2f54d693d 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { homepage = "http://linux.maruhn.com/sec/mmv.html"; description = "Utility for wildcard renaming, copying, etc"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 3b276a7117f..1acdf6d7ddb 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index bdd7a0674a4..5a427888857 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://oss.oetiker.ch/mrtg/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.robberer ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 4d6a317276a..744e5d99ef5 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://ms-sys.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 234e16df74f..83e6ee5b5ca 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { description = "Convert MySQL dump files to PostgreSQL-loadable files"; homepage = http://pgfoundry.org/projects/mysql2pgsql/; license = stdenv.lib.licenses.bsdOriginal; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index a1a12a82471..4ef8cbd757a 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.aforemny ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 42495a45756..a09dfb4d4e4 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = http://terse.tk/ponysay/; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ bodil ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index a51b6238cd5..335bddd6730 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = http://proxytunnel.sourceforge.net/download.php; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index efc42ee73ec..82b831207a9 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { homepage = https://github.com/thoughtbot/rcm; license = licenses.bsd3; maintainers = with maintainers; [ malyn ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index 527dbe85813..f415b76a303 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nongnu.org/renameutils/; description = "A set of programs to make renaming of files faster"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index f3c1c278c76..72363de7653 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { description = "Serial line sniffer"; homepage = http://slsnif.sourceforge.net/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 737ba244fe8..911f0ff50bf 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/time/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 5655e27dc2e..710a777ffb5 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -60,5 +60,6 @@ composableDerivation.composableDerivation {} { license = licenses.gpl2; description = "A software MIDI renderer"; maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index da0c966eb5e..63c6d4aea5a 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { description = "True Type to Postscript Type 3 converter, fpdf"; homepage = "http://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 3583b5b8f30..4a2ab0d3475 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { meta = { description = "Create fonts.dir for TTF font directory"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index b0943f469b3..411a549a686 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Converter from Microsoft Word formats to human-editable ones"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/tools/misc/xapian-omega/default.nix index 68241ac0e90..19bbdceb09e 100644 --- a/pkgs/tools/misc/xapian-omega/default.nix +++ b/pkgs/tools/misc/xapian-omega/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "Indexer and CGI search front-end built on Xapian library"; homepage = http://xapian.org/; license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 97497614ecb..5186ec2121b 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { license = licenses.mit; version = "0.7.0"; maintainers = [ maintainers.dochang ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index 419ea11a4d7..b0939a4698b 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/psprint/zsh-navigation-tools; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index df8677bfffa..0789b37c65a 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix index 81d19646a95..e1b3a420079 100644 --- a/pkgs/tools/networking/aiccu/default.nix +++ b/pkgs/tools/networking/aiccu/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [ edwtjo ]; license = "SixXS"; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index 38514a5604b..9c381bea65d 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { description = "Flexible contacts synchronization program"; license = licenses.agpl3; maintainers = [ maintainers.DamienCassou ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 7a54887e9d8..1f5b5a7c638 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Loop-avoiding distance-vector routing protocol"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fuuzetsu fpletz ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 4fb0975a740..3410d0e2c5c 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/Lrs121/bully; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index e6fb4e0130b..86a13ba90e6 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/ljanyst/carddav-util; description = "A CardDAV import/export utility"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index d66a4890afe..9394b123bbe 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://agroman.net/corkscrew/; description = "A tool for tunneling SSH through HTTP proxies"; license = stdenv.lib.licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index ca0c5f5edf1..ce371e74ee0 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://unix4lyfe.org/darkstat; license = licenses.gpl2; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index c19dcae965b..207078773b2 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "libpcap application that displays DNS traffic on your network"; homepage = http://dns.measurement-factory.com/tools/dnstop; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index 2ff22c06181..23501c29e23 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { description = "Command line SMTP client"; license = with lib.licenses; [ gpl2 ]; homepage = http://deanproxy.com/code; + platforms = stdenv.lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index e7aabcd9755..2b5aae72de4 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { description = "GTK+-based FTP client"; homepage = http://www.gftp.org; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 29f09b8cc19..5b54e4099f5 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://imapproxy.org/; description = "It proxies IMAP transactions caching server connections"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index cfeaf47fdf2..a09da684c98 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://jnettop.kubs.info/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index fad99bbd7d7..da36ef727c2 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://www.courier-mta.org/maildrop/; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 4e3463c95fb..47ec804e5d4 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { description = "Utility which reads and writes data across network connections"; homepage = http://netcat.sourceforge.net/; license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index 77ef6e0ad30..2bc521e8fed 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "Simple tool for transporting data over the network"; license = stdenv.lib.licenses.gpl2; homepage = "http://mamuti.net/netrw/index.en.html"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index 2c2e9469291..f326059d9d7 100644 --- a/pkgs/tools/networking/netselect/default.nix +++ b/pkgs/tools/networking/netselect/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { homepage = http://alumnit.ca/~apenwarr/netselect/; description = "An ultrafast intelligent parallelizing binary-search implementation of \"ping\""; license = "BSD"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index bfd9b90b6b1..3e4d2d6e920 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://noip.com/download?page=linux; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.iand675 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 150f60f8de4..8bb2d7f3c76 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "LDAP identity and authentication for NSS/PAM"; homepage = http://arthurdejong.org/nss-pam-ldapd/; license = licenses.lgpl21; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index ea5e265fa06..4ba293dc12c 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 7d48f38e79d..3b5b83c05e1 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { homepage = http://gtk-gnutella.sourceforge.net/; description = "Server/client for Gnutella"; license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 0c5035f2d39..5e815f6bfd6 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -10,10 +10,11 @@ stdenv.mkDerivation rec { postPatch = ''sed -i "s|/usr|$out|" Makefile''; - meta = with stdenv.lib; - { homepage = "https://f00l.de/pcapfix/"; - description = "Repair your broken pcap and pcapng files"; - license = licenses.gpl3; - maintainers = [ maintainers.ehmry ]; - }; -} \ No newline at end of file + meta = with stdenv.lib; { + homepage = "https://f00l.de/pcapfix/"; + description = "Repair your broken pcap and pcapng files"; + license = licenses.gpl3; + maintainers = [ maintainers.ehmry ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index a8733a7305a..3daea665929 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "Send copies of (UDP) datagrams to multiple receivers"; homepage = "http://code.google.com/p/samplicator/"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 1149d9aa8e4..908e4b05009 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "SIP Swiss army knife"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ sheenobu ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index f73a1bc5bcc..14283c279e4 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { homepage = http://code.google.com/p/slimrat/; description = "Linux Rapidshare downloader"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index ef300d68314..be7b8f5824e 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { homepage = http://gna.org/projects/smbldap-tools/; description = "SAMBA LDAP tools"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index 605986935f0..01903171e9c 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "Start and use ssh-agent and load identities as necessary"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ telotortium ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index f8a8b6393d2..851af6f24f6 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 7fbbc55dd61..f7085e8f5c5 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { ''; homepage="http://www.tinc-vpn.org/"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 72a31262e26..88ee459f816 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://vde.sourceforge.net/; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 221d0f17642..9c9376550df 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "User mode programs to enable VLANs on Ethernet devices"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix index aa29b8be34f..375a9fe9980 100644 --- a/pkgs/tools/networking/wbox/default.nix +++ b/pkgs/tools/networking/wbox/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A simple HTTP benchmarking tool"; homepage = "http://www.hping.org/wbox/"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 9315a53cb3e..8013e6d00cd 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -115,5 +115,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.roconnor ]; license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 7819cc2be77..08847b999cf 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { description = "A SOAP interface and client for Disnix"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 7ef047aeb26..5ace2ad618f 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { description = "A Nix-based distributed service deployment tool"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 71666f4d969..eb0b7d2a418 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { description = "Provides complementary NixOS infrastructure deployment to Disnix"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 77235bca36c..25df812254c 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation { description = "Automated deployment of mutable components and services for Disnix"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 343d48f91d7..9faedf0c7ef 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "RSA utility"; homepage = http://bmrsa.sourceforge.net/; license = licenses.gpl1; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index 1f999e9d726..602c0d60a5f 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "An utility to reset the password of any user that has a valid local account on a Windows system"; maintainers = with stdenv.lib.maintainers; [ deepfire ]; license = licenses.gpl2; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 7a9dcdb8d89..41d9934191d 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "Metasploit Framework - a collection of exploits"; homepage = https://github.com/rapid7/metasploit-framework/wiki; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index df5bffe3dfb..803380dbb4a 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -34,6 +34,7 @@ yes description = "Open soruce host-based instrusion detection system"; homepage = http://www.ossec.net; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 51f44c3c7df..b834cc6adc5 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/carnager/rofi-pass; maintainers = with stdenv.lib.maintainers; [ hiberno the-kenny ]; license = stdenv.lib.licenses.gpl3; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index bf1197c2bf2..57352f99091 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -43,5 +43,6 @@ in stdenv.mkDerivation rec { description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl3; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index 46d2113b1da..1a276875ed7 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://point-at-infinity.org/seccure/; description = "Zero-configuration elliptic curve cryptography utility"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index f7a53469545..1b982bf06d1 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/bitcoin-core/secp256k1; license = with licenses; [ mit ]; maintainers = with maintainers; [ chris-martin ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 74682d00d03..b286f31304e 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "Shamir Secret Sharing Scheme"; homepage = http://point-at-infinity.org/ssss/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index 5d5e0fb4afc..c8be366066b 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://steghide.sourceforge.net/; description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 45c8f00dccf..abfdf8eedca 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { in /etc/super.tab); and 2) “setuid”, which allows root to execute a command under a different uid. ''; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index dacb143a480..518fb4944f4 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.bootchart.org/; description = "Performance analysis and visualization of the GNU/Linux boot process"; license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 842529c573f..a90d6afdc61 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mcron/; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 66a2703932d..e2786ea77fe 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "Monitoring system"; license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ raskin wmertens ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 2efd0baed89..959334f4cc5 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "Serial port configuration utility"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index 3d4fe6e18a2..1278480973f 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Setuid-safe wrapper for chroot"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix index 0c69bdd03c5..ec2f90876b3 100644 --- a/pkgs/tools/system/symlinks/default.nix +++ b/pkgs/tools/system/symlinks/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A symbolic link maintenance utility"; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index d98f05c6aab..7c7d5df4df8 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index e47369f4755..cf272f3bc81 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -19,6 +19,7 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl1; maintainers = [ stdenv.lib.maintainers.Adjective-Object ]; + platforms = stdenv.lib.platforms.linux; }; makeFlags="PREFIX=$(out) conf_dir=$(out)/etc/ansifilter/"; diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index aaa458b05cb..331fc3fea35 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { homepage = http://www.convertlit.com/; description = "A tool for converting Microsoft Reader ebooks to more open formats"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index b2ccc090313..4a146accffc 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Markov chain-based text generator"; homepage = http://www.jwz.org/dadadodo; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix index 51366c36bc6..bf27fc3de5d 100644 --- a/pkgs/tools/text/diction/default.nix +++ b/pkgs/tools/text/diction/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { readability measures. ''; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 70a3bdeb798..420e0a37ba7 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; description = "Commands for showing the differences between files (diff, cmp, etc.)"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index adab8c9a10d..4112ee891b5 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; maintainers = [ maintainers.shell ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 81995705b52..eb6359ba978 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Source code highlighting tool"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 67d2df10363..6698334791c 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -8,10 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1j49ffl8gpfaq99hkylf3fjiygq74w1kpfp8f52xbpx57vn9587g"; }; - meta = with stdenv.lib; - { description = "Interpreter for the AWK Programming Language"; - homepage = http://invisible-island.net/mawk/mawk.html; - license = licenses.gpl2; - maintainers = with maintainers; [ ehmry ]; - }; -} \ No newline at end of file + meta = with stdenv.lib; { + description = "Interpreter for the AWK Programming Language"; + homepage = http://invisible-island.net/mawk/mawk.html; + license = licenses.gpl2; + maintainers = with maintainers; [ ehmry ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index c147b3ea301..4ebe62ef9a5 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = "liberal"; # a non-copyleft license, see `Copyright' file homepage = http://www.mesa.nl/pub/mpage/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index 57a375d2a17..d4b4902303b 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://multitran.sourceforge.net/; description = "Multitran data english-russian"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 3abe03b2a4e..ae4ece899a4 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: library for reading Multitran's BTREE database format"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 0f5032c4a17..4470511f616 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: enchanced locale facets"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index b3e5f12407d..153184bf70f 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: main engine to query translations"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index e73ba43791a..9b214e6b502 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: basic useful functions"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index d6d1090652a..40728c2c3ec 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://replace.richardlloyd.org.uk/; description = "A tool to replace verbatim strings"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index 3427f62f15b..cf3b2bad6c9 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix index 2526273b812..496d68df5b3 100644 --- a/pkgs/tools/text/sgml/opensp/compat.nix +++ b/pkgs/tools/text/sgml/opensp/compat.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = opensp.meta // { description = "Compatibility wrapper for old programs looking for original sp programs"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 92b506aa2c3..bfd150eefda 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { description = "A suite of SGML/XML processing tools"; license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 365815142d1..6aad3c7b23d 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "A KISS markup language"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 944b4221844..93655df64df 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; license = stdenv.lib.licenses.w3c; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index a50e91b7866..fc11e210c3c 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; description = "A validating XML parser written in C"; homepage = http://www.cogsci.ed.ac.uk/~richard/rxp.html; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index b390a9c404a..24303da4069 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "A command line tool for manipulating and querying XML data"; homepage = http://xmlstar.sourceforge.net/; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index e1957333b3f..7d7cd3c49d9 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { meta = { description = "XML Pipes and Filters - command line tools for manipulating and querying XML data"; homepage = http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index b9ecc9b1e89..26d17355951 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "Extract urls from text"; homepage = https://github.com/mvdan/xurls; maintainers = [ maintainers.koral ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 488f3d3c5e5..d9dcc3c0fbb 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -39,5 +39,6 @@ in stdenv.mkDerivation rec { description = "A tool to serve ZIM files using HTTP"; homepage = http://git.wikimedia.org/log/openzim; maintainers = with stdenv.lib.maintainers; [ robbinch ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index 10be33f1e24..62f0ff99123 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { description = "A console tool to create ZIM files"; homepage = http://git.wikimedia.org/log/openzim; maintainers = with stdenv.lib.maintainers; [ robbinch ]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index 76536190f34..9dc73886b5a 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { description = "View diff on LaTeX source files on the generated PDF files"; maintainers = [ maintainers.DamienCassou ]; license = licenses.free; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9 + platforms = platforms.unix; }; } diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index 28325825ca2..487af940077 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/; license = licenses.mit; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 600522d45a2..f3ef746fedf 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://pauillac.inria.fr/~maranget/hevea/; license = licenses.qpl; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 96e1f532bff..2b8505ac5df 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; maintainers = [ stdenv.lib.maintainers.ttuegel ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 7707bece0ba..b910be76b85 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -31,6 +31,7 @@ let auctex = stdenv.mkDerivation ( rec { meta = { description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; homepage = http://www.gnu.org/software/auctex; + platforms = stdenv.lib.platforms.unix; }; }); diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index a7bc527042e..3c243f9c2c5 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = http://dblatex.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 5e84a92cadd..de5ef2abccf 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { meta = { branch = "1"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 05e28454be1..cb8d2dbdf48 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation { meta = { branch = "2"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index b8df977cfb0..28225ebf28a 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { meta = { branch = "3"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 61936e766c5..8380abf2e94 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "http://tug.org/tex4ht/"; description = "A system to convert (La)TeX documents to HTML and various other formats"; license = stdenv.lib.licenses.lppl12; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 37bc1831d5b..2ed846cb070 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; homepage = https://fedorahosted.org/xmlto/; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 0f3b5f4d39d..83e57b2a128 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index b185d859093..a50c7539fe0 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.swftools.org/about.html; license = licenses.gpl2; maintainers = [ maintainers.koral ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 4654d5902cb..7d395afebec 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "VNC recorder"; homepage = http://ronja.twibright.com/utils/vncrec/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index efce0c92b78..5e0c13f9d95 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { homepage = http://www.timkay.com/aws/; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; }; } From cb0ddbadd9001dee27e587a82e16d580e32b2e34 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 2 Aug 2016 18:17:18 +0200 Subject: [PATCH 026/168] seabios: 1.9.2 -> 1.9.3 --- pkgs/applications/virtualization/seabios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index fc08f06b6b2..cf17c08554a 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "seabios-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz"; - sha256 = "1rdvbqb374jimxbkk9yvk9rnzhkn0w0sbvi1l3gnz6ah1sdla7gh"; + sha256 = "13b7n20qfc2cc8v70jvl9r51m563rss9lbk1aflirvnd9705vs0s"; }; buildInputs = [ iasl python ]; From 9cfcf90832da5fe2da6d33b4213fa6e11906ebe7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 2 Aug 2016 18:48:43 +0200 Subject: [PATCH 027/168] libressl: 2.3.6 -> 2.3.7, 2.4.1 -> 2.4.2 Version 2.2.x is removed because it is not maintained by upstream anymore. --- pkgs/development/libraries/libressl/2.2.nix | 22 --------------------- pkgs/development/libraries/libressl/2.3.nix | 4 ++-- pkgs/development/libraries/libressl/2.4.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +---- 4 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/libraries/libressl/2.2.nix diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix deleted file mode 100644 index 93d61b6a4bb..00000000000 --- a/pkgs/development/libraries/libressl/2.2.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.2.9"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0i2cbkj07kcs2is8k8wirvywg4az3wk4s3q1slwp4qw3x9vz63vi"; - }; - - enableParallelBuilding = true; - - outputs = [ "dev" "out" "man" "bin" ]; - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index a143547ca04..fed460a134b 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1yipsp1ici207nbminbf1knh252kzvqg036v0xpx0fw1wrwlg2im"; + sha256 = "0q08yysyalz0fvzajm3x4wg4k6gn4hhd04qsfv27r1p4kj2mv7zm"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix index e9e0b350473..332102658f9 100644 --- a/pkgs/development/libraries/libressl/2.4.nix +++ b/pkgs/development/libraries/libressl/2.4.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0xq4x1s91aqzrf8j9d4kf4j093cz2ayg0xrybsl4gkb966qj468j"; + sha256 = "1qyrcyzrrn6r9cqvm66ib72qyr65q4hrdyiq1vb24a6nwmwdg1sz"; }; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8aaeb9e095d..37675e66950 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8923,10 +8923,7 @@ in openslp = callPackage ../development/libraries/openslp {}; - libressl = self.libressl_2_3; - libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix { - fetchurl = fetchurlBoot; - }; + libressl = self.libressl_2_4; libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { fetchurl = fetchurlBoot; }; From e55aa50175765c84f203992c15eca2be089b099d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 2 Aug 2016 21:19:34 +0200 Subject: [PATCH 028/168] simp_le: apply patch to update TOS hash Fixes #17455. Also see https://github.com/kuba/simp_le/issues/114. --- pkgs/tools/admin/simp_le/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 8925610bebf..24bfe043b9d 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "simp_le-2016-04-17"; @@ -10,6 +10,13 @@ pythonPackages.buildPythonApplication rec { sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z"; }; + patches = [ + (fetchpatch { + url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch"; + sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc"; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ acme_0_5_0 ]; meta = with stdenv.lib; { From 1c00f258953594ac8577f241ba7bea838b453889 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 2 Aug 2016 20:37:49 +0200 Subject: [PATCH 029/168] perlPackages.NetSSLeay: 1.72 -> 1.77 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d746a45753c..95a762df33e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9578,10 +9578,10 @@ let self = _self // overrides; _self = with self; { }; NetSSLeay = buildPerlPackage rec { - name = "Net-SSLeay-1.72"; + name = "Net-SSLeay-1.77"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIKEM/${name}.tar.gz"; - sha256 = "1x6jjmhvsdq488k6wdg58ajnr4dmbcbk7imyv0aybkhj1ygw7ahv"; + sha256 = "06h6wbr923jxmazmv5shdg1767s7r60bvzcza52dk31yckks6l31"; }; buildInputs = [ pkgs.openssl ]; doCheck = false; # Test performs network access. From 93758f6b2fd4da1db7868138fcb2236145dcfcd3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 2 Aug 2016 21:09:18 +0200 Subject: [PATCH 030/168] perlPackages.NetSSLeay: link openssl pkgconfig files Instead of linking the lib folder with the libraries, link the lib directory from the dev output containing the pkgconfig files. This is enough for finding the libs and fixes a build failure with libressl. --- pkgs/top-level/perl-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 95a762df33e..fe6af5725bb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9583,11 +9583,10 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MI/MIKEM/${name}.tar.gz"; sha256 = "06h6wbr923jxmazmv5shdg1767s7r60bvzcza52dk31yckks6l31"; }; - buildInputs = [ pkgs.openssl ]; doCheck = false; # Test performs network access. preConfigure = '' mkdir openssl - ln -s ${pkgs.openssl.out}/lib openssl + ln -s ${pkgs.openssl.dev}/lib openssl ln -s ${pkgs.openssl.bin}/bin openssl ln -s ${pkgs.openssl.dev}/include openssl export OPENSSL_PREFIX=$(realpath openssl) From d84cec10565570fdbf4861ceb7316aa388994e6c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 22:44:46 +0300 Subject: [PATCH 031/168] travis-nox-review-pr.sh: Fix nixpkgs manual build The current command is actually building the 'manpages' package, not the nixpkgs manual. --- maintainers/scripts/travis-nox-review-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 5b25e4f37c1..13df5087fad 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -29,7 +29,7 @@ while test -n "$1"; do nixpkgs-manual) echo "=== Checking nixpkgs manuals" - nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr manpages --show-trace + nix-build $TRAVIS_BUILD_DIR/pkgs/top-level/release.nix --attr manual --show-trace ;; nixpkgs-tarball) From 91a3920b1d30f213446abf92a336315f71ad6f33 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 22:49:43 +0300 Subject: [PATCH 032/168] asciidoc: Works on Darwin D'oh! Plain 'asciidoc' works, but 'asciidoc-full' doesn't, so my scripts changed it to 'linux' in https://github.com/NixOS/nixpkgs/commit/21f17d69f61e8239870bf97edf49e594198076a8 --- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index d446b722922..d9d69a4a4c0 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -271,7 +271,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } From b7e9207a67272dd19ef8cb0aabac47ea4b42add4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 22:55:43 +0300 Subject: [PATCH 033/168] androidenv: Don't build on Hydra Output limit exceeded: http://hydra.nixos.org/build/38236076 http://hydra.nixos.org/build/38235851 --- pkgs/development/mobile/androidenv/androidndk.nix | 1 + pkgs/development/mobile/androidenv/androidsdk.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index fd11add80c7..c6ee22e4d3c 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -80,5 +80,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 86af875fa4d..5e4c7e54202 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -235,5 +235,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; + hydraPlatforms = []; }; } From 2cce7a064e367ebc773a072022b45a772661893e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Aug 2016 22:00:17 +0200 Subject: [PATCH 034/168] telepathy_salut: fix build, add myself as maintainer --- .../instant-messengers/telepathy/salut/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 5e4ad860687..918be4e9b83 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup -, libuuid, openssl, sqlite, pkgconfigUpstream }: +, libuuid, openssl, pcre, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { pname = "telepathy-salut"; @@ -10,15 +10,17 @@ stdenv.mkDerivation rec { sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; + # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl - sqlite ]; + sqlite pcre ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; configureFlags = "--disable-avahi-tests"; - meta = { + meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; - platforms = stdenv.lib.platforms.gnu; # Random choice + platforms = platforms.gnu; # Random choice + maintainers = [ maintainers.lethalman ]; }; } From dc26ac6e04b98fab87dab03941819d937f02f573 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 23:08:51 +0300 Subject: [PATCH 035/168] libmng: Re-enable on Darwin Prior to 1bf5ded1933b18af9a95dc263063756ed9d383ba this contained `hydraPlatforms = platforms.linux`, which was apparently misleading. --- pkgs/development/libraries/libmng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 284e82f9ad9..931db8bdf42 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.libmng.com; license = licenses.zlib; maintainers = with maintainers; [ marcweber urkud ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 3875690d80d257a76ef19d7db828fbb19e4a955e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 2 Aug 2016 23:12:20 +0300 Subject: [PATCH 036/168] lua5: Re-enabel on Darwin Prior to 1bf5ded1933b18af9a95dc263063756ed9d383ba this contained `hydraPlatforms = platforms.linux`, which was apparently misleading. --- pkgs/development/interpreters/lua-5/5.2.nix | 2 +- pkgs/development/interpreters/lua-5/5.3.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 37e12c9dc1c..fa5113fd572 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -97,6 +97,6 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index e2e24a11db4..30c26a922ba 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 16d48b828067d1f4c7a0ca35910d3175c6362ebc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 3 Aug 2016 00:55:42 +0300 Subject: [PATCH 037/168] Re-enable bunch of packages on Darwin Prior to 1bf5ded1933b18af9a95dc263063756ed9d383ba these contained `hydraPlatforms = platforms.linux`, which was apparently misleading. --- pkgs/development/libraries/libdaemon/default.nix | 2 +- pkgs/development/libraries/tecla/default.nix | 2 +- pkgs/shells/dash/default.nix | 2 +- pkgs/tools/archivers/atool/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 9d85f12a39a..07d5b77efc4 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index ddae2262dac..ea03795afc8 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Command-line editing library"; license = "as-is"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 0730674854c..b950d48f04c 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gondor.apana.org.au/~herbert/dash/; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; passthru = { diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 700a4cc5cca..4c4a03d486b 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/atool; description = "Archive command line helper"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 0afcb79f606d772c4f6581f21204cf9277479378 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 3 Aug 2016 06:25:41 +0800 Subject: [PATCH 038/168] puddletag: init at 1.1.1 (#17443) Thanks to @fridh for feedback. --- pkgs/applications/audio/puddletag/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/audio/puddletag/default.nix diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix new file mode 100644 index 00000000000..3bbed303aec --- /dev/null +++ b/pkgs/applications/audio/puddletag/default.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, chromaprint }: + +with lib; +with pythonPackages; + +buildPythonApplication rec { + version = "1.1.1"; + name = "puddletag-${version}"; + namePrefix = ""; + + src = fetchFromGitHub { + owner = "keithgg"; + repo = "puddletag"; + rev = "1.1.1"; + sha256 = "0zmhc01qg64fb825b3kj0mb0r0d9hms30nqvhdks0qnv7ahahqrx"; + }; + + sourceRoot = "${name}-src/source"; + + disabled = isPy3k; + + outputs = [ "out" ]; + + propagatedBuildInputs = [ + chromaprint + configobj + mutagen + pyparsing + pyqt4 + ]; + + doCheck = false; # there are no tests + dontStrip = true; # we are not generating any binaries + + installPhase = '' + siteDir=$(toPythonPath $out) + mkdir -p $siteDir + PYTHONPATH=$PYTHONPATH:$siteDir + ${python.interpreter} setup.py install --prefix $out + ''; + + meta = with stdenv.lib; { + homepage = https://puddletag.net; + description = "An audio tag editor similar to the Windows program, Mp3tag"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37675e66950..0b24a951625 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13073,6 +13073,8 @@ in rhythmbox = callPackage ../applications/audio/rhythmbox { }; + puddletag = callPackage ../applications/audio/puddletag { }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { From 0621828bb7a275484f3f6a6428d0e675c2bcc3c2 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 3 Aug 2016 00:27:03 +0200 Subject: [PATCH 039/168] supercollider: 3.6.6 -> 3.7.2 (#17395) --- .../interpreters/supercollider/default.nix | 31 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index be85cd24815..20690cbd477 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,34 +1,22 @@ { stdenv, fetchurl, cmake, pkgconfig , libjack2, libsndfile, fftw, curl, gcc -, libXt, qt, readline +, libXt, qt55, readline , useSCEL ? false, emacs }: let optional = stdenv.lib.optional; -ljack2 = libjack2.override { gcc = gcc; }; in stdenv.mkDerivation rec { - name = "supercollider-3.6.6"; + name = "supercollider-${version}"; + version = "3.7.2"; - meta = { - description = "Programming language for real time audio synthesis"; - homepage = "http://supercollider.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - }; src = fetchurl { - url = "mirror://sourceforge/supercollider/Source/3.6/SuperCollider-3.6.6-Source.tar.bz2"; - sha256 = "11khrv6jchs0vv0lv43am8lp0x1rr3h6l2xj9dmwrxcpdayfbalr"; + url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; + sha256 = "1mybxcnl7flliz74kdfnvh18v5dwd9zbdsw2kc7wpl4idcly1n0s"; }; - # QGtkStyle unavailable - patchPhase = '' - substituteInPlace editors/sc-ide/widgets/code_editor/autocompleter.cpp \ - --replace Q_WS_X11 Q_GTK_STYLE - ''; - cmakeFlags = '' -DSC_WII=OFF -DSC_EL=${if useSCEL then "ON" else "OFF"} @@ -37,6 +25,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - gcc ljack2 libsndfile fftw curl libXt qt readline ] + gcc libjack2 libsndfile fftw curl libXt qt55.qtwebkit qt55.qttools readline ] ++ optional useSCEL emacs; + + meta = { + description = "Programming language for real time audio synthesis"; + homepage = "http://supercollider.sourceforge.net/"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b24a951625..313d0bd8662 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5995,8 +5995,6 @@ in spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.5.nix { }; supercollider = callPackage ../development/interpreters/supercollider { - gcc = gcc48; # doesn't build with gcc49 - qt = qt4; fftw = fftwSinglePrec; }; @@ -15855,7 +15853,7 @@ in }; solarus = callPackage ../games/solarus { }; - + solarus-quest-editor = qt5.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. From cc9547dcf99f63e1046b25b9273bbc4b3999b341 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 3 Aug 2016 00:41:47 +0200 Subject: [PATCH 040/168] foo2zjs: remove use of `builderDefsPackage` (#17459) --- pkgs/misc/drivers/foo2zjs/default.nix | 77 ++++++++++----------------- 1 file changed, 28 insertions(+), 49 deletions(-) diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 2547baec4f1..61903cacfca 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,51 +1,33 @@ -x@{builderDefsPackage - , foomatic_filters, bc, unzip, ghostscript, systemd, vim - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, foomatic_filters, bc, unzip, ghostscript, systemd, vim }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="foo2zjs"; - version="20110210"; - name="${baseName}-${version}"; - url="http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz"; - hash="0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "foo2zjs-20110210"; + + src = fetchurl { + url = "http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz"; + sha256 = "0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - phaseNames = ["doPatch" "fixHardcodedPaths" "doMakeDirs" "doMakeInstall" "deployGetWeb"]; + buildInputs = [ foomatic_filters bc unzip ghostscript systemd vim ]; patches = [ ./no-hardcode-fw.diff ]; makeFlags = [ - ''PREFIX=$out'' - ''APPL=$out/share/applications'' - ''PIXMAPS=$out/share/pixmaps'' - ''UDEVBIN=$out/bin'' - ''UDEVDIR=$out/etc/udev/rules.d'' - ''UDEVD=${systemd.udev.bin}/sbin/udevd'' - ''LIBUDEVDIR=$out/lib/udev/rules.d'' - ''USBDIR=$out/etc/hotplug/usb'' - ''FOODB=$out/share/foomatic/db/source'' - ''MODEL=$out/share/cups/model'' + "PREFIX=$(out)" + "APPL=$(out)/share/applications" + "PIXMAPS=$(out)/share/pixmaps" + "UDEVBIN=$(out)/bin" + "UDEVDIR=$(out)/etc/udev/rules.d" + "UDEVD=${systemd.udev.bin}/sbin/udevd" + "LIBUDEVDIR=$(out)/lib/udev/rules.d" + "USBDIR=$(out)/etc/hotplug/usb" + "FOODB=$(out)/share/foomatic/db/source" + "MODEL=$(out)/share/cups/model" ]; installFlags = [ "install-hotplug" ]; - fixHardcodedPaths = a.fullDepEntry '' + postPatch = '' touch all-test sed -e "/BASENAME=/iPATH=$out/bin:$PATH" -i *-wrapper *-wrapper.in sed -e "s@PREFIX=/usr@PREFIX=$out@" -i *-wrapper{,.in} @@ -55,28 +37,25 @@ rec { sed -e "s@/etc/hotplug/usb@$out&@" -i *rules* sed -e "s@/usr@$out@g" -i hplj1020.desktop sed -e "/PRINTERID=/s@=.*@=$out/bin/usb_printerid@" -i hplj1000 - '' ["doPatch" "minInit"]; + ''; - doMakeDirs = a.fullDepEntry '' + preInstall = '' mkdir -pv $out/{etc/udev/rules.d,lib/udev/rules.d,etc/hotplug/usb} mkdir -pv $out/share/foomatic/db/source/{opt,printer,driver} mkdir -pv $out/share/cups/model mkdir -pv $out/share/{applications,pixmaps} - '' ["minInit"]; - deployGetWeb = a.fullDepEntry '' mkdir -pv "$out/bin" cp -v getweb arm2hpdl "$out/bin" - '' ["minInit"]; - - meta = { + ''; + + meta = with stdenv.lib; { description = "ZjStream printer drivers"; - maintainers = with a.lib.maintainers; + maintainers = with maintainers; [ raskin urkud ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2Plus; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; -}) x +} From 29df026df4ad475300023d87de6d4c4687d12546 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 3 Aug 2016 08:08:32 +0200 Subject: [PATCH 041/168] Revert "perlPackages.NetSSLeay: link openssl pkgconfig files" This reverts commit 93758f6b2fd4da1db7868138fcb2236145dcfcd3. --- pkgs/top-level/perl-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fe6af5725bb..95a762df33e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9583,10 +9583,11 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MI/MIKEM/${name}.tar.gz"; sha256 = "06h6wbr923jxmazmv5shdg1767s7r60bvzcza52dk31yckks6l31"; }; + buildInputs = [ pkgs.openssl ]; doCheck = false; # Test performs network access. preConfigure = '' mkdir openssl - ln -s ${pkgs.openssl.dev}/lib openssl + ln -s ${pkgs.openssl.out}/lib openssl ln -s ${pkgs.openssl.bin}/bin openssl ln -s ${pkgs.openssl.dev}/include openssl export OPENSSL_PREFIX=$(realpath openssl) From 0f0be5e498ac29e9011c7a29a7612871c0bc393f Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 3 Aug 2016 08:15:18 +0200 Subject: [PATCH 042/168] Warn for conflict between synaptics and libinput --- nixos/modules/services/x11/hardware/libinput.nix | 8 ++++++++ nixos/modules/services/x11/hardware/synaptics.nix | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 14c7131e611..47ce9e56604 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -227,6 +227,14 @@ in { EndSection ''; + assertions = [ + # already present in synaptics.nix + /* { + assertion = !config.services.xserver.synaptics.enable; + message = "Synaptics and libinput are incompatible, you cannot enable both (in services.xserver)."; + } */ + ]; + }; } diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index e74b19c8e71..5c068e89dd7 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -205,6 +205,13 @@ in { EndSection ''; + assertions = [ + { + assertion = !config.services.xserver.libinput.enable; + message = "Synaptics and libinput are incompatible, you cannot enable both (in services.xserver)."; + } + ]; + }; } From 61a5c24209b66deaa6ebf6de5aa4dedbba89c597 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Wed, 3 Aug 2016 09:16:01 +0300 Subject: [PATCH 043/168] cmocka: cross-compilation support (#17462) --- pkgs/development/libraries/cmocka/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 4e3f5b219e9..96ef5112ef6 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fvm6rdalqcxckbddch8ycdw6n2ckldblv117n09chi2l7bm0q5k"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Lightweight library to simplify and generalize unit tests for C"; From c4f53918cba127faf58b317c87a6cb90f2349405 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 3 Aug 2016 09:00:12 +0200 Subject: [PATCH 044/168] offlineimap: 7.0.2 -> 7.0.4 --- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 42f72ef7e36..6f74df38ad0 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, sqlite3 }: pythonPackages.buildPythonApplication rec { - version = "7.0.2"; + version = "7.0.4"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1xwblb1nvqq6gkxjynzsw31xja07qday58x5jqak8sp3d4lqw2h2"; + sha256 = "1ixm4qp3gljbnbi40h8n6j7c0pzk1ry8hpm4bcf7n68gc07r557n"; }; doCheck = false; From 1ef5231d3c959159ca603709f76e7419745c6ed6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 3 Aug 2016 09:08:29 +0200 Subject: [PATCH 045/168] pythonPackages.django_1_10: init at 1.10 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e70212bc13..fe858f223cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8903,6 +8903,30 @@ in modules // { ]; }; + django_1_10 = buildPythonPackage rec { + name = "Django-${version}"; + version = "1.10"; + disabled = pythonOlder "2.7"; + + src = pkgs.fetchurl { + url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; + sha256 = "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26"; + }; + + # patch only $out/bin to avoid problems with starter templates (see #3134) + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + # too complicated to setup + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; + }; + django_1_9 = buildPythonPackage rec { name = "Django-${version}"; version = "1.9.5"; From 3f093b9c9c1c33e826f578f76e9f38ad45856f96 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 3 Aug 2016 09:09:23 +0200 Subject: [PATCH 046/168] pythonPackages.django_compat: 1.0.8 -> 1.0.13 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe858f223cd..44fe5f6fb05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9114,21 +9114,21 @@ in modules // { django_compat = buildPythonPackage rec { name = "django-compat-${version}"; - version = "1.0.8"; + version = "1.0.13"; # build process attempts to access a missing README.rst disabled = isPy35; src = pkgs.fetchurl { url = "mirror://pypi/d/django-compat/${name}.tar.gz"; - sha256 = "195dgr55vzpw1fbjvbw2h35k9bfhvm5zchh2p7nzbq57xmwb3sra"; + sha256 = "0s0z7cx0vv1kjsyzk24sg256hfnd09ssilc9rakhxrzr3firgx80"; }; buildInputs = with self; [ django_nose ]; propagatedBuildInputs = with self; [ django six ]; meta = { - description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, and 1.9"; + description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9 and 1.10"; homepage = https://github.com/arteria/django-compat; license = licenses.mit; }; From af154d1ca676ef33d58e540e0718490fd0283438 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 3 Aug 2016 09:10:38 +0200 Subject: [PATCH 047/168] pythonPackags.django: default from 1_9 to 1_10 --- ...mplate.patch => 1.10-gis-libs.template.patch} | 16 ++++++++-------- pkgs/top-level/python-packages.nix | 13 ++++++++++--- 2 files changed, 18 insertions(+), 11 deletions(-) rename pkgs/development/python-modules/django/{1.7.7-gis-libs.template.patch => 1.10-gis-libs.template.patch} (65%) diff --git a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch similarity index 65% rename from pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch rename to pkgs/development/python-modules/django/1.10-gis-libs.template.patch index 7757691bfca..be196d000bc 100644 --- a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch +++ b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch @@ -13,12 +13,12 @@ diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgda diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py --- a/django/contrib/gis/geos/libgeos.py +++ b/django/contrib/gis/geos/libgeos.py -@@ -23,7 +23,7 @@ try: - lib_path = settings.GEOS_LIBRARY_PATH - except (AttributeError, EnvironmentError, - ImportError, ImproperlyConfigured): -- lib_path = None -+ lib_path = "@geos@/lib/libgeos_c.so" +@@ -26,7 +26,7 @@ try: + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, EnvironmentError, + ImportError, ImproperlyConfigured): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c.so" - # Setting the appropriate names for the GEOS-C library. - if lib_path: + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44fe5f6fb05..6edb92b4026 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8891,12 +8891,12 @@ in modules // { }; }; - django = self.django_1_9; + django = self.django_1_10; django_gis = self.django.override rec { patches = [ (pkgs.substituteAll { - src = ../development/python-modules/django/1.7.7-gis-libs.template.patch; + src = ../development/python-modules/django/1.10-gis-libs.template.patch; geos = pkgs.geos; gdal = pkgs.gdal; }) @@ -9202,7 +9202,14 @@ in modules // { sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04"; }; - propagatedBuildInputs = with self; [ django django_compat ]; + # TODO improve the that multi-override necessity (the fixpoint based python + # packages work can be the solution) + propagatedBuildInputs = with self; [ django_1_9 (django_compat.override { + buildInputs = with self; [ (django_nose.override { + propagatedBuildInputs = with self; [ django_1_9 nose ]; + }) ]; + propagatedBuildInputs = with self; [ django_1_9 six ]; + }) ]; meta = { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; From 4ba0912a9298667b7f40e199b9648897b5e7237a Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Wed, 3 Aug 2016 02:31:56 -0400 Subject: [PATCH 048/168] gentium: 1.504 -> 5.000 Gentium Plus 5.000 was released in 2014. The archive now contains a documentation folder with information about OpenType features supported by the font. --- pkgs/data/fonts/gentium/default.nix | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index d0af6ce0eb0..6addc779f35 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -2,12 +2,11 @@ stdenv.mkDerivation rec { name = "gentium-${version}"; - version = "1.504"; + version = "5.000"; src = fetchzip { - name = "${name}.zip"; - url = "http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlus-${version}.zip&filename=${name}.zip"; - sha256 = "1xdx80dfal0b8rkrp1janybx2hki7algnvkx4hyghgikpjcjkdh7"; + url = "http://software.sil.org/downloads/gentium/GentiumPlus-${version}.zip"; + sha256 = "0g9sx38wh7f0m16gr64g2xggjwak2q6jw9y4zhrvhmp4aq4xfqm6"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -16,12 +15,28 @@ stdenv.mkDerivation rec { mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/${name} cp -v *.ttf $out/share/fonts/truetype/ - cp -v FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name} + cp -vr documentation/ FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name} ''; meta = with stdenv.lib; { - homepage = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=Gentium"; + homepage = "http://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; + longDescription = '' + Gentium is a typeface family designed to enable the diverse ethnic groups + around the world who use the Latin, Cyrillic and Greek scripts to produce + readable, high-quality publications. It supports a wide range of Latin and + Cyrillic-based alphabets. + + The design is intended to be highly readable, reasonably compact, and + visually attractive. The additional ‘extended’ Latin letters are designed + to naturally harmonize with the traditional 26 ones. Diacritics are + treated with careful thought and attention to their use. Gentium Plus also + supports both polytonic and monotonic Greek. + + This package contains the regular and italic styles for the Gentium Plus + font family, along with documentation. + ''; + downloadPage = "http://software.sil.org/gentium/download/"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; platforms = platforms.all; From 363381f3c223aeadfd9f56421481769422031c3a Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 31 Jul 2016 10:06:37 +0800 Subject: [PATCH 049/168] cpuminer: fix darwin build --- pkgs/tools/misc/cpuminer/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 64657d7cd3b..4f7f3d16cb3 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, jansson }: +{ stdenv, fetchurl, curl, jansson, perl }: stdenv.mkDerivation rec { name = "cpuminer-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xdgz5qlx1yr3mw2h4bwlbj94y6v2ygjy334cnc87xgzxf1wgann"; }; + patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null; + buildInputs = [ curl jansson ]; configureFlags = [ "CFLAGS=-O3" ]; From f5b0a5ce7a5c20e0bf246c4647aff0fe20fe8176 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sun, 31 Jul 2016 20:01:54 +0800 Subject: [PATCH 050/168] cpuminer: 2.4.4 -> 2.4.5 --- pkgs/tools/misc/cpuminer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 4f7f3d16cb3..375aa999e3b 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "0xdgz5qlx1yr3mw2h4bwlbj94y6v2ygjy334cnc87xgzxf1wgann"; + sha256 = "130ab6vcbm9azl9w8n97fzjnjbakm0k2n3wc1bcgy5y5c8s0220h"; }; patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null; From 8fcea0822e51985fbfd8011f3dc588c7c55709ec Mon Sep 17 00:00:00 2001 From: Mounium Date: Wed, 3 Aug 2016 09:49:44 +0200 Subject: [PATCH 051/168] added myself to maintainers.nix --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4fc3dbf06e9..7f6c823d68b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -259,6 +259,7 @@ moretea = "Maarten Hoogendoorn "; mornfall = "Petr Ročkai "; MostAwesomeDude = "Corbin Simpson "; + mounium = "Katona László "; MP2E = "Cray Elliott "; mpscholten = "Marc Scholten "; msackman = "Matthew Sackman "; From 2f791c7444d739b35dd7879dbc7e326ea3c9f17b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 3 Aug 2016 09:51:59 +0100 Subject: [PATCH 052/168] terraform: 0.6.16 -> 0.7.0 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 3d1834ce9b6..78edcff30cc 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.6.16"; + version = "0.7.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,13 +11,13 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "1bg8hn4b31xphyxrc99bpnf7gmq20fxqx1k871nidx132brcsah2"; + sha256 = "0k5d6zph6sq1qg8vi5jmk7apy6v67xn5i7rqjamyr5an7lpxssc9"; }; postInstall = '' # prefix all the plugins with "terraform-" for i in $bin/bin/*; do - if [[ ! $(basename $i) =~ terraform* ]]; then + if [[ $(basename $i) != terraform ]]; then mv -v $i $bin/bin/terraform-$(basename $i); fi done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 313d0bd8662..b353a5bf29b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17319,7 +17319,9 @@ in sqsh = callPackage ../development/tools/sqsh { }; - terraform = callPackage ../applications/networking/cluster/terraform { }; + terraform = + (callPackage ../applications/networking/cluster/terraform {}).bin // + { outputs = [ "bin" ]; }; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; From 4a06ece72357943ceb7b0acc199ce1d89263f4d8 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Wed, 3 Aug 2016 11:02:02 +0200 Subject: [PATCH 053/168] qutebrowser: 0.8.1 -> 0.8.2 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index cec8acb82ab..c8a719b194a 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,7 +2,7 @@ , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking, makeQtWrapper }: -let version = "0.8.1"; in +let version = "0.8.2"; in buildPythonApplication rec { name = "qutebrowser-${version}"; @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "18hj95pgybpavwwnyczh6s94spljfngz684y1jlhqnpbp14pkflh"; + sha256 = "1kfxjdn1dqla8d8gcggp55zcgf4zb77knkfshd213my0iw2yzgcf"; }; # Needs tox From 5c017832e9217c002138e3dda3c222b8a768081f Mon Sep 17 00:00:00 2001 From: mimadrid Date: Wed, 3 Aug 2016 11:01:15 +0200 Subject: [PATCH 054/168] strace: 4.12 -> 4.13 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index dc01abd514f..5eafbf68fb7 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.12"; + version = "4.13"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "51144b78cb9ba22211b95a5aafe0af3694c0d575b25975d80ca9dd4dfd7c1e59"; + sha256 = "d48f732576c91ece36a5843d63f9be054c40ef59f1e4773986042636861625d7"; }; nativeBuildInputs = [ perl ]; From ca18d16ce047668af471f899c0c826753962047a Mon Sep 17 00:00:00 2001 From: Mounium Date: Wed, 3 Aug 2016 11:28:54 +0200 Subject: [PATCH 055/168] flat-plat: init at eba3be5 --- pkgs/misc/themes/flat-plat/default.nix | 29 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/misc/themes/flat-plat/default.nix diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix new file mode 100644 index 00000000000..0956bc59b42 --- /dev/null +++ b/pkgs/misc/themes/flat-plat/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "flat-plat-gtk-theme-eba3be5"; + + src = fetchFromGitHub { + owner = "nana-4"; + repo = "Flat-Plat"; + rev = "eba3be5eafd1140e1edb8b02411edb2f6c78b0ca"; + sha256 = "0vfdnrxspdwg4jr025dwjmdcrqnblhlw666v5b7qhkxymibp5j7h"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/themes + rm .gitignore COPYING README.md + cp -r . $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "A Material Design-like flat theme for GTK3, GTK2, and GNOME Shell"; + homepage = https://github.com/nana-4/Flat-Plat; + licence = licenses.gpl2; + maintainers = [ maintainers.mounium ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 313d0bd8662..e6b15c42d22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17050,6 +17050,8 @@ in fceux = callPackage ../misc/emulators/fceux { }; + flat-plat = callPackage ../misc/themes/flat-plat { }; + foldingathome = callPackage ../misc/foldingathome { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; From 4b96a2d14825f4cc3138b23c25d1b3d8c1d68ab2 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 31 Jul 2016 04:03:23 -0700 Subject: [PATCH 056/168] factorio: 0.13.8 -> 0.13.13 --- pkgs/games/factorio/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index cb04e9c4750..ace8dc658f2 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -8,7 +8,7 @@ assert releaseType == "alpha" || releaseType == "headless"; with stdenv.lib; let - version = "0.13.8"; + version = "0.13.13"; isHeadless = releaseType == "headless"; arch = if stdenv.system == "x86_64-linux" then { @@ -23,14 +23,14 @@ let fetch = rec { url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; - name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; # TODO take this from 302 redirection somehow? fetchurl doesn't help. + name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; x64 = { - headless = fetchurl { inherit name url; sha256 = "0dliympqnnawfw65n5gnda9mljyqwshmq2hvplf1h8nrp1rw3pgj"; }; - alpha = authenticatedFetch { inherit url; sha256 = "12safa8b4g5cpwxbkf8ldkb17lgf33rslr7p81l7gr1lyzfnf82c"; }; + headless = fetchurl { inherit name url; sha256 = "1ip0h2kh16s07nk6xqpm0i0yb0x32zn306414j15gqg3j0j0mzpn"; }; + alpha = authenticatedFetch { inherit url; sha256 = "1hvj51cggp6cbxyndbl4z07kadzxxk3diiqkkv0jm9s0nrwvq9zr"; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; - alpha = authenticatedFetch { inherit url; sha256 = "0m4m183avnqxkw28vb7za14dsmcd01sdldgga0br1clilxmgph2w"; }; + alpha = authenticatedFetch { inherit url; sha256 = "14dwlakn7z8jziy0hgm3nskr7chp7753z1dakxlymz9h5653cx8b"; }; }; }; From ef46388c487cc58cd064ba2298a4ea9c7076c28a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 3 Aug 2016 17:58:22 +0200 Subject: [PATCH 057/168] neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4 --- pkgs/applications/editors/neovim/qt.nix | 12 +++++------- pkgs/development/libraries/libmsgpack/1.4.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/libmsgpack/1.4.nix diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 949be3875d8..778c1cc6445 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -3,7 +3,7 @@ }: let # not very usable ATM - version = "0pre-2015-10-18"; + version = "0.2.1"; in stdenv.mkDerivation { name = "neovim-qt-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { repo = "neovim-qt"; owner = "equalsraf"; - rev = "03236e2"; - sha256 = "0hhwpnj7yfqdk7yiwrq0x6n4xx30brj9clxmxx796421rlcrxypq"; + rev = "v${version}"; + sha256 = "0mqs2f7l05q2ayj77czr5fnpr7fa00qrmjdjxglbwxdxswcsz88n"; }; # It tries to download libmsgpack; let's use ours. @@ -22,7 +22,7 @@ stdenv.mkDerivation { # Similar enough to FindMsgpack set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE) - set(MSGPACK_LIBRARIES msgpack PARENT_SCOPE) + set(MSGPACK_LIBRARIES msgpackc PARENT_SCOPE) ''; in "echo '${use-msgpack}' > third-party/CMakeLists.txt"; @@ -34,9 +34,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - installPhase = '' - mkdir -p "$out/bin" - mv ./bin/nvim-qt "$out/bin/" + postInstall = '' wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin" ''; diff --git a/pkgs/development/libraries/libmsgpack/1.4.nix b/pkgs/development/libraries/libmsgpack/1.4.nix new file mode 100644 index 00000000000..2779162feb8 --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/1.4.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "0zlanifi5hmm303pzykpidq5jbapl891zwkwhkllfn8ab1jvzbaa"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 212d975fb00..fe403c387cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8168,6 +8168,7 @@ in libmsgpack = callPackage ../development/libraries/libmsgpack { }; libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; + libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { }; libnatspec = callPackage ../development/libraries/libnatspec ( stdenv.lib.optionalAttrs stdenv.isDarwin { @@ -14984,6 +14985,7 @@ in neovim-qt = callPackage ../applications/editors/neovim/qt.nix { qt5 = qt55; + libmsgpack = libmsgpack_1_4; }; neovim-pygui = pythonPackages.neovim_gui; From 2a4312d92b0ca48392e42f89a35de5c1ef9981fe Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Aug 2016 19:39:46 +0200 Subject: [PATCH 058/168] firefox-beta-bin: 48.0b9 -> 49.0b1 --- .../browsers/firefox-bin/beta_sources.nix | 366 +++++++++--------- .../browsers/firefox-bin/default.nix | 1 + 2 files changed, 184 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 6748b0a9517..ce49d92e335 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "48.0b9"; + version = "49.0b1"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ach/firefox-48.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "0738019c7078daa1beb31445d12718dce195719279cf430c13526907aaa04328efd043b77eaf641674ed4eff8033e8ac47139858a9c9e194bf6ccaaf8cd54d8a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ach/firefox-48.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "9700cfff54bdd3404b75d7690863ace89aacc49db3339b2ee11807b1ea88f3744d610800d6e5d5144cf7ff8f292374e297779581d629700c9570eab116b5b449"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/af/firefox-48.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8700996788a438bb6cf7a5bc0aae166e621a2b32cbe06dd91589bf0abecf123ba34ef9fe7800395d5a8fb148f50a68e35bfc97ddb4b51f2318e87dfb92023798"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/af/firefox-48.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "b6ff01541e51fd287783750011ec5d5ea1a731c28d4c807d75fedcb6780afbda76b19a4bcb7bbec305cbcbaaa84dd3f57a0b41c404f374022b4ea1e850b9c6d5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/an/firefox-48.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "11710dcf2c470bac75eaa9a3fca7aa3508d4e9c9b59d2a39f03d166d25c05ba8bcfeda4c4a95134dce8d7c4d261dceb980e1a53a9a11869b7d8b226983f6cadd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/an/firefox-48.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "7723e02a752d30c597ef7b295b2c1644de4e2a6d02b364853f9a9c419a2d172bb5338792a5a9403851bb3952e93dc092e12056782df1017bfb3c39a2550ccd70"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ar/firefox-48.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "90bb7327e77e048784efaed6afda9c35eabe4c238194acbb14543f7841c052153fb5f0f7ef202564f2f749aaddf7e870b9b850022b0570cc96d34f730bd1ff52"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ar/firefox-48.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "410b9d0db9038b597129ea423752300e1831d69c6768bfb09eed3c20a26b1bcf2d67ace6f8befa8a47ab2441ebe69d34361571609709586c3a1086259d9864f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/as/firefox-48.0b9.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "b50989125c6982cf8d9c97af09e9734046d2d3eb8e0e220b139a8835e76cd39195ab2fe2fbded7461acf6d153a8b5376b4991f0c72322f8a22e9961d17589072"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/as/firefox-48.0b9.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "873830760fcf310d26dd40f7147a8c7ad252828ede05a03b82e6d7ccb021435af1d5f7fc61bea6a968ea0f24e54cf108e5f6fd4b3e0558163bcda00cb3fe9aa5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ast/firefox-48.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "ab6f0c4efc8ab7c6db6a4b31d6dfc93aeff8d65e1fce60d8bc9ce6f86e391f0cd5f6be1a3e4f8784c73d5f982a66e33a69b40614ff4eed04416bfcdab5362e86"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ast/firefox-48.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "f66b0c006d530dbfd4df30400dd6b15728a7fbd023e88d745d0b8ae05bb63d0d33e344ae70d3105815aa9a23ea5419b80b853d68ef05b7ca2c24d31c670e23a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/az/firefox-48.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "cd96e076df13db6cf82d8a6d13653bc928ebde446f4a283e949dd66229297c5a284392b118539c7628593c696eacf2de9b4b8ad623750ed909c08349b3263093"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/az/firefox-48.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "0c5311168bd7e73e7d81175aca2a46e10122b29b2c54a8b92bbd74ca7092dfb9c43709cd30c50a02c030382c021b1192fccd8e8694fe3c8c8d0cce6370d3bd93"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/be/firefox-48.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "07c7fac9790d83a06940efa3445212e592764bf794c0b3fb924a695129d0efb649e5cf68656d2160cdbcb188290fdebac971947d891d3eb31cc99e25126c3a55"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/be/firefox-48.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "789d5ff8f0ae19758b379508d72f7d8315026fdea898218d03108ed3e9d42b85f4fd58649af5783a484a4f5dedc282dacfa68cfcfc9be5154ae9d5a73ae3cde1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bg/firefox-48.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "9d8b4837ba7d03e2b5482333e945ac56ea0c715cd7db2a8126d1ad589df2cdabe9eb9ea6b4ac302b02976fcc319752f544090aff6f7569c5610977e6c24b350d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bg/firefox-48.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "244ba31c371c649e2f448a3593cb267e19837f011215283d73d1e672acf4c32df1b5c11aaec722170c26b2eef7b7bafea49ffebedfd52ef1a6ebc9fba5650210"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bn-BD/firefox-48.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "eb50c9a1f867a1e89424511f1b6152a3633f77271997e33d819a194bc3b85024d76aacdc1d877d6ba72299678a7b5dabb7a3c3f3c37cd309bc73b6514374e683"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bn-BD/firefox-48.0b9.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "780c482fa5b809b7220fd672c7c24c1e2d764ffb8b13b431663385cb6651da17f26c32fcc60e978ecd971b45076a3fbf8675243c26d5e178b326b84d3b9a0b32"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bn-IN/firefox-48.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "5d4936b8beb2db435aa89308492a3ffdcddf4ac60bf32a100bc0943f648a4ca624709d4b171f802df4780ef74bf9d2ba3029fe3aa9e5a6d498fd44642db36f9c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bn-IN/firefox-48.0b9.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "d9c4089a87289815b4af7e3ad91fdeea76359d941c5a14a9c9e3289c47127b3a3f5a72d522679ae1fadc547cf65d448c604ae3687e11fcfdd73c5c48a104dfda"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/br/firefox-48.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "134890cbf087ad9b97d532fa10b5b6b0738236d6d1b27b402b1b1832d0982fd9e53f398f28fbf285cc432c5cfc6f83caf9f42c39e351ec188d77c43fbd3fdeab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/br/firefox-48.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "d19af5f724f6ce509c05f9005b1e3576061244e6653d8069da9aa6ef8fae3dded66e8138dd806babf9bf7a3e8c7c14de999a28368f26190e747c67af5f29e81d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/bs/firefox-48.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "f0d29df4df68482cc74da7b2b7c6a2658b3ecaee51d259a1aacc1dd1b30aec7fee7a54696ba2f859608bacb23ff4e0cbba81353387e12b3567067034bef3905c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/bs/firefox-48.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "bd98070a500f5c6621b4bb18910a1728d23aa193aaa0faa6cc68f35932b436d64441d1f95065f543263e6e6b0484d6c42b7fcc4462a63e594b56297df7713a1b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ca/firefox-48.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e7ea69142daf2981432237db537ad85760eb9ce1407e66a206cef39f99c6aa5cd067feca3626ccecfa2d1c67d3425b13bb88c6eb4cdb903cdb12de04b3904bf8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ca/firefox-48.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "7f30559ad0e456bdf6492561f1283f85fba3c715f43549d2da46d006a59146002b4fe2f06b50a5b34e94633cfde9aded6514a61b451257c19baff3ecff770299"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cak/firefox-48.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "289bc8d19ab40a435740e27e44eb637511f0458e8dc14d87851ceef7e2594b52ef621107efcd090e2a31d97be5c04dc5d185f9c10173c38a1974ad28def18f5a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cak/firefox-48.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "f1f7b43df14d70fd543402b62edf47e0e347b630282e0976f6bcd64e14fcbbf60f5526824a1355c7c493fba539eb42dc7dda760f3896b5893e72e84fabb39dca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cs/firefox-48.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "04c42f09f55ca4ba3a9f4618cf4d860927ca9c01b152ea4d9452c218e02c960fae75311f707091ab0633989c918feac0a50fd27310c09c0d3608b95e0bcd132b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cs/firefox-48.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "f4dbf9158adc508d494d03232a24a880ff6eee5b4d6a0aa74c1f3e9a52b7a4a573f579e870d0c57e3b9d17875a2cbe2848c2d7acb7b225ba1b2a860cfaf5dc85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/cy/firefox-48.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "7fc634a345f2cb8c1876eac09a40f71592531bcda3058f2d3f6d10f8544be2d6f88cc541960329aef91bdfda21140e181d095c2e656882250ae23f7713b8aa29"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/cy/firefox-48.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "fc4f316b01ec48fec0a5726742521a735977705a7ae5c36e47f13c1b375663e3a2187fc3fb08400c6f89901315edf81cac79a0b90bbf42421f9305ea79509d95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/da/firefox-48.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "00fda3e6357e98eece16090d6e6452d70d5bb3e4d253604f19c635d880f8a4967f5c6ddfa64db1e64e85ffd1c2b64473255ded8b6d547d277c2a37283e18b5ac"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/da/firefox-48.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "5971f31c81346a18ee5cf5a8dbff79c9348254a6f882a73f27a391a1136e2df7019744df76e8044c299b548163f2f75ba51bd67d0d3f77cf1dba38b449656c45"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/de/firefox-48.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "1e02384a438f23571c23b471e75bd89717163014b326ee3568dec6e2c458c601e9f96b1ded21fb2b4f5611530a7c145c4bd2d124a7fb375768da4c0936989d19"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/de/firefox-48.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "f9b35ff0b69c3e48e3c77a0e79d332f7aa6d336e3840ecf377d614a16b7debb1cb288145671a0aeb03c04058aef4b5933e332b9b48cc0d82b3c12c4c2c00fb9e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/dsb/firefox-48.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "bf24a7a33bd83618953c42f79a2a9261d68048f52ab62e6cd030ddf1283802d7cb5df0fb26e9eb05bcd0e81dc61814ddfb0383a2172c741da9615a4a208cfa07"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/dsb/firefox-48.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "b6f8413df7ccf5a7a3a7cdaafacbddbd996a8496471f51b5bef62eeda9057e93ce1f7fa941f2a6670609ae0c711187530e95516ef0644253335080e25a66c0fc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/el/firefox-48.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f066a0d534e39581dddfefa8808850b1fc427c84f25c8582610d7db47c0c5a792c8cb516321fb3d91134dc0f3e76bbb26075b1d8030bd07eb14a77024c8afaec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/el/firefox-48.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "2a0125284f2dc4b402ce02344fc3f367834438ea37ee84b866fb0f6b69e8cb9afc0bd586ec43efe6c45c3a5bcb0c99d9a0ad273faea464048bdb5ed56f2b8577"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-GB/firefox-48.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "49be18428af54affc03efc0bb4aef87bf361224fddc735830a71a2f71dfd527af9f7593d90eec930e5edc3e7949172347e63ae78d75dd9916c97ca1ce3e3f92f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-GB/firefox-48.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "b1220f9977187408e1756fb27e26ab763ecb5edf6d497321ea4ba5fc2b32ec5c2caf3b2cb54fb3e506ad3b1a76c8b05c5b986fa6ca25e4ff335a083ba96802b3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-US/firefox-48.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "a91f9d2e04ebcd209bdf4db3638f0ca05287ff52023f6bc993a165d14bcf3264199bcd3559cfe1314e1e886094251c0bf86f274cf410bc456241c5d96fcfa255"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-US/firefox-48.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "e75c437b0cce3e06f9f91fd53cefbd4489d6d31ce93fd642b20e547e03f5a1f417d06ca4566453d1c5b7fad4dd1fac61bf58a414b982c3ae843891a8efef40e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/en-ZA/firefox-48.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "6a1d643add5c1b63633a02fdee766de6a73174c169a832b7f400e320ee7eb39cf74d652389b36957df200942877ba03dad714d2686d7dd7bad4a3993698e8630"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/en-ZA/firefox-48.0b9.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "877c2d4562fbda98c62902536f07e5ab474a78ab2c5a077bee440cb48525a6eb529e5042533061524cf6fa85b9f6b70fa91e6f2bfa718ca49fb4adc70ea92514"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/eo/firefox-48.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "d91d25252de09a1c8f52066a3d4bd9f8a6f479c9cfb52bdb7f3939d32162805a26c02b4e3a13e9463b318c2da47d83b77b23fd4bcad58657e8eac8f6f6a769a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/eo/firefox-48.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1a697f4a9c98e956d78f41a22c4c0996542ed67d89b8cde095b330fb366c0ddcaa1403c016f2f2d11dae18564ca50a6f953fdeefe66ce8cd95c8d3ce99212555"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-AR/firefox-48.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "59067e78b573ceae232f11f5b507fafd5f0cb75ce19f9dbc05a30990247321a239157881202b7ae3676c4a6991473741f7bb4e3ccb799bb138f46a3497d1f38d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-AR/firefox-48.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "377410f25dd32fe268a07783bff69f4412a3418d9c9e852e6bd577914727c7e65642781e86a2bbde4085bc175a1ee034fd960d9bbba72463f0361d17bbd7ebee"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-CL/firefox-48.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "5ae95c0e81ef1c23956b5324dab0690c237cc9e7f8b56a51870f668ef7091d8962a0633691909672b63e53bc436ca0c46705cdd393c07aa6f7023d2fb5600ff0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-CL/firefox-48.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "36ff8818adf938144923df82a7fdf9bea26d43225c0853c84a541233cccc370879e8fcca3750f162f880a879c0b41789f692cb08fabc9073d11e2e865d357ee7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-ES/firefox-48.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "0af5cceb948a6cb1be21f98a53e8733113c27339c50e5bb3ca21bb2a82d28821f7f92fcf71f31db156def398e8ce5bc7875d2cab2f231a3702b0c0e30990748e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-ES/firefox-48.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "1c0b8d5e458314f1895bd41d73886962813f9ce1ce099a7438202faf0e4e82a3fb9b701e0950cd5b668a1c0e5a051939868b774956f607c30de974eb7a06a710"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/es-MX/firefox-48.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "7ad31cf9470e416c6a8cd9a7c14aaeaa6998d9b20ab67387fa32e28490b3dee96ceeb6fbc20258e01d2264e2a96f7607a7a69d960c09a189b62bf638d211306c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/es-MX/firefox-48.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "8f757afbc6869351b561fae7b9773a8fe7009b3869ffa5e1776ce1b28c1786d6558f0e2bf8487e8a028e3377de39c461309aeb9565e3b03ed1ac6ec8934ce59b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/et/firefox-48.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "97acd2242d10184243a7d1390bc58326351d48877fbb70b16945278049f597e627cec7b55deb35337392787e29e46b1004d7e332e730ba020b17615ad2f9fd5e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/et/firefox-48.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "665878727ddbdc85b4d6757a566ebcc4ba9ae098312ea4aa8c63eb52642460365bd4c29dfff42f63561d9b2806d9d9dc26a32422caff56795af93ee78a838bd2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/eu/firefox-48.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "a6c7af099860209cdc98dd8929392cb71f8607723da9f53f99d9074948b6ec571998db536421d7a79e2e623484be00971380d866ef0962626ebdc45f5f3d535d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/eu/firefox-48.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "9ea439a7607e5ce736e9f5b22b507473dac5c6e710904b3d273ab2873f9254fc5999d570cd2bfbe2316bead8d1cf8bb6e7db021efc876c266741e7f1aa7f2443"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fa/firefox-48.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "7735a5436d28f6ea02d1083a4f97665b86d8795456002076513b236e336092cdba4cd1ca9505178bec87b8ceaadf78e236bb7185a49e662dc13f394f4e63afbe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fa/firefox-48.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "a335270482f4fa3a1ba27a865721047112edb960e433cfc315e5ba07dc3ff0e465f21b86ae15ceabefb7d92ff249e950a36e786b1312d84bee9c133213ee4a31"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ff/firefox-48.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "a6c3d4c2e493a7e48fb6ef6cddeccc359aa0d8b615beff078c7065df47c5215bf1c964aa885bec5867a1220bf5406c2b481c46ddfb7e01f121e4913af086deda"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ff/firefox-48.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "7f387391a8105972ca877818766048f2f0c100a1cbda0a2bde976c65cea63ee957100920d43a1b6cab4e7c103e5b4c048cd1293410cd32c7e47475aa7aae81ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fi/firefox-48.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "6ed696d1d4d7e04204ea943b15069de3ef19e8e57ea4f697c728aafb4f892f80d4b448137ffd4f7591f8342edbb6a1ad719bf7ca9d05960d72b22bf172ff7a6b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fi/firefox-48.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "92f16501746fc84132b7e5efa29efad4dea56c1596d1b589799b2f4a59321e344ef252e346be40fde915372b50f9106ca580bbcb16c19ff88c97079ab8954e07"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fr/firefox-48.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "3657fbdbb3543897047a119dfb218b5717be7d6ddcb31ea976761211e3186a8ef847f326d5a46bee376f326972f4b4cd213b877909ea5c97d05e1a81cd61fcf3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fr/firefox-48.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "afbad7884f15b0d9e3e61681bd62449b55a8b161c0ba5bd74beb50993d47068941535b49837509b9a645061b44aa17566e806b16b64a7a19bb5a4be327fe3600"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/fy-NL/firefox-48.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "d78aca665ec2f7fcbf4380555df36bc0d4add5920ff4a3f4a1471776fe970d8d7b80b681c32859ac57a04c8f90732d240cb82d2d3dbaebfda62325bc65bafea8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/fy-NL/firefox-48.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "86c3b0df4feab0e6acfc51e6c0b0d159d22e0ba285ae4d0f517c6fa6b36f3d14a73334ec0767dadc5c21afffb616ac055a72bd15c8972ae6a718f3a88b4a4b3a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ga-IE/firefox-48.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "368f2fff3afa7cde9f3bca2f3fa281dfd020919093204e6e4ae5d1a0b6af17e748ded0aed83d2646961b0140e21e97a978c24539a6a7e984f607bf330f77d1f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ga-IE/firefox-48.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "7053373d6b96eb2dfb95cec2583a5b0b25f9b3076d03d85cd9e550d02f473f4b4ff3bd7196bca5ab69cf383fa92ee4be8fbe4fc47628b55938552c6d4762858c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gd/firefox-48.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "02a82abd833755a06afc0b245ee2ce503ec45133f929282225df84e3f9eb76dcec40351431ed099a601c63d12f36502471e27f58c8855c618598f7befc647d1c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gd/firefox-48.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "dfdb2a4d0627f782c6054c4cbc529711e42b107b8fab4550c51443ab39b6f0496b206d238c14e292bcc9e5959480931bbea2647afe5b029e2a4bd255fe621a7a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gl/firefox-48.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "2a2c4d5f9df457560bd4084ec0641d4fb17f66e1e41ba73b12a2a467942b5a010fcc3895be12b187b2b1abaf912288efbb123b6aa914a0c2668f9d8e4160ebc7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gl/firefox-48.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "2dd595709f6a8715eb72d920e4f3a216bb3e7c64470c5e86883726e65918c42eeab75688b7ce8540c055f0151174ea117d345fdc28ac979f3bd49e94cb3bf88d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gn/firefox-48.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "fd9117544cb86ffba9661113e5f8e2eb12c782decffd8e66a7dfaa84da256bba5294e2dc9121985237a5c26abdd2f3005b5fdbc997161f3d0d8933c3133878d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gn/firefox-48.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "29fa2f47048a14260482ee98ac4083f94b86d669df4bc6fcea3614648c70274f4352f80d92421ccb22c34b00a40d05a6e8a39dff74bff1963803893555c44c54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/gu-IN/firefox-48.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "810626ef20f6bb6840fdab2c5bb943c210445396747cdc08cd7eba2d06dec43b9f8156d586e751d226569b51eca6f939f9a921b760887ea9a3e33ab6c9bf7dc4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/gu-IN/firefox-48.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "ba0be48fc7f37260d28c9aba7058d5b846f2c4333fa738c6fca93c70c580fbd1e6659800bc2236e12f03b91f0eb83d061aa97332c5553e64cf36559dbed68428"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/he/firefox-48.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "9babddd78b2f479d965b3afd35f4f862ac1aa9508a40eead15bb2d8851773fc331a1f19a79abb032cb943d4cf396e09e43d1d19ada0cc99c7496ec95732d0998"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/he/firefox-48.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "27329d2fa27443d000bb09978e0938b4d3fa01113ecfaae31ef4fd07d15f4973edd025dfd5c9872689a5682f59195fcc93491275e604893902ef96ec04657784"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hi-IN/firefox-48.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "91f1482f99dcb8107e3332becf616004a157a3d2a0127682994c01590dfdca85c273e86a459ed68f09ea5688ead17c0f771850adb8d885dad7a8a303b63dad21"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hi-IN/firefox-48.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "2c16c240315d20bf0a9f2d9231d1c7a72380ff1c66b7004d9dac6d84b8eaf665421e1a69e9d738bababefa1b7013ace385bbaec79dcf6c7f9bcb20a5484b8b3f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hr/firefox-48.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "fac7b7782a77874cdfaa33d5312ff4cbf768716b6ed17dc762568f1fbc69a9e4eae328b83bcae951b61f3513347a45dd922daf2679420a04385ef1f5260655e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hr/firefox-48.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "edd07b7766d98933d9e4338336fcfc44ba1aeeeba867e1e8943dc30d2696c93c337287f45cc3cecc13e2920c6d4b31198393573600d828623b4b96973eac356b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hsb/firefox-48.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "67ff1af81011477dda69baacca4c48e0534e17804cd147bbae57e7e2427f32764bbad1eda06687602b39f3e14de3b455dd526de42bf21b9913c97876ca03e168"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hsb/firefox-48.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "676f7e8c0377ec0e4f6614395608d1f8e4458445820fe7ff60ebd191aa640020ab6c94284ac9260581ad32c3e733c6a407c7b92588ed90f7f9b687289a29f984"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hu/firefox-48.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "afe8bbbfb44bfdaf85f3700d2410d03e488a05727bbe81858317e3a6851d54e97d223ca76a3e10c374a0f7ebef93113cbf61b4fb208ddbfb438ca86fd6b26f6d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hu/firefox-48.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "efb13d909e84435d152886e6d6059a48fa64f9422e35429105c40605985de8769544c1005df2396d66c7336d8d04a7195dd95c3c29a74674c8c171040b66d19c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/hy-AM/firefox-48.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "3e57e60bc13cc90768495d2edd1afc82526eed21045d22251f43d8c4e3688f5985de31d60e9da3222a34d1c0126e9a722311686011a70ecdb719a4b294e9e9fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/hy-AM/firefox-48.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "f9cf84a91d1b624163b5384051ca626800c51f486b2f1deb213cf7c62c7010e9b5b27c75420794c3d930ab126ce1c699851a279ee1f2f51d7ac939c57b0f0a31"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/id/firefox-48.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "047eb087640ab3bb89c3870cd8fdc50f33d393abeeec16e038c627f74743f61b9a14091aba858006e283b1d21cd51436267259185ea259657958395db99e71d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/id/firefox-48.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "1c8ec433c5b1fa936b299dcb53414e98e4a4d745151c2ea995c44d589e54fb159db2ddfdc380b317c343ede35ba88223c941db4e563a96a4a93878aef0ec7ba2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/is/firefox-48.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "2242c0e23d7ee69f5dc52203c6326caa194a3aa04a27701340334f5a9adb287ced4a5e8d42248cb43512ee3e2e4e94764b738af72b3c2fa45e20519ebff47225"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/is/firefox-48.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "ced9018f2409ff544f1f86cbdbaa516aa03bdebb9a2c96c8c6df3503e7be1677321c52710837309434548d4cbf6a6a23c5a79157462483537fba6d0aff1f3717"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/it/firefox-48.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "1fa74d050366c3175ded35f3879d14eadd81670d9abc28f4493171ab13fa87cf19667c2f40581b5029ac7391d2e21226d355d7c6d78c6f0d821867f86a67334c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/it/firefox-48.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "cc63233e9d9eeac428e999c509a7a9cb3d83a3d2b7b9ddfd8bff8841daf1e594a714f5540911616615babbc21f734295de8a5ac7f0a53dd4f62dbfab657e0133"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ja/firefox-48.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "4fef54eeabea6033078bd94d385a1fc96cd38d49eebccf2820710c5d516641e045be9a65f1ab0eab3eaf7f727adbfa98795671864b78288c04155d4516e064e3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ja/firefox-48.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "0c25eb277891702d418c62de31f6a0d7706ac783fc527070e6051456927154ad23d0bb3a085127426ba4d54017ce2a713ad95e47066fc2da0831a0a9f0ca29a9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/kk/firefox-48.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b42f1a2115efc622c1efbe62de3b275ce01ec43f3ebe68f6cb591b12af4232a0c5262cee6ea61648f9fec2da8702b5f24f6df187afce020f333c519d32da18af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/kk/firefox-48.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "2bba17f65a5b7d412c1e357886bce2fb4e017a5694f69930a7835429825dba86659e1caa31ab0ade9ae34dab0a507102d485c5fa44d9fd156d4ce4e3d4453976"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/km/firefox-48.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "36cdc77425f5b9d0546ccbe24027676fbb98616b226ecde4e610d9958a11c4645fd2741213820bf145bf258a0f32f65c81bf6ba365484949da673ca3a79a1b5e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/km/firefox-48.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "0ed475a08d580bb864fb1d8ba74e6ce2925591c008b479016faa048a642d2246830ef1a102381e553e5309c1b3d5885ef409befde2c1ef950c2483bde3de1ee9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/kn/firefox-48.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "4961da8a5f554895a642ea22bdeb640c289385a632a6de2b02154cdd10de8f7eaa9f3979f16bc026701f1986e1fcdfe2b67c0580eb30ef4e7c32a5c7b0a89744"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/kn/firefox-48.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "63d674029a8f43e21fc4eea4278e0944141d6b0425fc92855e84fb4859085ea15ddb7e06c229e4ea6262d42a91e8f2216de45d185e9507034f636b95d116c3dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ko/firefox-48.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "217af13c53e8e9edb43a7817a901bc51c5b013e9fd27f3aa3ec8ee46a820f23fdc558e73e5ca1e40829d0269a07f32d704f1a607d8cb36878338b8084d8463bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ko/firefox-48.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "14c8c220ce753be62628f9a0ccc726bb2c04aa9fe8af72e412853445dd3a4e4e328ae5b641142c181df0949212805a20c381b4716b5d4ee97633707bf70baa95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lij/firefox-48.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "e162cf0bc0545be09b6f7c8dc237c1f757d18fc2e81640b12ebf8e8bd396f9f58f5bdba875e5472d03f7596da9a0a9670f35a570241cbcbbe8ff8071861c6fce"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lij/firefox-48.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "c041bc122decc4ab427457a4c0e2807694d7cc9e44c4414e75f9b3cb09068167de0a98b1a1a876e4a36a1edc5a1efb9fc416b2676ecd25a80c0361833dcfdce2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lt/firefox-48.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "7d69e16806b8fc2eed1e9ef9e270693f4ca9beeced5f20e825ae6b65eecbee7538b9f7d29217a7c35043d221d0a4ecea3c6e0ae985431dc00c88133e7118ae83"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lt/firefox-48.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "6e2db9841264bcdf55f6f170935c3235178d4bf287399af80c953922bce1424b6260eeee57d2a80c5d090da14ea7d9ddbf36d96e27704a57c9064119d324378f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/lv/firefox-48.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "0a56414f8c375a201ba730ec132546bf9db558b0491fa9201c977bcf8fe24d958d3f39bd845cde3d5cbe3427a8e4503663d1f63a8b49eb814757cd7b4160f5e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/lv/firefox-48.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "adf934ca0002427735e77ec583882f81a8e7a905fb20c81eb30d25e4681a5e77738d361105906a7e538f61b967ddc4e44e61627bb1670cf7ffa92a0a25b170de"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mai/firefox-48.0b9.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "598c052561b618ee8ee16ca3d3db49e6102cfa998fef2e201d80980a2a24683347d1b335bab6f4914d262530e1d3aa0a31d06994b211a3d1fc92cda9b38485b5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mai/firefox-48.0b9.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "9aeb08929ec09da09d375c4fbe757d1e7d7fade2b9307fb27c880d8a3dfe1e73346a2128904ce5ec2824bb57c3bc9c533fcb445bbc4b0d5f7aec7f5bdd8beeb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mk/firefox-48.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "75d8b7534adddcdb3354a36848023c2015ff9701c8a4abecea5d8699c77464d27e4a5411b38fcfc1590443d991044637f9c37c38d9745756e18e93e3a9df9630"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mk/firefox-48.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "10a82086b5e54b70d1110dba1be3dc98ec64ee4fd32ff9c73abf743ccabce37d586f63b46fbcf11913126f62be3c4caff6593ea276665632ada512e9119bae8e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ml/firefox-48.0b9.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "f32e2a3e4c2c233840f6235c71fe70fad5afd0455cf3729cef3888fe3bc54a6d73d5fe32fb0363b693a39ba414be02d5107f62920f147712e36f48a6a339a96c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ml/firefox-48.0b9.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "c21851d483a9dff5ca1a5831c3438a9d6e25828e6bb6af415dc9943d665f0752536672a9bdf6d5a0d8bc9ece1193279aec2401d5fa982210aadc5cd4891a1093"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/mr/firefox-48.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "42158c09eb37ec16ea1aadfe06c44a62eaa7be1bbaee5e7b13ff72aaf60e674a4b27d03054c6a7748b06cf02522fe54eef92e6ea016ca59ac0c6caba33ab7c99"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/mr/firefox-48.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "00a6455c238f72f5112c8e2570e53c54c6b20c1dd12fef9613b700fe6ea9e0017ef97f88f028509575960ab28e485c2ea79cd06ebf03a7d262709892e1b0ee9b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ms/firefox-48.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "6a7c0e93a11417413099b557057ffcb495b8dd97aad0c0d95320c59508258721676230f0e10114aa59084c3e26eb48470931d0ce31c7697c17f3eab5480b6f93"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ms/firefox-48.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "6428319d01d1b31b84f6ecfb8ab3ade9f2ef5ce56fdcb4da1a6adfa89422c9c83099aab95b4884d1c336a88f429e05586f590e83da9d1bb07b5c7d1e4e81d4f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nb-NO/firefox-48.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "b1edfc9d90f018b87e5d3ad6daae2d5aec0276f086020c7dbf199cfa120c1f6216627ca72c98a307d98fe82a0e4b57a703b0cdf7473604b09918b4dd3548a795"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nb-NO/firefox-48.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "8d17660df93e03c056cb96aec3a64528b3613c7173fb19957916d1f4271cb13defa59f4771fe0547ad72a5fbca5bcfa68855fb220e5f560ce6d185ff074156d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nl/firefox-48.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "2d881068bf9e8eace11e3d57c41ba99fc81f797e13a2ec05cca6acf884369a4bfd140027de2f7c79c6b7245e133c5261bb8e11f522debbd946154d0414b3226b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nl/firefox-48.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "1ee190a679c5575ccfc6d5decbe5bf2da55769c766d70400f79d94d4423dc594830f08b456a8a398e3e7a1cdd507dcc224c1b255fab56b4b4889c0f283bf0ff5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/nn-NO/firefox-48.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "094533a700c763afc66cf417b0b09f8c2666143592afd0fabb138c03e95c94da4746b03c80d1b473fca94f24f57105239399a994cde961ded535cc5787bdc7d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/nn-NO/firefox-48.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "98ab06a9210bfe63c0a7e90310286afcb24ce46b8096966a2adff608e214b95563421372a383814163dadaa4c9fe318a1c9f2f18537dcc37b1fc1eded227df6d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/or/firefox-48.0b9.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "6139c760019bd9932a5baebf599090540e4ccaf0e18b3faaec8eec27f8f5b6a2199c4a554c0d6d5c92ddba4c9fe24addba47becf69b296cce186be3c2ba3a5c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/or/firefox-48.0b9.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "503da59dbc9c7cbf5fb85198ea2cebe3a9d3ed5b6d0edeb2bc0e0a4705397816840f40d235ac63bc95e34c5aad7daf66ce31a3f6b43a8cee9720245269520bfa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pa-IN/firefox-48.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "af70115ad3fc5798f7add37bf342a291cf263afbedd1b57aaa68dddcd1d707953dde2e10c71b38f46c942e629e3edf8a2e55f502d1d98bb92a693cbc85e3ba73"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pa-IN/firefox-48.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "2f11b9bb6315843815beace2de30f5d054575806e98021144f3a622362fb484a0078cc279e1fd13a1b2b6fe9070c878eb718680a95ff9e4e5a5bac3ad31fc949"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pl/firefox-48.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "7fc676238c0a484e71fe165921bb2edff5f5f98d87a3a02111e4c9f4c103ea8b0c4454fc39d2be381410beec7e6bfbcf02eecad8555f61d424187dbb7e8117f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pl/firefox-48.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "cd27e4c532324f35756c3274ecfdbc47d42ff7a456e81363df4a96ee4067dcb0ef6dc321a884f9a19e0b0f25101e2e1caeeb62280ad1305c0eed1f8308997bba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pt-BR/firefox-48.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "70123bf8edd0ec031eac0f150bd8d7c12e52d5255841c074c8ace5d0062fe1e1beb336e27815b3321a93f2be2c7eb8c5b95b653781922562b625d37921f986df"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pt-BR/firefox-48.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "28c864f45774f4e56558e691220a03cbdbae07ad6c4cb12df51938a0e394b0aca91d64ea1d3b5efdf361c54510e4a14033c3c9b72f94315307b606516a9da5f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/pt-PT/firefox-48.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "b56bcf6c74c3d629c89bcd138e948fc768bccd8844f664100156399ed89c2715e75edfda1427f9205ba44bf7ae12d46308f6bd9bdd661aa27a2791a50860afc4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/pt-PT/firefox-48.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "c71179e281f660787df540c9a894591ac22303a7cf600c649e96d8748753f1c8caf7a016c91a822b867ed5ff7467aa182583fd45d0e6445dd07eab58fa0799d7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/rm/firefox-48.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "51693c87e2961b69db233d543c08b6c3fb02c04e7cfe70ecdc6e060fd1a32625e197db2042b0b063b0f5eb465191f87a41b5602424c44ef4dcd3131423ee3152"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/rm/firefox-48.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "48241427ee3d820da6a42b33660184f56ae1b9bce2d70515b26c8310503563c7a6fc7de3a15be3a366bfe697696ba9dfb19e08fdd31bfbda50abc42c248e1a70"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ro/firefox-48.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "f458cda0c659c8ce5af848e7a64942d89b9d844b5d8ad0d79d44decc0a537bd8893055bf9868e3c65e4b53ca4f01c0a90ed449f19726a9e1314cf4726f9a1bf9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ro/firefox-48.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "91656c40f1aeaaa1fd93abda711c4ef748a3bb7a357f7a4f469bcc3bd8e2a1ba52546beb51d894e0c167f168fb70d1b5dc382773c73c094221e3042bc9857bfa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ru/firefox-48.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "f384eadacf3cce571e594a02fa7af39f64889f5b8d02846162c6d359052ee0f9071e6df600800a5fd3f3fbed622fd34358dbbbc7e05357ecc12369bedfe8196a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ru/firefox-48.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "de52b810d65d048065a83ea430d93d75c4e21667d197aeadae9e036f75d16c9a25af5c4b2c2fd9bc9b3a7968355e9f6640e19996f6d3fc42aa2e1bc4ebb53afd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/si/firefox-48.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "a14807d1077ba5ee3ee258220768094f49002bf624e235e66943f2b7bd1f0eb61f84e3f540d0403276d664f0aadfb75d1cb433a1b364139c46cb48d6cfff75a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/si/firefox-48.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "0d6161efd6fdf1837892b71ebe639d13751ebd880b06211a40076e98e9256f30099b9071611c25aed2c36fa255af7756e39a90d60103e22c3e2572dc3bd870a7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sk/firefox-48.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "d5f7b76b75afedd12cf1bcd52df49418f17e518dbde52c0b822f8e7e7aca55838f85b924433b8083876588209eb1ae8d148585d60408eb8ac06b3be38ea4faa7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sk/firefox-48.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "123bd1962ad26df9c72075ee360d715c5ba87bbf715f0f35841d2466e14a93fede982a33bf43c6593f5356fe2de1d11ae4ffb0d05d4506856bb9e3933cb33a9d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sl/firefox-48.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "343ebcc6207e8cf4b8e46df9371f9ba6b91f6d79a5fae675cefa5a80fca3d62e06557db6d0126aa68479450365dc1084327947fc061efc41b504d329a6d7ee78"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sl/firefox-48.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "3eb40d1c17d96bfb24d02dce3195107abd37673675bc04eeae71d7e8efb4e3ab70ba5ad466e890bd82d55e45cb34edb407e03676d03dd27f29c219666e6307ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/son/firefox-48.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "926bff8d0899b2720677c072bb24c7622eed59d548084f2863b844afd8244cf83753268f712aa2fb6cff360448e9ce4da4974f7f38417fd48ff0d3e48629db08"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/son/firefox-48.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "0fbe6e0edf8bbf3039b0ea472b25471f41446cc0c65b1455470d8afbc2c005f3113a82a82782a013f6c6dab2888c0be260ba52a516bfc2045ce4e7307faa16dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sq/firefox-48.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "7886982f83d57172c9c982f4dd74ba925a04d9506ad0690dadcd8932fceccaab44d20fdbcb571164108281099be051becfdbfbf76f1e52798af7a0fb51c54578"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sq/firefox-48.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "a59386e187da12e21ab1b378b59429e6504ea1c7047d60bcf9fce7ef3de578c92fc8cc791f67c9b6e4577dfa0547da93344899f5ed9c88049437604abd7c70d8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sr/firefox-48.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "1e0d31851ddb5fc67aca4aeb30b368e5e1f7818d265f279b033f8fc0fc891d0caee1badaceb3bcc868cfc58ece068efba92c751b3a94d3968f84cf060ea18b4a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sr/firefox-48.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "ffa9176877aea7fe0672a8a5b2fc8f182206cd80d40521057502d981f80c8e2a77fa9dab595a3594774b9e6cd08fb2bb66e8416c17ee59669d0e4d8b6f73e67c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/sv-SE/firefox-48.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "15ae7f700d02a1608097b2b1d14f3e560155fb16a43eed962fb359e92525637dd2bd6992f4616640420d3db489b7fdb5e771085f6b502f8ecee55377fcd03be6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/sv-SE/firefox-48.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "b8d8f12b9b63e034197344e52145dbba0e3e9a5dc2bf53b3efa8824e3f730ebcaa2a8302c6abfad67c0fb3fa5fd1e76d93bd5be5ac2707b93ed8421fc8e45256"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/ta/firefox-48.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "34c6e9235b8c5be2e221f4a3a1e319f201df2247bc54d0e07094190d4b80ad064ccd9b426420ee5b5014ac1fd6d7a5180d39c331bd5d561de942cd00536a57de"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/ta/firefox-48.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "2f41636896e79b9d4ec9d772f27f817b7fac7c291335ed1338d6520378be7553698225692883c186f63faf471a94dc9fee4c07a93284dc2df5dbc26655679f73"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/te/firefox-48.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "4ee88c91de2438ea362ae50afe1d8f290bb5cea2103af31d51441385c4c2c78e6ed2ae444b121038c7146eca7efb0acdbb8181f099f9638a25bb91f39b20ca3a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/te/firefox-48.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "c34b58adf0d89093782fc5e9272c298fee026e0f5efd172766f47105ed19617e483cbc9af63d73dc2edeb0025c95db0a5dfb5f31343717b73a431d0bd5a5a20a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/th/firefox-48.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "887d830f0afe21759212a8d112d2b4da48613488c3e69dec1d526eacc067a23ce0d58245151b89176c2a1d869550cc5e5e6598f3270e43ca4030d8caed583e14"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/th/firefox-48.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "a4113c7f87e6e7f0491d12b7cf65d402c75a5b4dfe9bdedbc69a60f4456f825b60e4170ed49110a42720a57814375c33a14845a653d9f71f51cf417334c2233e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/tr/firefox-48.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "33620a2a49f9cdc39f591c3aa75ad5688437938b1fa31084d74d2ccbfd2cd502e788ca3bd8d863e666b3028c44b1742ef9621c40051cda361b389080f3e54eb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/tr/firefox-48.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "29b1065949adec1cd057ce242294176d23fd71249d7f727d41dfa81224d744fe0d8f1d19a60b5d8aed680f9e9b2ee2f10d2da9fb5c627aef6e00627b56b0f979"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/uk/firefox-48.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "49140602407a30ffce9d7084bf9b85f1f1c6f9e2464ff61c8ef3c7d7ee8cf23eae9492613718d78d16f56cf0f7473ddd8171526cc64ba599d1770205dacafd10"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/uk/firefox-48.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "200101a9c88cb71474ced39007050cae429f0ddc973a58ffd11b816e749ce3f5dca2f4db50d3b80068a0bd048d383c2847f7a283785d52c5df938d9e20fd76a9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/uz/firefox-48.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "37f5469824bd70cc04c7d64f48d29aead9cf4839f795df61f02f109955d299655a730064fd52a98170925ee746ffef1802bc492d474779963bc12851efb8109f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/uz/firefox-48.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "9eeacfc5b02758e79d4b47ca80357c6d8029f64e0fa117f6a73c3f1039190c3edc36ffe24b7231dbb28e5242cee419ee48ae4cd7614d6f7209473502ad4f1a79"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/vi/firefox-48.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "4b6b9f4e95caf2bf331cf2fa910ccd8ea89c4bb34afdbc9eb2d972f1efb7a7929adb6701356a70d1567fe71dd857c9b1b8076aaeea916b8a4fd025675305b8e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/vi/firefox-48.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "635a750087f5eb9d80dd4a9410e1ae3d43deb7ec6c88b2991c74387ae0d6db568cb33db975fbb29586489b09f470b280bf4d5e921aa06a5a881aa8fab02122e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/xh/firefox-48.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "fe3e1e006c71015853e0ed9ee595d1a91be62124f7966e3202cf0bcb10942501c0428f216068d372191268b2757ef55005924d64529337f6bf64c695c2cb8ab5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/xh/firefox-48.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "e6f2276f5a41cab83352c8180aad14ac3328db21dde432e1d5ed7d18d0f98c4ddd7f733fc645d690d0c328382c64d5ee76fee17dd6e6bbbda43a717a22014303"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/zh-CN/firefox-48.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "188d418f0debdda2479b0ff2a355ec0014b04ec8695eb6e2675bc71d8c925eef6e2044024601e1de583d6512a977d5c923963a9be60290bc9928821180b371f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/zh-CN/firefox-48.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "fc7d5d18c568417d650ab282d0f09ee77a5e49cf9d6c20134a38b8388ed908e00e224be99fb757d7d885bc27ec5f01c6f4555cd5853f837d361e2501db65d723"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-i686/zh-TW/firefox-48.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1a968c979273b21e76625988dc21b8037c405c912730fd2ebba515a13dbc1f6d3807873fbef821f5126af773b91d10b3be444739eff287dda642448e692715af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0b9/linux-x86_64/zh-TW/firefox-48.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "1b79bf4dbe43574342f8093c036ae29b2f2f4d88e1201e9fda0e190ab00e5319ae5fe830745c0b01d66deed73f04be7313ac4e3b3438afa22c75f03cde8d0fa2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "98736e1a7503e6550491147b418815abc1cc59e58172ca45933f24f8a3df1d2e2d614d059d1159fefd727e771489c488a369e0b1f9bb7a25c8eb75cfb4c3e2b0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ach/firefox-49.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "e8186d58d6c3847b475ac3c55f97476f393bb2ef210a4b7ec95d174d160011e0b4d0798de8bd33ebd30c342506f713a71509eba06fab03dc6b0fee7524f19dcc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "0732de2c643ec1ac17bfb3b7629207cfde48f4a135b7dafd6a5efbac3231382fdc5f19048cb76f3da3bca255bf9816956e301e26cf28390ea9cccada67d920cc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/af/firefox-49.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "ea5c72eb31b41714d57385040cd2d80f273b4177a576685ee752b2e92f90f8d9b5439e1f52dfc9941143bf91248be72aa670d134ba523cca856d175960bb3f40"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "36e3b5c374522efe6dfbb3b072ed2a75b3bcda8934c4763468643999fd14bcf043a2e4a0a5c62ada2f2d903a1f593e06976354a620733523ff806f6b8fecf1ce"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/an/firefox-49.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "398134c3133b75f027743ded416f3063d74ef777cc854992cd39aabb6397b00fff8dcf5116dabdfccee6ab1335bc296ccd991b3a4d72707735880d94b8f81af7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "395b9abf6a6f01f448d7671908c2d7903604592490109793f3e36ba83375685aa43007bec07d3f28997416d8aa02df2597ce3392b7c1e83e1af4911203e2baaf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ar/firefox-49.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "731d61dbc03548c77aade87c413f91d727cc8a87e15c202b73dece2a17c2bab887eb3912077aea670d9a928e930c4550ef2150442be8894e59b082c6f3d4b479"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "7f2d08dbeae79e7f903ed182c9eeb436f227ed9ff9db17d93f2c34efc3353788a0b499e23f2fb3eb892c9ee1592493cd8f960a6092f83b19de9419c7bd4ec3e1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/as/firefox-49.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "311e413592438b610b8402eb00ed19b87caaa02522e8c40fff454d6d3fd8e0b7d5cf9223a6fc52d7c5f0be23baebb87639c2c64630e5a1a966d341b679bc1d03"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "a782df4a337fe18a7bb85c2a252444154100a597253d98d25c268c69a430045e4722a888f3d5fa51926de3571dd1941c117cd34537ff866c5d34279f3861e0e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ast/firefox-49.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "87a7759ecd002f994ebf7334b9c8c4c042ed6b84bc33485c791c5ba49bb7477ec801531a0723820aa181770c3d404eb7a0f7fb91818c38044ca9e3a130962899"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "d3822be0aebbbaf200e243c3e0ed0564cf6b5a9f14825f477767f98b796afedde9c6018f3b34c0263553fe190516ff0020e591ddc8ed688cab9454b7760cf131"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/az/firefox-49.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "2a70bffe3da3d3a9a61e649badc3a64f3110950cfc0b3cbb42c6f799465d928ec12c9efd1e7ee6ea978c865e2d3fe05d732a870654bf629f083f15357b360ccd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "edc39ed32b7d990074ae3a5099cc4a0caf23190364eb87d1218a61a25b66777fa02b5df6f20c96c5ea67798a999f0cba6873d5d23b583bcd3d6ee90a7c978847"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/be/firefox-49.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "d0558a2e751d561e2f316a7bd57c3a8d92e8d5cb56e5eb28d44b5d40303550afef2bb9b69dfb0b80d1ef706a33717017eb077d3b2bca9277294cc76656a6131b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3524f48e8fb8b0c98c8df55d3e2934240eb414160d0e17d6f9beccb6b0540b9c9b554757e99dc99b16e685779c5d3395ff9bdb5c3a6c9faa2e88e099986aa4df"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bg/firefox-49.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "f44089b4c10a0791d98e75580c1316f400c7fadd48050d9f3a352064005b3b4205db7ef54bb1ab7bf6518f7bdb3be5f853f490cc0247f3f7a4ee7d6c50cbd20b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "39b42d189a8ba7508e98045e1d94a1c79f8544cf4b2e2cc5187356d7f9ab6deef012c6e5d2220b2ce2b5a58f565289c5aeaee6ddcf0ab7b0cfcf18a902b95715"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-BD/firefox-49.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "210c40e18347440077ddd0ffd25426fe583547a2a9bfbecf3e8ba3d0159d7f7317c06f893731512cc0666af488f32ed5808c8e2aabc921367f538695ba49fde9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "dadbab0c70f22ec20a253d73081d3ccecbe148c6b0e854b85e7c079f4979f746c79fd5febd916c167cedd78ef04f5e0b2d2c925999424bb77118d251287311a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bn-IN/firefox-49.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "8a2b9fe150579e487063f68373157ba087c571f53a98dbc9251deee92ebc58d587e38be2bc0412ed02cd8ccd485d91bc2fe5d70c223e7fe6edd996d9bfb89bfe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "7a3a3c5015f407a1b7ecbf35763ea091cdcd3652c7916fe81d39336521fd6ab908a549bec8d39e089d0161fb6b37894b893058b523f78bb76e75dff21852fd13"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/br/firefox-49.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "9a7b5efd1f8d35f8cacaeefcb446028745bd999765fb04e60403b710cc9e5be14d172b6f0c2b08f1093083b6c4d94f22117f2b717473f5cd2bdc43ecaaec50a4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "4671c1ed650df67ecdf152ae1503979f52b001660e167ea4ca1c47e1152e1450e2a5eac306b302c55b28e686c8535f6d612faa4c53b81cc5297e765c1bdd0afc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/bs/firefox-49.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a2e4417c3987c8ab15ef8afd4fa130f6c45550c57a4605ffa301dc7d4ff49620c768d83e9de00f509dbb0cfd94530f4cb102cdb1f2a01eba091982fbfcd82d36"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "076f1deebdec83f76b44c41820253a7659b6702a1b1ef7139419a50411f2f752e764f96f84be24d84be388a3a3083656f967ee53ae1c640651dcac46b6dcd089"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ca/firefox-49.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "6a34ba7edb264cf974fa23650c73bcdca3e9344dfa82f3adf56c04a73439af5a093789e38406e2ec94c97635883eda2a232fe33a1746d08ff148022a1bb61fd1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "0657e07ceb245e435dcb3c2e36e71054bf369c088e42ad0b7448c05c5d6a666ba5505da01d2e232388794ce5ae3be8dd1ce30ab0926dc9948d2a1291948f9b5f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cak/firefox-49.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "4e95bff1e40614451baad90fb3ef76e27f2ee5d1d2ede400c091f46421b6b17a0c91bad04a45208219ef7513046749b9a42a147cdf7ba52a88dd515f5dc27cec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "73264dd3b43e4ea4028bf622a2062797e4a28118ba597df19affa7fe38e630aac4a960fde8eb6be4a1e64d91b3b01e986d93684819c54e66c506153b19a06550"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cs/firefox-49.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "a94a811ede59154c98e87c47bedf4a5faae44cbf2c87bd7346476c92977abcdb96b79cfe379a04a459daa576170849a5c2c779a14948e51e046fc6fcf0ba4571"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "cc45c49758e3542ce704f941fda143ec531c9c0b9b0b28eade737e792afe7bad0db708a61510fadcede7af64622b7a97cb1f2c8eae7385ab447dc4a4198c07d4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/cy/firefox-49.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "07999f0049f305e75ec3fd1102673576e685e42b894db7ac8eef4d4dd1b4d2599a47b8f1ac034c728a5f3bb433ed96550907dd2f9e63a3fbd0aa43b65f2ca744"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "115840053470a057de9afeecc8a74113ff97c06293ce52995ef2bb473217d7b057329a4bb239bd21799d894e6a11081e7afe5191cc1ffb8887481fd08911f333"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/da/firefox-49.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "358f79e56cab4260557fdd999a70d025c6b2f8e7ea01a5767500e4b1906a57994592c633b7e10b9aa54a7a2dfd98f86bb3a8f8b09c364d8675bad5d74cedfd2c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5f80f4e32a71560188a21bb6b457b66a692f5eb32c5b45e04c40770b83689ead6bc07ec4a110f3855f5fe0e034f7b64ef8b5fe80526c708077664b179def71f6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/de/firefox-49.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "01c71572560665dafa87ae8b327ee356b18b5ef08df093792c07b3858c42f2f9f3a89a2752fee35503785cf10130ca22fb21db83ce48fb902876eb9780b959cf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "11385bdd26fd0eb9eb505141af2033a9e3b85f0d748959938eb51b9d7bb9e4c801ecf19e351957b9f8549d487086968b1f86e19534b09997b04642ced3f708d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/dsb/firefox-49.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "4daa34474c395c52c42c12f03125db8266e83ac1d8e5b098f0371cab7445b767abfb965668eafff466857ac99b6f4c00f4238d00b2f3915f228a25277b54fc2d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "f77b62b8acabbd5afca19572be983c2f81200ff2bccabfe45b6c3d41c32de90cb4fac56db7be01fcf6a8dd69a72056e903f62d2af08b7ef0a06d18588c685b8e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/el/firefox-49.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "9a3852f3dec48d5c40c09d6c961f87fb34f7fd6423ac86c4f4fe293560769c1e5a40f0d3e307fe65cdf614fe6b7fa7b1279c59b8a514e83e121b58ca90b46d31"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "3197dddc1f6aa65cc7bef6217175d308c29f1bc87014e651af76b490601cc202e9609d2728ba2c05203cfb93735094dc7efc2ee9f02b8544776ead8e788ac7b2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-GB/firefox-49.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "c1dcd26ed3b07c555793304c15644033105a72390c1307921fb215a06ddde547a34e1d027966e524878adf26a8fd3323d3d59c2914bfd20b6e7b7b4e59f54eb3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "27d8f7ca57bd1fad729e73c0fce7f33da77249f1668c4d2b546db8b0edbddff4795537250c190d59cebd83dd91a06baad9b791c7c7ffec2f4d82cfdf15bb58f8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-US/firefox-49.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "1e267127d21a6f7c64acd7e1a991a70b51742bdc2ae83f669a25203f710483a35b3bc7a9f226ad2efed77ef88161d345d312efba32e9b38d60d2144a1ff1810d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "37fc1a82999c427496fb50ab6ce47d719add8f2e00d47269d266418dc1c1cb4191675a0cef398098fa17e9ec510a40250628eb5290b270c502316b3694361f6c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/en-ZA/firefox-49.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "5ce15a1e1d9a5d3c26a2e1b2705c11fcd42acbd296231f2d25d7b130185b09ab25d0332c199d0f8e4994b30c97ea8d80e1f1ceaab8c8d8ffeaa2a2da91b32875"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "bb5e5f0b07054f2cfaa047e8df129c0fede79f6e5d736014cea52bc59b8b4c5276bf3c4217b818adf2ddf11c054c8a5ddc782a9c0b529b7164bd6f1e7edb6ca4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eo/firefox-49.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "01d363154887ebf4c008646c4d749c89f8d748d9b0f76e19de37dc097517aa67485830679406b57348a670568f9406fe14fd22e01410f3a00e102b5436779193"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "8fa22a6ac6e2f9553bfc6fd7b0326ce327e4352b83e45d89ea0f79267073e03bba7dd1f2c2c2de40e3533cb0af97673aaa758eb0914c090078306f4b2902e361"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-AR/firefox-49.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "da2b44fc3bd5c7536744b1355ee9640b2d430c32c3127ce1f8eea09cf88016c0e2bd9768925abf19b49ba62c55d90c029465b03c307fbc361ad95f4c28acb419"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "2cbc20485b5faf26a7f8978b63b8c135582569bc5d68c96b2dcd3d66864b2158479b7c5db0521ccb9c2de4eda6b4ffdea04ea480ac9b3e4609fade7f17806a6f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-CL/firefox-49.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "ea8bfed6bb886d23f8755b8187495ead5aa955c9fa45db1249a2f23477bf01dae4959cd4eeacffb6c3a6402d47da458c9d9fdb43243d64e19e3d66e3e1b85114"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "ffb37896e2f7de03c26b6e182416c399b9776bb14828fd54ebb34406f25ef77bc9eb975a13b7c9c9b02bf78b496928abc059283322fb1422d63d506f40b533a5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-ES/firefox-49.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "635e7f1e0fe96d6e074bb1f2a4e92d98e0fb4049f7bf34f5e5547fadd00691e27efbd5acf6b79ea9e3bbb8d7b72a50f7beb64bbabfc55601645292a83384a2a2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "f67781fcf3ff9e4dfc1ed042bbc6c8aede1a06a6f9b4f9f4c969a9df769114febcdb4bae191ccc9ac10cebe727f495307e497af721c326ad7d2bb6894fd93944"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/es-MX/firefox-49.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "42236f745af27e5ffbd1370b9d5136793d1c0ffcd1a1f8299f3a3d439e2671175524416bba6e1ecd162d9f986f89da0d3d1ffc760f2d48c5d28a99d74c467bbb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "d2823810c39808332c46cc39d50c552efb61d74dbc7fb59dfd5b76d1efae544b52de89cac42be4944d831691971d4d8c880ed1cffd9448b05872acf7da39b698"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/et/firefox-49.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "61fb55d812c8b487ddad136f9c908396aa02e3ec4eee3f2f3fefd883c5aaf24a0c138366326bfbebe59b7065cc6f8f99550823e46bad876db8d930251f6a4492"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "5086ad7828197b129d8cd25fbbe7bf0e152b3476ea886ed8cc02290d4ab4912cd02ccdee0c02f08c73dffe6a0b34c11dceeba73cd948c03b26fea8c3bb2a84bc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/eu/firefox-49.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "b701decbbb6374ebb39522b068a36fb7c3bedff9f2b76cb655cd56addd592bf7d118c828283f52686545a6d9f603b674d8d80b35db217b5637fe2b29864e35b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "e14d7a15eb97c7b35bcdca156a86514ad8ca91d9af8978d9e9c1afeef6e71fd3f990daabd65efe424c6275944ea1922c3a313d562e710ee747b4e63d950c6578"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fa/firefox-49.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "4a0cd3b22daae4cba54473e4b144062e93dcc995a00e4f94fb66349e52274a5504b8e91e681305999fbd0acc3691fb011cc4db5485d59a9de79f542c3fd4dc64"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "d199ced706d4dd7f1b21999c335c500cacb8c1e4ece153f2f169711b4b381c316d5c2654608bb6f9a035f8c318c6ec96afe217ee6480451002e8f3269b4f0a82"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ff/firefox-49.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "58bb1595a4eb0dc651ad4778674103b42621375f8f7d138ac658915a974be52c35fd3944c099ee7ff791d7441cd818b09cddfb2a1498274aaecbaba8cbbd8ba7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4796471c2c42d9f5f278615b4a29edd80df8c113f42929a97c211bd63fe905bb7861a4c42474c6f19847308c2444e5549b7844824d99e6f236bcd0e2ab44e906"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fi/firefox-49.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "5d61a0ce98ffb8b9b3a8942b756ecaccaed33fe02513607aacf5338141beefcdcc547815d0f522da57ea1ba81dfcfb0c0e3ca6a0df237ce12501c41a157cfb51"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "6d69faed2f0c72d47311b2a756cd08c1f0b3c142129fd062bce661ec90a888e1ab246a04fd10dc2ba987ee2602f43b794a1507a7f23a5c65e909c0378e2bdea6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fr/firefox-49.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "c92b0a2d591037bfda7831767d3c3f3d324190cfb26100bfb26cb12d9281a1b3a487141e4db5112cf122cb4e236ffded74d751aef2590fe703201128a1c453ff"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "25cddb8ea11d5422f966c1467d225743aa5807df9131563ed272953b4fa5004c331de87629e2eb6ba1903ad9abf8f0745be966f2e29c82fa74f620f08473f638"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/fy-NL/firefox-49.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6ea3b911dcbf66fa365b2ce6a6722ce3e412e61e9779d647fdc42d6e9571d60b3908af034658cfa42bc22432ab0a360f9eca676ef3f22b36f05008a33760b1db"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "7d594f87fc45fd1ef00f2d62dc1c0a382eabd02745cee1901d133f853cc937a4c8915615c189ee6c5378d161fc75230a1c250c789a8c734aca7eb23bb44d45cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ga-IE/firefox-49.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "af5a12a3cf90eeaea1f028d4c9a6985d9d8c994947b7976b1a3e8e0ec1af18bab4f8d7b5b86105eb119b1928c23abb4cb7fde737662eb06e0b8394b19573daef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "8f0e9fa58b929fe1d5640a373ec0b9a93eac336989b1cf10e1577ef8b3b57786f51a40fb0b6a2401faf192e54f7793f04ac3ebccef5dec56a48ded34cbd5cbb7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gd/firefox-49.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "8719d4655bf8ac157a6d144ff9acbcdcc138094a3d589a4078d9786acd036adfae6216846681a8feb33f9e020129acff3756074bfe18289cca126f140c4be1a5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e198a3becf663600184ee46f5d7043d5349abf10e2e951abfef7782449c142755fa0a37defaadecd674fb92589c24c3d49b45fadcd75ccfb81dea5ddd42b766e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gl/firefox-49.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "e37ed350a7cdd5801631ddc934874016b38e4596b1d397d28a9735a977ceee80a70f0b382c186a88bef39c3c747f9825805a2c8143e0fb7b7be574c07301b77d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "24b41e132f5aac62884d6b5703a8c3be679d6f8201a3abd3ed966cfe349055102bf099cec81f01cd86b40499c597adfbcbae2ca17bc6767c18aa9c0f1c317fb5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gn/firefox-49.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "27c62ad953946a1c40b7b7393cc249a9fc2047c6a251c4d27c5a1a9ae8e8361a14c3fa934f6669f0e7a99b27573fac6c5e151ae9c590bb58327ab503f4482ba5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "aea376e23c7522fdd3c0c82f39455b8bbe67ce7008e1e1d9de575f98776fdf3bfa06bab3ba0da81862c0a7242ab9cd2ab1f873a34df084a88ec82ec45c088611"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/gu-IN/firefox-49.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "4dbb401a0f92e02ee8822379a6313a9e7822d1155d064199272dd2be921d9dc7849439b04be3f25043fe37f43a3dee3e7b21831eabd1c555d5292694975987ae"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "97888c66cec9bfd111e76fc22440dda604c643396679abad421223b10688763a5d0e64fec46dd94084f30d819a5a12df4fd78434c4b03290fa745b60281b39eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/he/firefox-49.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "d46a2aec65b32e9b92a11230465ee6e2f83cef5a5b95057710f0ebdb3581810a1cbff09563f9ad3503a2c7217947369fdd80e0217318a40feed7bfd01fdbbcff"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "48c3142a39ed9d9173d1c25337d65367f1430804b13d0c9595ac2546c7c22a177a4d528f37d773ddff3379bc7bdba5e69002f2a37c837aa95a29d4e52774e65b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hi-IN/firefox-49.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "cc3c1520f6ec453bd7e347791f8ab3da06a3aeaccb44cfe5491a4fcfdf69ed7baef66c2d31a9ebad9d2538b6ff8f1dd27b20a8f42665a1c6ee57c5f60094ef71"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "86dce4d32a3f01493ce83379cb20bb2e267dbeb770b9631914d3b9e722cdb9ae5a0a974b323ee2ed17fb97bd232baaaea1e53ea6f29b11253046656f98219cde"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hr/firefox-49.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "446c11ab6645e17465e24fe1d4dbf27175b27e4808bc66084bcf8a1760883f6a36a5992be18ab26115f75bf0dce780c42fcabb1af3d2009f4ff7015bbe0612fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "8eae4fae6e4a7d5acb9ad2b83c4f7b4d2c7edd75a4d320b6665d803d44fc448214ac71b2c86c9b16e6450f7b5238db8633a917f201b5d45f2cc03a31df2ac9d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hsb/firefox-49.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "c937552d45b948fde0854ab6ec27f77aebf7fa13eb6ff5fbcc74e86309581fe6ec799580fca7e131c940d218d09f70e4e49dc5348ec99e4d5ae6a0c63c9a6f06"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "4c38f40861411365e4a67bef548252328024438fc3a39260708a505a625ae9fc2912bd537a83bbe4125a027b50916daceae369a68d0ea7ba309b8595f8864fd8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hu/firefox-49.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "fa298f7b4cd8fa50767f8b9a2bea0bd10e898a9e3042a0e09785ac74559b05877dbbc663ddb185146062fb1b3018a06f7e948fc33711726e43d5f33df1b3aef4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "9e2838645094c6f8703857b674916517a47328aedead3e10dd3801abfe94971a648d792cbc1abfcfc7e39629aa7936d74cb711b53daf9f7198594e7b82c063ec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/hy-AM/firefox-49.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "a84c9f9f20e19d3820b632f3ba4c9c479066459d293a57b5ff8fd4dae1d1451f812b0a6a71e72559d3ae0596a4ccb5fd09c0056a2726ac3a0c1cf083595adceb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "dc84f03e90ca309805c85f45f8e3a54c92e80237980b488abcac0eee1083237a51f30847b84adc3b6051b6d9c9075799c295996d5a912b7ebfb290911006b8c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/id/firefox-49.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "e3d9e20347ffdce67d5bf5c720c93330b6a19e9733eab79f07820b50cc4ccd39a7f0736b0355f15e5bd59a8de24a0e9105bedb9d8da1cef125ea88cd1e6865c0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "5b4966046dae0bb27a9fde5850fe291820b19c5e41fef4f010faa4d2d040ffcccb487d7f7647d0286e8e4e7fd27b50a12047d6fc95dc70dc34e7e1da4bce6b37"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/is/firefox-49.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "7b30d841c840af2c9b55173ac31ce5880a8b01daefd7871a4519107d276660af072c097479ae92b5b83379cd36a7c68ecf2d781d16b75d5eb38648aef6d89288"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "920e34f7db5452fad20303296b49f7d3dc7bc780735ef881c4c2cb42f2393d3be319adacbda74cfa965283681a01260dbe2298244fba5e541b807f7faffdf285"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/it/firefox-49.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "3af89ab3f92d771fa82c58fc5ebdaa9ad11d7f89b57357e98ecadcd57bcadfe66101d09b187daec1c64dff808172eac5a608239be6c991e2a725ea9421e4b8e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "e0239291135a98bce718d86831a0aaf3486c0e1ff54c98e65e970d1824786624e76ae73572b85f009b413bbe8c61aff41972629819812eb36918d4f2e864a274"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ja/firefox-49.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "998635a41eb45b8329f70837d0096cc69c6c7983ec48a208185fb0f3ee56c607c68178ac6f8c02de34c62e5c7ab38c1829b445dfed80f7794b7ef4fcd9ddc4aa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "aee3c991acefbf1e257882bbd34eaee45415eecfb3fee2fa47a1d70cc5b6780b0894165a4c25609d595e4759d56ff0767b42f5b1d9174b4c1daa3e967871b66d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kk/firefox-49.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "e2170378be3b442bd97066d740d458e82d282cbcdcac555d425d16082ca22c766832a8602071135cf9802eb97b0c6f7f414fe076ddb976d84a4ddb1f1ea23bcc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "71e8ebcec8758c4fcd6056530b26c2fed1512f36746d431660eb603838c22e7c9c86a560ba36bd18e3df783531e608c67daceb50ea1758671c489ce91e214690"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/km/firefox-49.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ed54aa4da9b6b2692c7d275d11ea53a85bd4ad131ecd644ec37acd3efbd51a25358c6b5720227e5cffb291d018c0890d46d09b61d3782e8000012893da10d144"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "678f4cfff160cfc6fd4f8e478f64ace3658c84672153c501f817a1456d7f7721d891d0186dfffa32e12bbbb46421e08e46753dc01021d3361b2e863176b32288"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/kn/firefox-49.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "ec945284725364eff8e57d2f2e8bee7d35d8c217423b21d97328c8c5c2d43575c2af30fc93c8e128131c72ca7b2ea7420b88b21ded184a6b5e242fc76731e25a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "07839edad66284da56ec54366fef1ef0d1a55b6e7f7d215d9f52827e080d070c07be4948df13d3b082bb5962e00d503b4916937bcf5045d9e3f9896e7c8698d1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ko/firefox-49.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "6183cd77dfef7ed41e2049f3b423942eedcc2d5a49f820226c1fa366cbb75f63954b26c7797da42a11ec63f19bfc5bf19ebe605ac0d501391f64f5f168e157a5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "3e78f5ada0a37d181e4a7b5ef90ad39fcc0216783e6ef26de826c642f1aaea59cb968636b0249af9ff92b0ef32fdde051c2d6a71d4aa2e6ac35aecc062f8e222"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lij/firefox-49.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "b8e8f635e927beaa0a12e92e025deaa2e98cf2d19dacca5ae91c21fe6c41177c8670b46b1a896f1b8b80fc60d806f1642bf787c44058077c4225a6de8902e664"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "e71759b4088ab845c193271e0c48c319401362c8d2f0def8342807a972f70db6963ea405c93fb8832cae1f930503a3a54458de230d17d53cc376946782cb6e3f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lt/firefox-49.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "616a104d2ef421c162e6688d4128995faddac35f95327fccb313e20e56c410558f39869041900ac246d2cdbf510552bdc8a006623d8c6bbbf5350b6d7bd94899"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "2c413f2194c147fa4c3e21a9bdf67157fa7ea51dc7129dd8cb34e3b645600561ad9e9ebf3608cd75fc17e7d7b95cec49bb746d48c0b55fb4ea7b9ba7a359cfee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/lv/firefox-49.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "2743486ad0860c500a6a9146a49ec6190867706a74350310ed2987b71c5503886ba2931ba066f373fd05342198f6e8bf2a491cbb4a85c0763f1a68c1a124f796"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "7e5bbede973200faf58753d0de6041298f8d31937e19b9353bb83043229c8634cafc2e79129e9a8b34d1b4be451b6d3ad77e3ceb21ce8bf1a35f386ecdd64d09"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mai/firefox-49.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "8e51758b070bbde4d7bb4cd8aee148c1e8fef2d5bf236a4801b58e8acdfa567b6df5d32c3d46ddf965a599ba79c95b0884210bc3166fb8e9408e5255fcfaf5c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "3d945094b78f360045cfe6e1ffd53ac15a070b61adafec3063a88dd7f6ad4972fa5d4cc0398aa9bf30494be4326b63c8d8340ebd25d15c231c39d9a8b9c18da4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mk/firefox-49.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "d2e8537a64747c06b2fe05b080c0eb0af82e1f4427a396c90006d012b663c1d34273307af4995b6ff8e75de4e3727cc3f736c7a9a78e0042f2f8d018ce525582"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "561b7a1d3f308552ba8b2084c86d6318b901fe8a7fff3254b65b790e4909dffb355eaaa898ee352310b8633fc695c6d7feb1d13ab60bf491a0668dbb05297b7a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ml/firefox-49.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "6970448bfda2c54605d052570fa3ac81cfd554611c994125247ff4927807938a80fa65405ddc14a295a38bae9a1d9fcf460b32e5ba0cdff5cc690b57cb4a8d87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "43b9022cd14ca829cc1f8546a9e13767e6f32daa3b008b6864a8cae3a8e6f99e70df0a05fdaa724e92fad38aabc5ffdbc9685795a0cbf1c914fbe3b515e80c99"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/mr/firefox-49.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "16e029ba38ba9a88d57a72d7bb3ac843916f2e15b4a288815f59109cad9bb1c70beb0716360df4977231fe91f18ba3490168a857ce94c04d85a1aa5927372571"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "f418c661961f6c2e6fae0a1cd5329c35b331fa64bf9aa6d186f59d7b778d5b3fd7d6d548f69ba86f5b031bade68ec118aecc4aefc9a90ebc219945ce907f31be"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ms/firefox-49.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "05630d2f74ea7f70e9dd97284b41c4d4da2d325884696f58b1f88b3e29c4d5bcfa1ba7cc5f3aa412c852ac61f406fec29e0d3fea7820759d87f022811e6c5b0f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "81127ce66c7f7da82e6059abaf002b79225bea3e69558636d5aaccba0c9df97adcc8c041b9239ec8763e28040807151b2ea01c795f4df088b896b774ea2e6162"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nb-NO/firefox-49.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "e6c13dcdef6935921f74beaad25ceb8394a1256bc3ac6a1d76f3957f067d0bf1572d1a7b8ea2da6ffeb0eff8a4b2a1d80215f5169dce3c701fcc40dece34bd3e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "b97db2d48eb98be9228358a0a068ea93d21ce4a5f6d138d079461c0a7f93d3a726d141adb43f41a56e658f629366eebb7ed4a0a1594a9d265ef121faabb14d52"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nl/firefox-49.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "acd10d50291fd833a574d049d99a567383dbb4483ecc45583dd977c3c67fabb9d450c802b8e2eb3d4eabc719f68f0db4e2a102bd716a4bf50aa02724da382f58"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "a07fb8c7ee065b0b7a4a3fa33e8dad026b65e42920398e6fdbf186985e46c6c55b72ecff087aace1559df286b7832a6de8215b713274234242531d7807d90180"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/nn-NO/firefox-49.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "37d17e905e92aa51d82f13e33415738cf8a5952617bec6a6e095147efca81b7196f997b47167abdd7a8d041c3308307c587a29ca3ec9f2e65e71d15b68b8bbda"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "85ec647821f82cc3ad99142e8e4425a00b6e0b273f137cdbff10c4e91afbdf4eb9feb7d4a2c9f80191cec918180aab0a84f96b7de1efda1fe0cdf9e1c44446eb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/or/firefox-49.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "8819b00e2fdc06fb17873c769f7c8461fa131bcb12f0fd191a08a3a6526571fe40caa7cd8f7ef8e0d8722bae84699a479105cf518897c76aee674ea8a2dddc2f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "70f7cdc912a6d1c5360b58ce522386ed9562aee8dffbf4a1f653871114359880df3f98629a2d4fe5556a1ba89fc5ec90a2c3da2d56ccf419f3956dfad157a3f9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pa-IN/firefox-49.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "9b60f41e9fd92c1d22dbfa1d287081d9514e081940dd9cbe1c9b4467926d83cec9ff43caf854710ec59d805293a83ea5defab887be5a93c8eedfa959b74ba783"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "80372feb8348b48627a93c5f2a5486933fe731a3fdfa2da6d71a7c75b35f585cd5b2cfa0760bb17de8fb98be1ef3dd90339a635ce25749bd27d147b316847084"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pl/firefox-49.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "445b104cd539f088a5cecbad4a1a861096542d1a4f2c95696ec51d43d08f10fc71513cceb5a68fa179fd988abaedb20829742f108f529face6e8e442576abb54"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "0788d7f599c3f46dfe485ed1ded013a7d87db6aec63193887f5e6b8c3636e0b117f4b854c5b0f60ee8b9683e6d46390f365a19e499fabc2a78ac29380dd26b35"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-BR/firefox-49.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ced012e0d447aae654edde3b26422f895440d8aa0822f3a14450142f6d97c20e74d1ec068bf2cde4a81270a77ef01a23646532e55ada6dc41603b013945986cf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "d27ad4e240ee032cf16ecdc5588d3bdfcc81d338ef357c96194bc33d5d0d571c3826d298215b9cf058dec1cdb86d2bb41d5739ee4f49292bcc290ea4d50d2ca7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/pt-PT/firefox-49.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "e80d1df4ea210d5a3731803026c3fca5143ade3e7f994a7a7bd673a6ba8b7df8eff9784e9bfe6d3360caf5c50609835ffaab631ecb5aafe71dde8adafa91db04"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "75f10944c6ab83ca1ca49d2bc05e8923830b1fa236620ceba9cbe2f874713cd49a6f0ea4968ce3ad08a5196746dbe3c48a3b51eb0f6d8d310715c6636d17d1f1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/rm/firefox-49.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "35df8ad315c60342119605cbad7fc1614002750ba6745d35d25653eaad6eedd7b039271b2900f712ec5a1c03425a902f5009e76b8c42bb074d5f64d6f6ea7477"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8c31aa2df6cf1e1006691152e74aaf4b580a3b15d141444eab1cd4f3adc1066e7ac9c8196c8cd87902d590cf605bdf449d71fcb34b132a9221b101e0c16efe8d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ro/firefox-49.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "ff6d5a5bc127841a1e92eb6bc22d157a57d7f48e4bc95b68907fee50683b20a0dcfd9e5a567f013a6c72311b9441231e986c7659fa60b894ea34d265786a857e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "e8e7a794a3dde3b9fbe82c367d44134979cc45ad115fbc82bc8b9c8c438a857abe2e4962f50fa69ac7c22772ba3eb21c464bb800bef9eee9f2b33636f43261d2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ru/firefox-49.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "c653182b26d643d32e0983cf546fe8f0e5a96b7f174c52e8a9025fc56f17ce6ae12b1362abe9b408cb9970b15fcacad1747b41be86bd2475a3e3c45665f88355"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "4e4ab25fc8048b4bd9129a554b465ced3ff773d9a7eed9715c71ab92852573712c58667971a1dec556917603c493872577b003168821350ceaa3dc3dd9e2211c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/si/firefox-49.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "a8a9dad2f7563b686012a002b8fedac3b0a68f73986db717b901e832c57d1e4b2304b47aabcc17f5e453de3467caf8aabf9635e6db7772ef340fa38fed29eb0d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "2e2f936448e58f8b3b46119e06b2ab5f1c181536939127de0a76931ac992f28ea307227d5c61aa8b440907aefaeb95cdf81f9d0184c78234f82f6d965c045c98"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sk/firefox-49.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "14d5960a06fb7135bbe78ea7123a7c151c4494898ad6ea1a5386f0532f0a5ec35ef58e3fcb82381afdf47ca1c0e6954d0903232d1ee06d9c2a606e706d22e82e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "04f2f408835a9bdddd4a4c256d9a0040171760f5bce1b7d5e9c3a4ce2c74682c4016ee93f8da193280c7fd3d47ef839d67e0c480d5abd8c2235e61b9c039453d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sl/firefox-49.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "631c9305f259aab364c71550ad14a0cfc6edc24a43eac08345e4331cfd4192faf710f077f5b2a5fad169b15098725c996587b96261dc18b96bc18f2a63c62e34"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "b8605cc6851440a615cb8a29d6baadb90fc783270253c25992299b1ced630094c891d41a49a9802e47aa2f9e1656875825dabb31450d7765658e5fd4f3815b10"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/son/firefox-49.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "c17946e4d664eefbeed3a3e3430b4c5b9ffcb69628344568b354092fb72142e7da107b1a88d1af89caa7ae63a0cb76814662fdffc9e179213df4e10a3290596b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "ecab80a09b8c2eb75f38c14c169ee88f78266973d21da9295d5cdbeb329a43e3978feca7bada4ee049b24cb914dcd2a4ebaa95f42ed6966cf614c55a229862a2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sq/firefox-49.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5931bc9ddb86a39fd0edda4cbedfa6838549201efb882eb9a3c25ea88031fe4aed971ef327d6c356c99a0610a19e99a6ec49e755888b00882c6039f2c0e4cfc5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "57895b4d8a0319d25288661b145d0aa59afbbd36edd8fbdf777d95f48fffa53d3dea546f465ce2070b801bcf751b03182711e5f74ca01f72258427fd37b2f038"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sr/firefox-49.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "67d96d069f43312a4c5870c2a9715e9aa5e7592b12302a773c8d6fd9f9979e63a5053d54f326d66374f216d1e69203fafef436be6b015269513f8f4a289aa796"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "f7b1ddace365492563a3eb985067e0c19270725a8db571b626000593b7e89130345b61199d50d41daadd499ecc6858fcb46115dac455cc62ed21460b916eaf41"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/sv-SE/firefox-49.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "7ac9fbd7b3175d82e73fe176481c3611eaf313fd006cf1191b79860f215af8847af88299fcf673d9e9a52db4a68a4ea4e95b632729c7b221f38e35926d60bc93"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "05a83591aaf1d5fc15b9a0445e2d5a20798329b3842992ccd82d22e4c788bbd34cdb46b09b48cf044369742f2b6244857e7d00b68160d094fe01465b746e0493"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/ta/firefox-49.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "ec3cc0ae6d3765e9942436fadcb6208672a745df670a9e5881d243812b86023e8181f5b1b6d3ad3a2dbf8b93e80e3c8b2eee4622b511566b3ca7902b454d698c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ab9a5d17a70bd8685370898ad86ca867bb9a919169ef4c8ee6dae07836f4dfa58d3dead4565462b6f12d3c39c16b50ef99919f850928de0527c55563edac66ed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/te/firefox-49.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "e3d216ee3ab627f7f86ef192f63a63f1e20bbc22df4947f53e3d9f8902e3871b7fb797eb409f0cf966be4da5b1ae05461c0b0dab7788a6c87069f940e1cc5498"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "4df9b93ba7bb70fa0c7c3c4e9a88cbfd8197c6bf628d2107a2a57105307a50cb08d8fc114e456b125164668c6f48aef1f0e4b71b52eb045e6b8be792e8b8e38b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/th/firefox-49.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "51ed80166e1224db790dbdffc60d0eda618eaf67f473fb60ff0bb6a6f15d45fa8d44a31c6d4bc747752dac8fc3075371b4798040afaa594b713c331a91633724"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "7db1ec390a2d4f120eff21fbaee7700d106c4fd5c1ee1216bba0c7f896e6708bbc1da4c0f1f3ef1dd6f830ed58256fce36616950df9eae3307d2bffba6c3147f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/tr/firefox-49.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "7f1295dbb8c66e22dd818e9fcc910957328dee42ffed8ad3f987b1959bf6f1c01f8f94657dcf0c2593ff747308c6fccf14fa3716fb4b189fb03b77332300823a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "81b1d6cd6e5666307ea592992084f7289a5eed5a732070fd65532722f6a345cb78de868e15f3e74dc15d97cfb57f346b7e36559c5f40769391f6616c897b218c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uk/firefox-49.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "752a9aaafe23559f2cb15e6652012803eeca5e3b584dd5515fc496d62671090272b7154f1e5f701a2cc6f848b5d2a1050966c1b9cccfab7cd16fe88d66a101c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "44b6ea23bd56ad74892f00f1abd3aaf1d0e8d748814b509f791dc0ac4d303c61cb3f5d9988c07028e9dfe88ef8130fb300c131b96fa1f1b5fb4693c8a2dc0c4f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/uz/firefox-49.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "94a7da589c758fc5766ade665f15af4704aae4e0729fe0a92235804c42a280bdedc3b0d2d23f153243765fb803d05023c1f4900367fcbf1b60ec5a9449f99226"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "e1674665330ce86c9ce6379e81f71ce7e1dd58f1dcf7ce4141a681e1135262565021c0885e884065b5f3637884ef25f7611c7ababa614e0f3e561051925fb168"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/vi/firefox-49.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "74da3a781ceb5937e42f3aa8b6f2aa3481d439e67ab16e1745a9248efe96129c6962583276e06e417b7930ac65d4681f6362eef4cb916a5943f50b7ef98aa4a3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "052c729f9a90bb02e60dc5d0639fb9639669aba511fbfb5cb727500892e58519f3b6231144741a163622a5bcbe855d38b530780350c5caf33d43d297769b0aa0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/xh/firefox-49.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b0c436603ed7ab7004e84f2e0654f04c5e5f3fb7866faa7548e675e8246adb2a60528d476292be99206a3e1b6342ced48d80031c8caba11f01a1534ae17901fa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "c591789133b5c73026d1f5131581f91c21d8c6ea402dfcfb80ff1dd5e07f7985274ef8682fc7a576421b05721df9533a14bb34ba95193178e62b6e195fae0ae6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-CN/firefox-49.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "762eec0143e00d41d909f865dfef006a460a5b046b75f1132b63d76dff6380d40284a04b07415785f0bbadc457cf66f3aed1bf47e34cf5d5909fb6f8fddf58ec"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-i686/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "b7eacd7854170626e9135d2bd5360b9d2073afc64ecc9f963de8b03ea550a0f6d2c4bae48268d2f9d0c09e7747dcbf8d06eaff4951cbf5953c237a8461b163df"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0b1/linux-x86_64/zh-TW/firefox-49.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "78968866d80798b3360d3860db039b4f5ab4d62618be681188799efa675ed83b84b4b266dee84ff26d27afdbb8a08f3a3bf73f3bc85289473e7e7836e4a92cab"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 865af0a5abf..e1e603b28fd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation { nss pango libheimdal + libpulseaudio libpulseaudio.dev systemd ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ From c7281d14f7f247e3638b60c02f2a853d1005852f Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 4 Jun 2016 13:24:11 +0100 Subject: [PATCH 059/168] clang-3.5: fix build Make Obj public in llvm's IntrusiveRefCntPtr This fixes NixOs/nixpkgs#15974 It's not a nice fix, as it's really clang's problem. The proper fix should modify clang's usage of IntrusiveRefCntPtr. --- pkgs/development/compilers/llvm/3.5/clang.nix | 1 - .../compilers/llvm/3.5/fix-15974.patch | 15 +++++++++++++++ pkgs/development/compilers/llvm/3.5/llvm.nix | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/llvm/3.5/fix-15974.patch diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index d3ce8a4f9ff..42ca4ba70e4 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -50,6 +50,5 @@ in stdenv.mkDerivation { homepage = http://llvm.org/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; - broken = true; }; } diff --git a/pkgs/development/compilers/llvm/3.5/fix-15974.patch b/pkgs/development/compilers/llvm/3.5/fix-15974.patch new file mode 100644 index 00000000000..446004cd998 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.5/fix-15974.patch @@ -0,0 +1,15 @@ +diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h +index f9df378..9d860ec 100644 +--- a/include/llvm/ADT/IntrusiveRefCntPtr.h ++++ b/include/llvm/ADT/IntrusiveRefCntPtr.h +@@ -134,9 +134,9 @@ public: + //===----------------------------------------------------------------------===// + template + class IntrusiveRefCntPtr { ++ public: + T* Obj; + +- public: + typedef T element_type; + + explicit IntrusiveRefCntPtr() : Obj(nullptr) {} diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 64df30dc23f..4f54f1438a7 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -53,6 +53,8 @@ in stdenv.mkDerivation rec { "-DCAN_TARGET_i386=false" ]; + patches = [ ./fix-15974.patch ]; + postBuild = '' rm -fR $out @@ -75,3 +77,4 @@ in stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } + From 37528197a3dce97e0d4537c7976dc76a521adaf9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Aug 2016 20:02:25 +0200 Subject: [PATCH 060/168] libpsl: 0.13.0 -> 0.14.0 --- pkgs/development/libraries/libpsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 2dce91bc014..e4cb2e61eeb 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -11,14 +11,14 @@ let owner = "publicsuffix"; }; - libVersion = "0.13.0"; + libVersion = "0.14.0"; in stdenv.mkDerivation rec { name = "libpsl-${version}"; version = "${libVersion}-list-${listVersion}"; src = fetchFromGitHub { - sha256 = "12inl984r2qks51wyrzgll83y7k79q2lbhyc545dpk19qnfvp7gz"; + sha256 = "1nqawm41rxaxddrqnwhxw1cgcpf74q6jw756sh0x8zbsjc73mbfq"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h - patchShebangs src/make_dafsa.py + patchShebangs src/psl-make-dafsa ''; preAutoreconf = '' From e696c48333a907d1c04e6859c54e3d1d038eb317 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Aug 2016 20:05:40 +0200 Subject: [PATCH 061/168] gandi-cli: 0.18 -> 0.19 --- pkgs/tools/networking/gandi-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index 2f95123ba21..c2bf6702c5f 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -5,10 +5,10 @@ with pythonPackages; buildPythonPackage rec { namePrefix = ""; name = "gandi-cli-${version}"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { - sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3"; + sha256 = "0xbf97p75zl6sjxqcgmaa4p5rax2h6ixn8srwdr4rsx2zz9dpwgp"; rev = version; repo = "gandi.cli"; owner = "Gandi"; From d6c55c16f6f2305a853c94239bf8b1162fd36556 Mon Sep 17 00:00:00 2001 From: "Scott R. Parish" Date: Wed, 3 Aug 2016 09:54:19 -0700 Subject: [PATCH 062/168] nixos-container: replace 'kill' command with 'terminate' My earlier commit to have `nixos-container destroy` use `kill` broke the `container-imperative` test, see[1]. As suggested by @aszlig, `machinectl terminate` doesn't have that problem, and is the command that should have been used to begin with rather then `kill`. 1| https://github.com/NixOS/nixpkgs/commit/60c6c7bc9a0d564cf86af4b1711b33db48cf0d07#commitcomment-18478032 --- .../nixos-container/nixos-container.pl | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index a4b6f11654e..01ce00e8cb7 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -22,7 +22,7 @@ Usage: nixos-container list nixos-container destroy nixos-container start nixos-container stop - nixos-container kill [--signal ] + nixos-container terminate nixos-container status nixos-container update [--config ] nixos-container login @@ -189,12 +189,9 @@ sub isContainerRunning { return $status =~ /ActiveState=active/; } -sub killContainer { - my @args = (); - push(@args, ("--signal", $signal)) if ($signal ne ""); - - system("machinectl", "kill", $containerName, @args) == 0 - or die "$0: failed to kill container\n"; +sub terminateContainer { + system("machinectl", "terminate", $containerName) == 0 + or die "$0: failed to terminate container\n"; } sub stopContainer { @@ -239,8 +236,7 @@ if ($action eq "destroy") { die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n" unless POSIX::access($confFile, &POSIX::W_OK); - $signal = "SIGKILL"; - killContainer if (isContainerRunning); + terminateContainer if (isContainerRunning); safeRemoveTree($profileDir) if -e $profileDir; safeRemoveTree($gcRootsDir) if -e $gcRootsDir; @@ -257,8 +253,8 @@ elsif ($action eq "stop") { stopContainer; } -elsif ($action eq "kill") { - killContainer; +elsif ($action eq "terminate") { + terminateContainer; } elsif ($action eq "status") { From c0620282d3bb23ba99bbf650f0d33c404cc85266 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Aug 2016 20:21:20 +0200 Subject: [PATCH 063/168] zstd: 0.7.3 -> 0.7.5 --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 0488fec4591..7f2d3116603 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { - sha256 = "1kdz1mk2lgf46dc7afjzdyzpdxng2cwirhpm1wsj8dy929hi3687"; + sha256 = "07b4gmmkk2b28vmmhcg8h2imzccav1qklgvbdg2k6nl9p88zwzkd"; rev = "v${version}"; repo = "zstd"; owner = "Cyan4973"; From 594256c3a8bc39d08d497910206652c3848cdca9 Mon Sep 17 00:00:00 2001 From: "Hector A. Escobedo" Date: Mon, 1 Aug 2016 15:17:54 -0400 Subject: [PATCH 064/168] purple-matrix: init at 2016-07-11 --- .../pidgin-plugins/purple-matrix/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix new file mode 100644 index 00000000000..2bf67f44c94 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, pkgconfig, pidgin, json_glib, glib, http-parser } : + +let + version = "2016-07-11"; +in +stdenv.mkDerivation rec { + name = "purple-matrix-unstable-${version}"; + + src = fetchgit { + url = "https://github.com/matrix-org/purple-matrix"; + rev = "f9d36198a57de1cd1740a3ae11c2ad59b03b724a"; + sha256 = "1mmyvc70gslniphmcpk8sfl6ylik6dnprqghx4n47gsj1sb1cy00"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin json_glib glib http-parser ]; + + installPhase = '' + install -Dm755 -t $out/lib/pidgin/ libmatrix.so + for size in 16 22 48; do + install -TDm644 matrix-"$size"px.png $out/pixmaps/pidgin/protocols/$size/matrix.png + done + ''; + + meta = { + homepage = https://github.com/matrix-org/purple-matrix; + description = "Matrix support for Pidgin / libpurple"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe403c387cf..5ab6296fb42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14277,6 +14277,8 @@ in purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; + purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; + purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; From 8a0834c33519139542d7b08be26c3b74ff6fa744 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 3 Aug 2016 14:07:50 +0200 Subject: [PATCH 065/168] mupdf: 1.9 -> 1.9a, add patch to fix CVE-2016-6525 --- pkgs/applications/misc/mupdf/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index fb475f047b4..1724b0d612f 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -3,17 +3,26 @@ , libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }: stdenv.mkDerivation rec { - version = "1.9"; + version = "1.9a"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "15p2k1n3afc7bnqrc0zfqz31fjfq3rrrrj4fwwy5az26d11ynxhp"; + sha256 = "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0"; }; + patches = [ + # http://www.openwall.com/lists/oss-security/2016/08/03/2 + (fetchpatch { + name = "mupdf-fix-CVE-2016-6525.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958"; + sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7"; + }) + ]; + NIX_CFLAGS_COMPILE= [ "-fPIC" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib freetype libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama]; + buildInputs = [ zlib freetype libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama ]; installPhase = '' make install prefix=$out From d94ec6ce1480d5e38f487888ceaed78eceb605e0 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Wed, 3 Aug 2016 22:35:44 +0200 Subject: [PATCH 066/168] git-lfs: 2016-06-7 -> 1.3.1 --- pkgs/applications/version-management/git-lfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 52075be8484..c33ffb5cefb 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -3,8 +3,8 @@ buildGoPackage rec { name = "git-lfs-${version}"; # NOTE: use versions after 1.2.1 - version = "2016-06-07"; - rev = "12fe249f2eebb56608a825fdb4a68c00f090bc91"; + version = "1.3.1"; + rev = "9c9dffb1b5baddfa06f280ef1b5fbf68ecbc90b1"; goPackagePath = "github.com/github/git-lfs"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "github"; repo = "git-lfs"; - sha256 = "0cj7xbgvj706r1cyxqlcwfvy5zg2d19al04d441sxa6spr6xa4v6"; + sha256 = "0fg48jxh0gmd0w5yy3avascaasxk85019qayaikzfkym8bdqplb2"; }; # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' From 3b0364cf36357603dacafa0dd019eb1da88fba06 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Aug 2016 21:35:08 +0200 Subject: [PATCH 067/168] snapper: 0.2.8 -> 0.3.3 --- pkgs/tools/misc/snapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 933788f5785..faf79c29e77 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "snapper-${version}"; - version = "0.2.8"; + version = "0.3.3"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j"; + sha256 = "12c2ygaanr4gny4ixnly4vpi0kv7snbg3khr3i5zwridhmdzz9hm"; }; nativeBuildInputs = [ From 80cae1f05513d164a0295bb18f0bb1228ab0ab3d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Aug 2016 21:38:15 +0200 Subject: [PATCH 068/168] dpkg: 1.18.9 -> 1.18.10 --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 15ec4e87908..a7bda2578ae 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.9"; + version = "1.18.10"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "14r011vpzcfsglzl2dr2ywrdxl9r2jhs0iy9nswmxrz92zwlmb46"; + sha256 = "1ibdidmc8nfiigadfpl3xrccrxw6hvmqiqqizy1v265s87d28m82"; }; postPatch = '' From 0e003d39bc241de621aac35ab3539e0136c2dd11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Aug 2016 21:54:38 +0200 Subject: [PATCH 069/168] borgbackup: 1.0.5 -> 1.0.6 --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index f4af6e5682c..09683ce4b8f 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.0.5"; + version = "1.0.6"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "0xr7w57pb3z8vyn4jrwb61g9hkgfabikxv3lbwk0a94n8rwbxkx5"; + sha256 = "1dxn9p4xm0zd32xzzd9hs4a542db34clykrrnnv3hrdnc394895p"; }; nativeBuildInputs = with python3Packages; [ From 8cb6821679822b0debd84477a047dd1e3d437a5f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Aug 2016 00:09:28 +0200 Subject: [PATCH 070/168] aha: 0.4.8 -> 0.4.9 --- pkgs/tools/text/aha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 7eb1c022a95..b83f97a4b8d 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { - sha256 = "1209rda6kc9x88b47y1035zs9lxk0x3qzsb87f8m5b55fdkgxqlj"; + sha256 = "0g7awnh7z4cj3kkmldg6kl8dsvdvs46vbf273crmpswk0r4hzj80"; rev = version; repo = "aha"; owner = "theZiz"; From 345f58a4b90446984f7b2da8851eed479dada290 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Aug 2016 00:16:53 +0200 Subject: [PATCH 071/168] fmit: 1.0.15 -> 1.1.8 --- pkgs/applications/audio/fmit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index db17ca8553c..9df6abf1697 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -11,10 +11,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fmit-${version}"; - version = "1.0.15"; + version = "1.1.8"; src = fetchFromGitHub { - sha256 = "0bakqwgl7xx6khs8993w10a8kvlbr7sbqdaljbsmy8y8mjd6inqb"; + sha256 = "14vx4p1h3c6frvv8dam4ymz588zpycmg17pxfkmx4m7pszhlin6b"; rev = "v${version}"; repo = "fmit"; owner = "gillesdegottex"; From 06966f4955cb1158a7140cc4506681b4dc03b29d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Aug 2016 00:24:53 +0200 Subject: [PATCH 072/168] icmake: 8.01.00 -> 9.00.00 --- pkgs/development/tools/build-managers/icmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 8fd519073cc..03968d15b12 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "8.01.00"; + version = "9.00.00"; src = fetchFromGitHub { - sha256 = "1vgjywbc4w1agkakfndr2qf0z0ncxisihdv8sz9ipry9f170np39"; + sha256 = "028rxx4ygy0z48m30m5pdach7kcp41swchhs8i15wag1mppllcy2"; rev = version; repo = "icmake"; owner = "fbb-git"; From 6e1f80eb9ddf806e40f659e57db061eb2aac7aa8 Mon Sep 17 00:00:00 2001 From: Al Zohali Date: Thu, 4 Aug 2016 02:47:42 +0400 Subject: [PATCH 073/168] networkmanager_l2tp: fixup (#17490) --- pkgs/tools/networking/network-manager/l2tp.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index af3b193798f..5e09bb7229f 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig -, networkmanager, networkmanagerapplet, ppp, xl2tpd, strongswan, libsecret -, withGnome ? true, gnome3 }: +, networkmanager, ppp, xl2tpd, strongswan, libsecret +, withGnome ? true, gnome3, networkmanagerapplet }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2"; }; - buildInputs = [ networkmanager ppp networkmanagerapplet libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; + buildInputs = [ networkmanager ppp libsecret ] + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring networkmanagerapplet ]; nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ]; From d33540734ffd5da87fc01fdc959463b77fc267bf Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Wed, 3 Aug 2016 06:44:15 -0700 Subject: [PATCH 074/168] factorio: rudimentary mod support for factorio's nixos module --- nixos/modules/services/games/factorio.nix | 48 +++++++++++++++++----- pkgs/games/factorio/default.nix | 26 ++++++++++-- pkgs/games/factorio/utils.nix | 49 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 111 insertions(+), 14 deletions(-) create mode 100644 pkgs/games/factorio/utils.nix diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 90834c5b260..0369752997a 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -4,14 +4,17 @@ with lib; let cfg = config.services.factorio; + factorio = pkgs.factorio-headless; name = "Factorio"; stateDir = "/var/lib/factorio"; + mkSavePath = name: "${stateDir}/saves/${name}.zip"; configFile = pkgs.writeText "factorio.conf" '' use-system-read-write-data-directories=true [path] - read-data=${pkgs.factorio-headless}/share/factorio/data + read-data=${factorio}/share/factorio/data write-data=${stateDir} ''; + modDir = pkgs.factorio-mkModDirDrv cfg.mods; in { options = { @@ -32,7 +35,8 @@ in description = '' The name of the savegame that will be used by the server. - When not present in ${stateDir}/saves, it will be generated before starting the service. + When not present in ${stateDir}/saves, a new map with default + settings will be generated before starting the service. ''; }; # TODO Add more individual settings as nixos-options? @@ -51,6 +55,26 @@ in customizations. ''; }; + mods = mkOption { + type = types.listOf types.package; + default = []; + description = '' + Mods the server should install and activate. + + The derivations in this list must "build" the mod by simply copying + the .zip, named correctly, into the output directory. Eventually, + there will be a way to pull in the most up-to-date list of + derivations via nixos-channel. Until then, this is for experts only. + ''; + }; + autosave-interval = mkOption { + type = types.nullOr types.int; + default = null; + example = 2; + description = '' + The time, in minutes, between autosaves. + ''; + }; }; }; @@ -74,12 +98,14 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - preStart = '' - test -e ${stateDir}/saves/${cfg.saveName}.zip || \ - ${pkgs.factorio-headless}/bin/factorio \ - --config=${cfg.configFile} \ - --create=${stateDir}/saves/${cfg.saveName}.zip - ''; + preStart = toString [ + "test -e ${stateDir}/saves/${cfg.saveName}.zip" + "||" + "${factorio}/bin/factorio" + "--config=${cfg.configFile}" + "--create=${mkSavePath cfg.saveName}" + (optionalString (cfg.mods != []) "--mod-directory=${modDir}") + ]; serviceConfig = { User = "factorio"; @@ -90,10 +116,12 @@ in PrivateTmp = true; UMask = "0007"; ExecStart = toString [ - "${pkgs.factorio-headless}/bin/factorio" + "${factorio}/bin/factorio" "--config=${cfg.configFile}" "--port=${toString cfg.port}" - "--start-server=${stateDir}/saves/${cfg.saveName}.zip" + "--start-server=${mkSavePath cfg.saveName}" + (optionalString (cfg.mods != []) "--mod-directory=${modDir}") + (optionalString (cfg.autosave-interval != null) "--autosave-interval ${toString cfg.autosave-interval}") ]; }; }; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index ace8dc658f2..bb6cffdb122 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,6 +1,8 @@ { stdenv, callPackage, fetchurl, makeWrapper , alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu +, factorio-utils , releaseType +, mods ? [] , username ? "" , password ? "" }: @@ -54,14 +56,16 @@ let fi ''; + modDir = factorio-utils.mkModDirDrv mods; + base = { name = "factorio-${releaseType}-${version}"; src = fetch.${arch.inTar}.${releaseType}; + preferLocalBuild = true; dontBuild = true; - # TODO detangle headless/normal mode wrapping, libs, etc. test all urls 32/64/headless/gfx installPhase = '' mkdir -p $out/{bin,share/factorio} cp -a data $out/share/factorio @@ -71,8 +75,6 @@ let $out/bin/factorio ''; - preferLocalBuild = true; - meta = { description = "A game in which you build and maintain factories"; longDescription = '' @@ -112,7 +114,23 @@ let wrapProgram $out/bin/factorio \ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \ --run "$out/share/factorio/update-config.sh" \ - --add-flags "-c \$HOME/.factorio/config.cfg" + --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}" + + # TODO Currently, every time a mod is changed/added/removed using the + # modlist, a new derivation will take up the entire footprint of the + # client. The only way to avoid this is to remove the mods arg from the + # package function. The modsDir derivation will have to be built + # separately and have the user specify it in the .factorio config or + # right along side it using a symlink into the store I think i will + # just remove mods for the client derivation entirely. this is much + # cleaner and more useful for headless mode. + + # TODO: trying to toggle off a mod will result in read-only-fs-error. + # not much we can do about that except warn the user somewhere. In + # fact, no exit will be clean, since this error will happen on close + # regardless. just prints an ugly stacktrace but seems to be otherwise + # harmless, unless maybe the user forgets and tries to use the mod + # manager. install -m0644 <(cat << EOF ${configBaseCfg} diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix new file mode 100644 index 00000000000..563ece6cb9c --- /dev/null +++ b/pkgs/games/factorio/utils.nix @@ -0,0 +1,49 @@ +# This file provides a top-level function that will be used by both nixpkgs and nixos +# to generate mod directories for use at runtime by factorio. +{ stdenv }: +with stdenv.lib; +{ + mkModDirDrv = mods: # a list of mod derivations + let + recursiveDeps = modDrv: [modDrv] ++ optionals (modDrv.deps == []) (map recursiveDeps modDrv.deps); + modDrvs = unique (flatten (map recursiveDeps mods)); + in + stdenv.mkDerivation { + name = "factorio-mod-directory"; + + preferLocalBuild = true; + buildCommand = '' + mkdir -p $out + for modDrv in ${toString modDrvs}; do + # NB: there will only ever be a single zip file in each mod derivation's output dir + ln -s $modDrv/*.zip $out + done + ''; + }; + + modDrv = { allRecommendedMods, allOptionalMods }: + { src + , name ? null + , deps ? [] + , optionalDeps ? [] + , recommendedDeps ? [] + }: stdenv.mkDerivation { + + inherit src; + + # Use the name of the zip, but endstrip ".zip" and possibly the querystring that gets left in by fetchurl + name = replaceStrings ["_"] ["-"] (if name != null then name else removeSuffix ".zip" (head (splitString "?" src.name))); + + deps = deps ++ optionals allOptionalMods optionalDeps + ++ optionals allRecommendedMods recommendedDeps; + + preferLocalBuild = true; + buildCommand = '' + mkdir -p $out + srcBase=$(basename $src) + srcBase=''${srcBase#*-} # strip nix hash + srcBase=''${srcBase%\?*} # strip querystring leftover from fetchurl + cp $src $out/$srcBase + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac96ea3448f..a0611ff6658 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15594,6 +15594,8 @@ in factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-utils = callPackage ../games/factorio/utils.nix { }; + fairymax = callPackage ../games/fairymax {}; fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; From d76aa6e7e4ee48832033495df99fa3584adb8029 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Wed, 3 Aug 2016 16:47:21 -0700 Subject: [PATCH 075/168] factorio: sample mods --- pkgs/games/factorio/mods.nix | 213 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 215 insertions(+) create mode 100644 pkgs/games/factorio/mods.nix diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix new file mode 100644 index 00000000000..501665494eb --- /dev/null +++ b/pkgs/games/factorio/mods.nix @@ -0,0 +1,213 @@ +# This file is here for demo purposes only, populated with a small sampling of +# mods. It will eventually be replaced by a nixos-channel that will provide +# derivations for most or all of the mods tracked through the official mod +# manager site. +{ stdenv, fetchurl +, factorio-utils +, allRecommendedMods ? true +, allOptionalMods ? false +}: +with stdenv.lib; +let + modDrv = factorio-utils.modDrv { inherit allRecommendedMods allOptionalMods; }; +in +rec { + + bobassembly = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobassembly_0.13.0.zip + ]; + sha256 = "0c0m7sb45r37g882x0aq8mc82yhfh9j9h8g018d4s5pf93vzr6d1"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig ]; + recommendedDeps = [ bobplates ]; + }; + + bobconfig = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobconfig_0.13.1.zip + ]; + sha256 = "0z4kmggm1slbr3qiy5xahc9nhdffllp21n9nv5gh1zbzv72sb1rp"; + }; + }; + + bobelectronics = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobelectronics_0.13.1.zip + ]; + sha256 = "16sn5w33s0ckiwqxx7b2pcsqmhxbxjm2w4h4vd99hwpvdpjyav52"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig ]; + recommendedDeps = [ bobplates ]; + }; + + bobenemies = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobenemies_0.13.1.zip + ]; + sha256 = "1wnb5wsvh9aa3i9mj17f36ybbd13qima3iwshw60i6xkzzqfk44d"; + }; + optionalDeps = [ bobconfig ]; + }; + + bobgreenhouse = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobgreenhouse_0.13.2.zip + ]; + sha256 = "1ql26875dvz2lqln289jg1w6yjzsd0x0pqmd570jffwi5m320rrw"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig ]; + recommendedDeps = [ bobplates ]; + }; + + bobinserters = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobinserters_0.13.3.zip + ]; + sha256 = "0nys9zhaw0v3w2xzrhawr8g2hcxkzdmyqd4s8xm5bnbrgrq86g9z"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig ]; + recommendedDeps = [ ]; + }; + + boblibrary = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/boblibrary_0.13.1.zip + ]; + sha256 = "04fybs626lzxf0p21jl8kakh2mddah7l9m57srk7a87jw5bj1zx8"; + }; + }; + + boblogistics = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/boblogistics_0.13.7.zip + ]; + sha256 = "0c91zmyxwsmyv6vm6gp498vb7flqlcyzkbp9s5q1651hpyd378hx"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig ]; + recommendedDeps = [ bobplates ]; + }; + + bobmining = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobmining_0.13.1.zip + ]; + sha256 = "1l7k3v4aizihppgi802fr5b8zbnq2h05c2bbsk5hds239qgxy80m"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig bobores bobplates ]; + }; + + bobmodules = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobmodules_0.13.0.zip + ]; + sha256 = "0ggd2gc4s5sbld7gyncbzdgq8gc00mvxjcfv7i2dchcrdzrlr556"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig ]; + recommendedDeps = [ bobplates bobassembly bobelectronics ]; + }; + + bobores = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobores_0.13.1.zip + ]; + sha256 = "1rri70655kj77sdr3zgp56whmcl0gfjmw90jm7lj1jp8l1pdfzb9"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig ]; + }; + + bobplates = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobplates_0.13.2.zip + ]; + sha256 = "0iczpa26hflj17k84p4n6wz0pwhbbrfk86dgac4bfz28kqg58nj1"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig bobenemies ]; + recommendedDeps = [ bobores bobtech ]; + }; + + bobpower = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobpower_0.13.1.zip + ]; + sha256 = "18sblnlvprrm2vzlczlki09yj9lr4y64808zrwmcasf7470skar3"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobconfig ]; + recommendedDeps = [ bobplates ]; + }; + + bobrevamp = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobrevamp_0.13.0.zip + ]; + sha256 = "0rkyf61clh8fjg72z9i7r4skvdzgd49ky6s0486xxljhbil4nxb7"; + }; + deps = [ boblibrary ]; + }; + + bobtech = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobtech_0.13.0.zip + ]; + sha256 = "0arc9kilxzdpapn3gh5h8269ssgsjxib4ny0qissq2sg95gxlsn0"; + }; + deps = [ boblibrary ]; + optionalDeps = [ bobenemies ]; + }; + + bobtechsave = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobtechsave_0.13.0.zip + ]; + sha256 = "1vlv4sgdfd9ldjm8y79n95ms5k6x2i7khjc422lp9080m03v1hcl"; + }; + }; + + bobwarfare = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/bobwarfare_0.13.4.zip + ]; + sha256 = "07wzn16i4r0qjm41wfyl17rrhry2vrph08a0kq8w5iy6qcbqqfd3"; + }; + deps = [ boblibrary ]; + optionalDeps = [ boblibrary bobplates ]; + recommendedDeps = [ bobtech ]; + }; + + clock = modDrv { + src = fetchurl { + urls = [ + https://f.xor.us/factorio-mods/clock_0.13.0.zip + ]; + sha256 = "0nflywbj6p2kz2w9wff78vskzljrzaf32ib56k3z456d9y8mlxfd"; + }; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0611ff6658..af43d3b3119 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15594,6 +15594,8 @@ in factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-mods = callPackage ../games/factorio/mods.nix { }; + factorio-utils = callPackage ../games/factorio/utils.nix { }; fairymax = callPackage ../games/fairymax {}; From c39b6025d8fa8a77b6ac89e89400c595bf2bd2f0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 3 Aug 2016 18:49:18 +0200 Subject: [PATCH 076/168] gitlab: 8.5.12 -> 8.10.3, update module Fixes #14795. --- nixos/modules/services/misc/gitlab.nix | 139 ++- .../gitlab-shell/default.nix | 4 +- .../gitlab-workhorse/default.nix | 6 +- .../version-management/gitlab/Gemfile | 228 ++-- .../version-management/gitlab/Gemfile.lock | 748 ++++++------ .../version-management/gitlab/default.nix | 12 +- .../disable-dump-schema-after-migration.patch | 11 - .../version-management/gitlab/gemset.nix | 1065 +++++++---------- .../gitlab/nulladapter.patch | 75 +- .../gitlab/remove-hardcoded-locations.patch | 47 +- 10 files changed, 1098 insertions(+), 1237 deletions(-) delete mode 100644 pkgs/applications/version-management/gitlab/disable-dump-schema-after-migration.patch diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 267442bd1f8..46af78d58a1 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -57,42 +57,23 @@ let issues = true; merge_requests = true; wiki = true; - snippets = false; + snippets = true; builds = true; + container_registry = true; }; }; - artifacts = { - enabled = true; - }; - lfs = { - enabled = true; - }; - gravatar = { - enabled = true; - }; - cron_jobs = { - stuck_ci_builds_worker = { - cron = "0 0 * * *"; - }; - }; - gitlab_ci = { - builds_path = "${cfg.statePath}/builds"; - }; - ldap = { - enabled = false; - }; - omniauth = { - enabled = false; - }; - shared = { - path = "${cfg.statePath}/shared"; - }; - backup = { - path = "${cfg.backupPath}"; - }; + repositories.storages.default = "${cfg.statePath}/repositories"; + artifacts.enabled = true; + lfs.enabled = true; + gravatar.enabled = true; + cron_jobs = { }; + gitlab_ci.builds_path = "${cfg.statePath}/builds"; + ldap.enabled = false; + omniauth.enabled = false; + shared.path = "${cfg.statePath}/shared"; + backup.path = "${cfg.backupPath}"; gitlab_shell = { path = "${cfg.packages.gitlab-shell}"; - repos_path = "${cfg.statePath}/repositories"; hooks_path = "${cfg.statePath}/shell/hooks"; secret_file = "${cfg.statePath}/config/gitlab_shell_secret"; upload_pack = true; @@ -127,19 +108,38 @@ let gitlab-runner = pkgs.stdenv.mkDerivation rec { name = "gitlab-runner"; - buildInputs = [ cfg.packages.gitlab bundler pkgs.makeWrapper ]; + buildInputs = [ cfg.packages.gitlab cfg.packages.gitlab.env pkgs.makeWrapper ]; phases = "installPhase fixupPhase"; buildPhase = ""; installPhase = '' mkdir -p $out/bin - makeWrapper ${bundler}/bin/bundle $out/bin/gitlab-runner \ - ${concatStrings (mapAttrsToList (name: value: "--set ${name} '\"${value}\"' ") gitlabEnv)} \ - --set GITLAB_CONFIG_PATH '"${cfg.statePath}/config"' \ - --set PATH '"${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH"' \ - --set RAKEOPT '"-f ${cfg.packages.gitlab}/share/gitlab/Rakefile"' + makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-runner \ + ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ + --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ + --set PATH '${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH' \ + --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ + --run 'cd ${cfg.packages.gitlab}/share/gitlab' ''; }; + smtpSettings = pkgs.writeText "gitlab-smtp-settings.rb" '' + if Rails.env.production? + Rails.application.config.action_mailer.delivery_method = :smtp + + ActionMailer::Base.delivery_method = :smtp + ActionMailer::Base.smtp_settings = { + address: "${cfg.smtp.address}", + port: ${toString cfg.smtp.port}, + ${optionalString (cfg.smtp.username != null) ''user_name: "${cfg.smtp.username}",''} + ${optionalString (cfg.smtp.password != null) ''password: "${cfg.smtp.password}",''} + domain: "${cfg.smtp.domain}", + ${optionalString (cfg.smtp.authentication != null) "authentication: :${cfg.smtp.authentication},"} + enable_starttls_auto: ${toString cfg.smtp.enableStartTLSAuto}, + openssl_verify_mode: '${cfg.smtp.opensslVerifyMode}' + } + end + ''; + in { options = { @@ -255,6 +255,62 @@ in { ''; }; + smtp = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable gitlab mail delivery over SMTP."; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = "Address of the SMTP server for Gitlab."; + }; + + port = mkOption { + type = types.int; + default = 465; + description = "Port of the SMTP server for Gitlab."; + }; + + username = mkOption { + type = types.nullOr types.str; + default = null; + description = "Username of the SMTP server for Gitlab."; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = "Password of the SMTP server for Gitlab."; + }; + + domain = mkOption { + type = types.str; + default = "localhost"; + description = "HELO domain to use for outgoing mail."; + }; + + authentication = mkOption { + type = types.nullOr types.str; + default = null; + description = "Authentitcation type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; + }; + + enableStartTLSAuto = mkOption { + type = types.bool; + default = true; + description = "Whether to try to use StartTLS."; + }; + + opensslVerifyMode = mkOption { + type = types.str; + default = "peer"; + description = "How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; + }; + }; + extraConfig = mkOption { type = types.attrs; default = {}; @@ -308,6 +364,7 @@ in { systemd.services.gitlab-sidekiq = { after = [ "network.target" "redis.service" ]; wantedBy = [ "multi-user.target" ]; + partOf = [ "gitlab.service" ]; environment = gitlabEnv; path = with pkgs; [ config.services.postgresql.package @@ -322,7 +379,7 @@ in { Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailers -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; + ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -q post_receive -q mailers -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; }; }; @@ -397,6 +454,9 @@ in { chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}/ cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + ${optionalString cfg.smtp.enable '' + ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb + ''} ln -sf ${cfg.statePath}/config /run/gitlab/config cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION @@ -441,8 +501,9 @@ in { User = cfg.user; Group = cfg.group; TimeoutSec = "300"; + Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${bundler}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\""; + ExecStart = "${cfg.packages.gitlab.env}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\""; }; }; diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 0b0f59b0077..ea04fa33a73 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab }: stdenv.mkDerivation rec { - version = "2.6.10"; + version = "3.2.1"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1f1ma49xpkan2iksnw9amzjdw6i0bxnzdbsk0329m7if4987vcqd"; + sha256 = "099w4s606k2mk9xc42jwqym1ycr20824w6nkf3zpiv17slwakw90"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index e24ff31708e..df0125a6de8 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "0.6.4"; + version = "0.7.8"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; - rev = version; - sha256 = "09bs3kdmqi6avdak2nqma141y4fhfv050zwqqx7qh9a9hgkgwjxw"; + rev = "v${version}"; + sha256 = "03lhgmd8w2ainvgf2q3pgafz2jl5g4x32qyybyijlyxfl07vkg4g"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 99b8a4e28df..f97c99183f2 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -1,67 +1,71 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -gem 'rails', '4.2.5.2' +gem 'rails', '4.2.7' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with gem 'responders', '~> 2.0' -# Specify a sprockets version due to security issue -# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY -gem 'sprockets', '~> 2.12.3' +# Specify a sprockets version due to increased performance +# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 +gem 'sprockets', '~> 3.6.0' # Default values for AR models -gem "default_value_for", "~> 3.0.0" +gem 'default_value_for', '~> 3.0.0' # Supported DBs -gem "mysql2", '~> 0.3.16', group: :mysql -gem "pg", '~> 0.18.2', group: :postgres +gem 'mysql2', '~> 0.3.16', group: :mysql +gem 'pg', '~> 0.18.2', group: :postgres # Authentication libraries -gem 'devise', '~> 3.5.4' -gem 'devise-async', '~> 0.9.0' -gem 'doorkeeper', '~> 2.2.0' +gem 'devise', '~> 4.0' +gem 'doorkeeper', '~> 4.0' gem 'omniauth', '~> 1.3.1' +gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' -gem 'omniauth-google-oauth2', '~> 0.2.0' +gem 'omniauth-google-oauth2', '~> 0.4.1' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos -gem 'omniauth-saml', '~> 1.4.2' +gem 'omniauth-saml', '~> 1.6.0' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' gem 'rack-oauth2', '~> 1.2.1' +gem 'jwt' # Spam and anti-bot protection -gem 'recaptcha', require: 'recaptcha/rails' +gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' # Two-factor authentication -gem 'devise-two-factor', '~> 2.0.0' +gem 'devise-two-factor', '~> 3.0.0' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 1.3.4' +gem 'attr_encrypted', '~> 3.0.0' +gem 'u2f', '~> 0.2.1' # Browser detection -gem "browser", '~> 1.0.0' +gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 8.2' +gem 'gitlab_git', '~> 10.3.2' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap" +gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap' # Git Wiki -gem 'gollum-lib', '~> 4.1.0' +# Required manually in config/initializers/gollum.rb to control load order +gem 'gollum-lib', '~> 4.2', require: false +gem 'gollum-rugged_adapter', '~> 0.4.2', require: false # Language detection -gem "github-linguist", "~> 4.7.0", require: "linguist" +gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API gem 'grape', '~> 0.13.0' @@ -69,72 +73,80 @@ gem 'grape-entity', '~> 0.4.2' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination -gem "kaminari", "~> 0.16.3" +gem 'kaminari', '~> 0.17.0' # HAML -gem "haml-rails", '~> 0.9.0' +gem 'hamlit', '~> 2.5' # Files attachments -gem "carrierwave", '~> 0.9.0' +gem 'carrierwave', '~> 0.10.0' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' +# for backups +gem 'fog-aws', '~> 0.9' +gem 'fog-azure', '~> 0.0' +gem 'fog-core', '~> 1.40' +gem 'fog-local', '~> 0.3' +gem 'fog-google', '~> 0.3' +gem 'fog-openstack', '~> 0.1' +gem 'fog-rackspace', '~> 0.1.1' + # for aws storage -gem "fog", "~> 1.36.0" -gem "unf", '~> 0.1.4' +gem 'unf', '~> 0.1.4' # Authorization -gem "six", '~> 0.2.0' +gem 'six', '~> 0.2.0' # Seed data -gem "seed-fu", '~> 2.3.5' +gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' -gem 'github-markup', '~> 1.3.1' +gem 'github-markup', '~> 1.4' gem 'redcarpet', '~> 3.3.3' -gem 'RedCloth', '~> 4.2.9' +gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~>3.6' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.2' -gem 'rouge', '~> 1.10.1' +gem 'rouge', '~> 2.0' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM -gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' +gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8' # Diffs gem 'diffy', '~> 3.0.3' # Application server group :unicorn do - gem "unicorn", '~> 4.8.2' + gem 'unicorn', '~> 4.9.0' gem 'unicorn-worker-killer', '~> 0.4.2' end # State machine -gem "state_machines-activerecord", '~> 0.3.0' +gem 'state_machines-activerecord', '~> 0.4.0' # Run events after state machine commits -gem 'after_commit_queue' +gem 'after_commit_queue', '~> 1.3.0' # Issue tags gem 'acts-as-taggable-on', '~> 3.4' # Background jobs -gem 'sinatra', '~> 1.4.4', require: nil +gem 'sinatra', '~> 1.4.4', require: false gem 'sidekiq', '~> 4.0' gem 'sidekiq-cron', '~> 0.4.0' -gem 'redis-namespace' +gem 'redis-namespace', '~> 1.5.2' # HTTP requests -gem "httparty", '~> 0.13.3' +gem 'httparty', '~> 0.13.3' # Colored output to console -gem "colorize", '~> 0.7.0' +gem 'rainbow', '~> 2.1.0' # GitLab settings gem 'settingslogic', '~> 2.0.9' @@ -144,7 +156,11 @@ gem 'settingslogic', '~> 2.0.9' gem 'version_sorter', '~> 2.0.0' # Cache -gem "redis-rails", '~> 4.0.0' +gem 'redis-rails', '~> 4.0.0' + +# Redis +gem 'redis', '~> 3.2' +gem 'connection_pool', '~> 2.0' # Campfire integration gem 'tinder', '~> 1.10.0' @@ -153,13 +169,13 @@ gem 'tinder', '~> 1.10.0' gem 'hipchat', '~> 1.5.0' # Flowdock integration -gem "gitlab-flowdock-git-hook", "~> 1.0.1" +gem 'gitlab-flowdock-git-hook', '~> 1.0.1' # Gemnasium integration -gem "gemnasium-gitlab-service", "~> 0.2" +gem 'gemnasium-gitlab-service', '~> 0.2' # Slack integration -gem "slack-notifier", "~> 1.2.0" +gem 'slack-notifier', '~> 1.2.0' # Asana integration gem 'asana', '~> 0.4.0' @@ -170,24 +186,24 @@ gem 'ruby-fogbugz', '~> 0.2.1' # d3 gem 'd3_rails', '~> 3.5.0' -#cal-heatmap -gem 'cal-heatmap-rails', '~> 3.5.0' - # underscore-rails -gem "underscore-rails", "~> 1.8.0" +gem 'underscore-rails', '~> 1.8.0' # Sanitize user input -gem "sanitize", '~> 2.0' +gem 'sanitize', '~> 2.0' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -gem "loofah", "~> 2.0.3" +gem 'loofah', '~> 2.0.3' + +# Working with license +gem 'licensee', '~> 8.0.0' # Protect against bruteforcing -gem "rack-attack", '~> 4.3.1' +gem 'rack-attack', '~> 4.3.1' # Ace editor -gem 'ace-rails-ap', '~> 2.0.1' +gem 'ace-rails-ap', '~> 4.0.2' # Keyboard shortcuts gem 'mousetrap-rails', '~> 1.4.6' @@ -195,49 +211,49 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.3' -gem "sass-rails", '~> 5.0.0' -gem "coffee-rails", '~> 4.1.0' -gem "uglifier", '~> 2.7.2' +# Parse duration +gem 'chronic_duration', '~> 0.10.6' + +gem 'sass-rails', '~> 5.0.0' +gem 'coffee-rails', '~> 4.1.0' +gem 'uglifier', '~> 2.7.2' gem 'turbolinks', '~> 2.5.0' gem 'jquery-turbolinks', '~> 2.1.0' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' -gem 'font-awesome-rails', '~> 4.2' -gem 'gitlab_emoji', '~> 0.3.0' +gem 'font-awesome-rails', '~> 4.6.1' +gem 'gemojione', '~> 3.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.0.0' -gem 'jquery-scrollto-rails', '~> 1.4.3' +gem 'jquery-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' -gem 'nprogress-rails', '~> 0.1.6.7' -gem 'raphael-rails', '~> 2.1.2' -gem 'request_store', '~> 1.2.0' +gem 'request_store', '~> 1.3.0' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'net-ssh', '~> 3.0.1' +gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 0.15' +gem 'sentry-raven', '~> 1.1.0' + +gem 'premailer-rails', '~> 1.9.0' # Metrics group :metrics do gem 'allocations', '~> 1.0', require: false, platform: :mri gem 'method_source', '~> 0.8', require: false gem 'influxdb', '~> 0.2', require: false - gem 'connection_pool', '~> 2.0', require: false end group :development do - gem "foreman" - gem 'brakeman', '~> 3.1.0', require: false + gem 'foreman', '~> 0.78.0' + gem 'brakeman', '~> 3.3.0', require: false - gem "annotate", "~> 2.6.0" - gem "letter_opener", '~> 1.1.2' - gem 'quiet_assets', '~> 1.0.2' + gem 'letter_opener_web', '~> 1.3.0' gem 'rerun', '~> 0.11.0' - gem 'bullet', require: false - gem 'rblineprof', platform: :mri, require: false + gem 'bullet', '~> 5.0.0', require: false + gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false gem 'web-console', '~> 2.0' # Better errors handler @@ -245,23 +261,25 @@ group :development do gem 'binding_of_caller', '~> 0.7.2' # Docs generator - gem "sdoc", '~> 0.3.20' + gem 'sdoc', '~> 0.3.20' # thin instead webrick - gem 'thin', '~> 1.6.1' + gem 'thin', '~> 1.7.0' end group :development, :test do - gem 'byebug', platform: :mri - gem 'pry-rails' + gem 'byebug', '~> 8.2.1', platform: :mri + gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', '~> 1.2.0', require: false gem 'fuubar', '~> 2.0.0' - gem 'database_cleaner', '~> 1.4.0' - gem 'factory_girl_rails', '~> 4.3.0' - gem 'rspec-rails', '~> 3.3.0' - gem 'spinach-rails', '~> 0.2.1' + gem 'database_cleaner', '~> 1.4.0' + gem 'factory_girl_rails', '~> 4.6.0' + gem 'rspec-rails', '~> 3.5.0' + gem 'rspec-retry', '~> 0.4.5' + gem 'spinach-rails', '~> 0.2.1' + gem 'spinach-rerun-reporter', '~> 0.0.2' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.7.0' @@ -269,26 +287,30 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.0.0' - gem 'capybara', '~> 2.4.0' + gem 'capybara', '~> 2.6.2' gem 'capybara-screenshot', '~> 1.0.0' - gem 'poltergeist', '~> 1.8.1' + gem 'poltergeist', '~> 1.9.0' - gem 'teaspoon', '~> 1.0.0' + gem 'teaspoon', '~> 1.1.0' gem 'teaspoon-jasmine', '~> 2.2.0' - gem 'spring', '~> 1.3.6' + gem 'spring', '~> 1.7.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-spinach', '~> 1.0.0' + gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'rubocop', '~> 0.35.0', require: false - gem 'coveralls', '~> 0.8.2', require: false - gem 'simplecov', '~> 0.10.0', require: false - gem 'flog', require: false - gem 'flay', require: false - gem 'bundler-audit', require: false + gem 'rubocop', '~> 0.41.2', require: false + gem 'rubocop-rspec', '~> 1.5.0', require: false + gem 'scss_lint', '~> 0.47.0', require: false + gem 'simplecov', '~> 0.11.0', require: false + gem 'flog', '~> 4.3.2', require: false + gem 'flay', '~> 2.6.1', require: false + gem 'bundler-audit', '~> 0.5.0', require: false - gem 'benchmark-ips', require: false + gem 'benchmark-ips', '~> 2.3.0', require: false + + gem 'license_finder', '~> 2.1.0', require: false + gem 'knapsack', '~> 1.11.0' end group :test do @@ -296,30 +318,36 @@ group :test do gem 'email_spec', '~> 1.6.0' gem 'webmock', '~> 1.21.0' gem 'test_after_commit', '~> 0.4.2' - gem 'sham_rack' + gem 'sham_rack', '~> 1.3.6' end group :production do - gem "gitlab_meta", '7.0' + gem 'gitlab_meta', '7.0' end -gem "newrelic_rpm", '~> 3.14' +gem 'newrelic_rpm', '~> 3.14' -gem 'octokit', '~> 3.8.0' +gem 'octokit', '~> 4.3.0' -gem "mail_room", "~> 0.6.1" +gem 'mail_room', '~> 0.8' gem 'email_reply_parser', '~> 0.5.8' ## CI -gem 'activerecord-deprecated_finders', '~> 1.0.3' -gem 'activerecord-session_store', '~> 0.1.0' -gem "nested_form", '~> 0.3.2' +gem 'activerecord-session_store', '~> 1.0.0' +gem 'nested_form', '~> 0.3.2' # OAuth -gem 'oauth2', '~> 1.0.0' +gem 'oauth2', '~> 1.2.0' # Soft deletion -gem "paranoia", "~> 2.0" +gem 'paranoia', '~> 2.0' + +# Health check +gem 'health_check', '~> 2.1.0' + +# System information +gem 'vmstat', '~> 2.1.1' +gem 'sys-filesystem', '~> 1.1.6' gem "activerecord-nulldb-adapter" diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 8c3ddf3b570..1919acecc61 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -1,46 +1,46 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.2) - RedCloth (4.2.9) - ace-rails-ap (2.0.1) - actionmailer (4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) + RedCloth (4.3.2) + ace-rails-ap (4.0.2) + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.2) - actionview (= 4.2.5.2) - activesupport (= 4.2.5.2) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.2) - activesupport (= 4.2.5.2) + actionview (4.2.7) + activesupport (= 4.2.7) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5.2) - activesupport (= 4.2.5.2) + activejob (4.2.7) + activesupport (= 4.2.7) globalid (>= 0.3.0) - activemodel (4.2.5.2) - activesupport (= 4.2.5.2) + activemodel (4.2.7) + activesupport (= 4.2.7) builder (~> 3.1) - activerecord (4.2.5.2) - activemodel (= 4.2.5.2) - activesupport (= 4.2.5.2) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) arel (~> 6.0) - activerecord-deprecated_finders (1.0.4) - activerecord-nulldb-adapter (0.3.2) + activerecord-nulldb-adapter (0.3.3) activerecord (>= 2.0.0) - activerecord-session_store (0.1.2) - actionpack (>= 4.0.0, < 5) - activerecord (>= 4.0.0, < 5) - railties (>= 4.0.0, < 5) - activesupport (4.2.5.2) + activerecord-session_store (1.0.0) + actionpack (>= 4.0, < 5.1) + activerecord (>= 4.0, < 5.1) + multi_json (~> 1.11, >= 1.11.2) + rack (>= 1.5.2, < 3) + railties (>= 4.0, < 5.1) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -52,10 +52,7 @@ GEM after_commit_queue (1.3.0) activerecord (>= 3.0) akismet (2.0.0) - allocations (1.0.4) - annotate (2.6.10) - activerecord (>= 3.2, <= 4.3) - rake (~> 10.4) + allocations (1.0.5) arel (6.0.3) asana (0.4.0) faraday (~> 0.9) @@ -63,11 +60,9 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) asciidoctor (1.5.3) - ast (2.1.0) - astrolabe (1.3.1) - parser (~> 2.2) - attr_encrypted (1.3.4) - encryptor (>= 1.3.0) + ast (2.3.0) + attr_encrypted (3.0.1) + encryptor (~> 3.0.0) attr_required (1.0.0) autoprefixer-rails (6.2.3) execjs @@ -77,8 +72,24 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) + azure (0.7.5) + addressable (~> 2.3) + azure-core (~> 0.1) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + json (~> 1.8) + mime-types (>= 1, < 3.0) + nokogiri (~> 1.6) + systemu (~> 2.6) + thor (~> 0.19) + uuid (~> 2.0) + azure-core (0.1.2) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.6) babosa (1.0.2) - bcrypt (3.1.10) + base32 (0.3.2) + bcrypt (3.1.11) benchmark-ips (2.3.0) better_errors (1.0.1) coderay (>= 1.0.0) @@ -88,29 +99,18 @@ GEM bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - brakeman (3.1.4) - erubis (~> 2.6) - fastercsv (~> 1.5) - haml (>= 3.0, < 5.0) - highline (>= 1.6.20, < 2.0) - multi_json (~> 1.2) - ruby2ruby (>= 2.1.1, < 2.3.0) - ruby_parser (~> 3.7.0) - safe_yaml (>= 1.0) - sass (~> 3.0) - slim (>= 1.3.6, < 4.0) - terminal-table (~> 1.4) - browser (1.0.1) + brakeman (3.3.2) + browser (2.2.0) builder (3.2.2) - bullet (4.14.10) + bullet (5.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.9.0) - bundler-audit (0.4.0) + bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) byebug (8.2.1) - cal-heatmap-rails (3.5.1) - capybara (2.4.4) + capybara (2.6.2) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -119,37 +119,35 @@ GEM capybara-screenshot (1.0.11) capybara (>= 1.0, < 3) launchy - carrierwave (0.9.0) + carrierwave (0.10.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) + mime-types (>= 1.16) cause (0.1) charlock_holmes (0.7.3) + chronic_duration (0.10.6) + numerizer (~> 0.1.1) chunky_png (1.3.5) cliver (0.3.2) coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) colorize (0.7.7) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.2) connection_pool (2.2.0) - coveralls (0.8.9) - json (~> 1.8) - rest-client (>= 1.6.8, < 2) - simplecov (~> 0.10.0) - term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) + css_parser (1.4.1) + addressable d3_rails (3.5.11) railties (>= 3.1.0) daemons (1.2.3) @@ -160,46 +158,41 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.5.4) + devise (4.1.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.1) responders - thread_safe (~> 0.1) warden (~> 1.2.3) - devise-async (0.9.0) - devise (~> 3.2) - devise-two-factor (2.0.1) + devise-two-factor (3.0.0) activesupport - attr_encrypted (~> 1.3.2) - devise (~> 3.5.0) + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) railties - rotp (~> 2) + rotp (~> 2.0) diff-lcs (1.2.5) diffy (3.0.7) docile (1.1.5) - domain_name (0.5.25) - unf (>= 0.0.5, < 1.0.0) - doorkeeper (2.2.2) - railties (>= 3.2) + doorkeeper (4.0.0) + railties (>= 4.2) dropzonejs-rails (0.7.2) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) launchy (~> 2.1) mail (~> 2.2) - encryptor (1.3.0) + encryptor (3.0.0) equalizer (0.0.11) erubis (2.7.0) - escape_utils (1.1.0) + escape_utils (1.1.1) eventmachine (1.0.8) - excon (0.45.4) + excon (0.49.0) execjs (2.6.0) expression_parser (0.9.0) - factory_girl (4.3.0) + factory_girl (4.5.0) activesupport (>= 3.0.0) - factory_girl_rails (4.3.0) - factory_girl (~> 4.3.0) + factory_girl_rails (4.6.0) + factory_girl (~> 4.5.0) railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -208,11 +201,8 @@ GEM faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json - fastercsv (1.5.5) ffaker (2.0.0) ffi (1.9.10) - fission (0.5.0) - CFPropertyList (~> 2.2) flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) @@ -222,114 +212,43 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog (1.36.0) - fog-aliyun (>= 0.1.0) - fog-atmos - fog-aws (>= 0.6.0) - fog-brightbox (~> 0.4) - fog-core (~> 1.32) - fog-dynect (~> 0.0.2) - fog-ecloud (~> 0.1) - fog-google (<= 0.1.0) - fog-json - fog-local - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-radosgw (>= 0.0.2) - fog-riakcs - fog-sakuracloud (>= 0.0.4) - fog-serverlove - fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-xenserver - fog-xml (~> 0.1.1) - ipaddress (~> 0.5) - nokogiri (~> 1.5, >= 1.5.11) - fog-aliyun (0.1.0) - fog-core (~> 1.27) - fog-json (~> 1.0) - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-atmos (0.1.0) - fog-core - fog-xml - fog-aws (0.8.1) + fog-aws (0.9.2) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.10.1) - fog-core (~> 1.22) - fog-json - inflecto (~> 0.0.2) - fog-core (1.35.0) + fog-azure (0.0.2) + azure (~> 0.6) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-core (1.40.0) builder - excon (~> 0.45) + excon (~> 0.49) formatador (~> 0.2) - fog-dynect (0.0.2) - fog-core - fog-json - fog-xml - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.1.0) + fog-google (0.3.2) fog-core fog-json fog-xml fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.2.1) + fog-local (0.3.0) fog-core (~> 1.27) - fog-powerdns (0.1.1) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-profitbricks (0.0.5) - fog-core - fog-xml - nokogiri - fog-radosgw (0.0.5) - fog-core (>= 1.21.0) - fog-json - fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml - fog-sakuracloud (1.7.5) - fog-core - fog-json - fog-serverlove (0.1.2) - fog-core - fog-json - fog-softlayer (1.0.3) - fog-core - fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-xenserver (0.2.2) - fog-core - fog-xml + fog-openstack (0.1.6) + fog-core (>= 1.39) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.5.0.0) - railties (>= 3.2, < 5.0) + font-awesome-rails (4.6.1.0) + railties (>= 3.2, < 5.1) foreman (0.78.0) thor (~> 0.19.1) formatador (0.2.5) @@ -338,32 +257,30 @@ GEM ruby-progressbar (~> 1.4) gemnasium-gitlab-service (0.2.6) rugged (~> 0.21) - gemojione (2.2.1) + gemojione (3.0.1) json get_process_mem (0.2.0) gherkin-ruby (0.3.2) - github-linguist (4.7.5) + github-linguist (4.7.6) charlock_holmes (~> 0.7.3) escape_utils (~> 1.1.0) mime-types (>= 1.19) rugged (>= 0.23.0b) - github-markup (1.3.3) + github-markup (1.4.0) gitlab-flowdock-git-hook (1.0.1) flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-grit (2.7.3) + gitlab-grit (2.8.1) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) - mime-types (~> 1.15) + mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_emoji (0.3.1) - gemojione (~> 2.2, >= 2.2.1) - gitlab_git (8.2.0) + gitlab_git (10.3.2) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) - rugged (~> 0.24.0b13) + rugged (~> 0.24.0) gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -372,15 +289,18 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.0) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) + gollum-lib (4.2.1) + github-markup (~> 1.4.0) gollum-grit_adapter (~> 1.0) nokogiri (~> 1.6.4) - rouge (~> 1.9) + rouge (~> 2.0) sanitize (~> 2.1.0) stringex (~> 2.5.1) + gollum-rugged_adapter (0.4.2) + mime-types (>= 1.15) + rugged (~> 0.24.0, >= 0.21.3) gon (6.0.1) actionpack (>= 3.0) json @@ -399,30 +319,20 @@ GEM grape-entity (0.4.8) activesupport multi_json (>= 1.3.2) - haml (4.0.7) + hamlit (2.5.0) + temple (~> 0.7.6) + thor tilt - haml-rails (0.9.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) - haml (>= 4.0.6, < 5.0) - html2haml (>= 1.0.1) - railties (>= 4.0.1) hashie (3.4.3) - highline (1.7.8) - hike (1.2.3) + health_check (2.1.0) + rails (>= 4.0) hipchat (1.5.2) httparty mimemagic html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) - html2haml (2.0.0) - erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) - ruby_parser (~> 3.5) - http-cookie (1.0.2) - domain_name (~> 0.5) + htmlentities (4.3.4) http_parser.rb (0.5.3) httparty (0.13.7) json (~> 1.8) @@ -430,33 +340,45 @@ GEM httpclient (2.7.0.1) i18n (0.7.0) ice_nine (0.11.1) - inflecto (0.0.2) influxdb (0.2.3) cause json - ipaddress (0.8.2) + ipaddress (0.8.3) jquery-atwho-rails (1.3.2) - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-scrollto-rails (1.4.3) - railties (> 3.1, < 5.0) jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) - jwt (1.5.2) - kaminari (0.16.3) + jwt (1.5.4) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) + knapsack (1.11.0) + rake + timecop (>= 0.1.0) launchy (2.4.3) addressable (~> 2.3) - letter_opener (1.1.2) + letter_opener (1.4.1) launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) + license_finder (2.1.0) + bundler + httparty + rubyzip + thor + xml-simple + licensee (8.0.0) + rugged (>= 0.24b) listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -464,39 +386,40 @@ GEM nokogiri (>= 1.5.9) macaddr (1.7.1) systemu (~> 2.6.2) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mail_room (0.6.1) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mail_room (0.8.0) method_source (0.8.2) - mime-types (1.25.1) + mime-types (2.99.2) mimemagic (0.3.0) mini_portile2 (2.0.0) minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.11.2) + multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.20) nested_form (0.3.2) net-ldap (0.12.1) net-ssh (3.0.1) - netrc (0.11.0) newrelic_rpm (3.14.1.311) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - nprogress-rails (0.1.6.7) + numerizer (0.1.1) oauth (0.4.7) - oauth2 (1.0.0) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - octokit (3.8.0) - sawyer (~> 0.6.0, >= 0.5.3) + rack (>= 1.2, < 3) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) + omniauth-auth0 (1.4.1) + omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) omniauth (~> 1.0) @@ -517,7 +440,7 @@ GEM omniauth-gitlab (1.0.1) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.2.10) + omniauth-google-oauth2 (0.4.1) addressable (~> 2.3) jwt (~> 1.0) multi_json (~> 1.3) @@ -534,9 +457,9 @@ GEM omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) - omniauth-saml (1.4.2) - omniauth (~> 1.1) - ruby-saml (~> 1.1, >= 1.1.1) + omniauth-saml (1.6.0) + omniauth (~> 1.3) + ruby-saml (~> 1.3) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) omniauth-twitter (1.2.1) @@ -551,16 +474,23 @@ GEM orm_adapter (0.5.0) paranoia (2.1.4) activerecord (~> 4.0) - parser (2.2.3.0) - ast (>= 1.1, < 3.0) + parser (2.3.1.2) + ast (~> 2.2) pg (0.18.4) - poltergeist (1.8.1) + pkg-config (1.1.7) + poltergeist (1.9.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) + premailer (1.8.6) + css_parser (>= 1.3.6) + htmlentities (>= 4.0.0) + premailer-rails (1.9.2) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -568,8 +498,6 @@ GEM pry-rails (0.3.4) pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) - quiet_assets (1.0.3) - railties (>= 3.1, < 5.0) rack (1.6.4) rack-accept (0.4.5) rack (>= 0.4) @@ -588,16 +516,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.2) - actionmailer (= 4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) - activemodel (= 4.2.5.2) - activerecord (= 4.2.5.2) - activesupport (= 4.2.5.2) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.2) + railties (= 4.2.7) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -607,15 +535,14 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.5.2) - actionpack (= 4.2.5.2) - activesupport (= 4.2.5.2) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.0.0) + rainbow (2.1.0) raindrops (0.15.0) rake (10.5.0) - raphael-rails (2.1.2) rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -623,7 +550,7 @@ GEM debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (1.0.2) + recaptcha (3.0.0) json redcarpet (3.3.3) redis (3.2.2) @@ -645,118 +572,114 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.2.1) + request_store (1.3.0) rerun (0.11.0) listen (~> 3.0) responders (2.1.1) railties (>= 4.2.0, < 5.1) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rinku (1.7.3) - rotp (2.1.1) - rouge (1.10.1) + rinku (2.0.0) + rotp (2.1.2) + rouge (2.0.5) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.0) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-mocks (3.3.2) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.3) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) - rubocop (0.35.1) - astrolabe (~> 1.3) - parser (>= 2.2.3.0, < 3.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-retry (0.4.5) + rspec-core + rspec-support (3.5.0) + rubocop (0.41.2) + parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) - tins (<= 1.6.0) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-rspec (1.5.0) + rubocop (>= 0.40.0) ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-progressbar (1.7.5) - ruby-saml (1.1.1) + ruby-progressbar (1.8.1) + ruby-saml (1.3.0) nokogiri (>= 1.5.10) - uuid (~> 2.3) - ruby2ruby (2.2.0) - ruby_parser (~> 3.1) - sexp_processor (~> 4.0) - ruby_parser (3.7.2) + ruby_parser (3.8.2) sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) + rubyzip (1.2.0) rufus-scheduler (3.1.10) - rugged (0.24.0b13) + rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.4.20) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sawyer (0.6.0) - addressable (~> 2.3.5) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) + scss_lint (0.47.1) + rake (>= 0.9, < 11) + sass (~> 3.4.15) sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) - seed-fu (2.3.5) - activerecord (>= 3.1, < 4.3) - activesupport (>= 3.1, < 4.3) + seed-fu (2.3.6) + activerecord (>= 3.1) + activesupport (>= 3.1) select2-rails (3.5.9.3) thor (~> 0.14) - sentry-raven (0.15.6) + sentry-raven (1.1.0) faraday (>= 0.7.6) settingslogic (2.0.9) - sexp_processor (4.6.0) + sexp_processor (4.7.0) sham_rack (1.3.6) rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.0.1) + sidekiq (4.1.4) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) - json (~> 1.0) redis (~> 3.2, >= 3.2.1) + sinatra (>= 1.4.7) sidekiq-cron (0.4.0) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) simple_oauth (0.1.9) - simplecov (0.10.0) + simplecov (0.11.2) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.6) - rack (~> 1.4) + sinatra (1.4.7) + rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) six (0.2.0) slack-notifier (1.2.1) - slim (3.0.6) - temple (~> 0.7.3) - tilt (>= 1.3.3, < 2.1) slop (3.6.0) spinach (0.8.10) colorize @@ -766,50 +689,50 @@ GEM capybara (>= 2.0.0) railties (>= 3) spinach (>= 0.4) - spring (1.3.6) + spinach-rerun-reporter (0.0.2) + spinach (~> 0.8) + spring (1.7.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - spring-commands-spinach (1.0.0) + spring-commands-spinach (1.1.0) spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets (3.6.3) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) state_machines (0.4.0) - state_machines-activemodel (0.3.0) - activemodel (~> 4.1) + state_machines-activemodel (0.4.0) + activemodel (>= 4.1, < 5.1) state_machines (>= 0.4.0) - state_machines-activerecord (0.3.0) - activerecord (~> 4.1) + state_machines-activerecord (0.4.0) + activerecord (>= 4.1, < 5.1) state_machines-activemodel (>= 0.3.0) stringex (2.5.2) + sys-filesystem (1.1.6) + ffi systemu (2.6.5) task_list (1.0.2) html-pipeline - teaspoon (1.0.2) - railties (>= 3.2.5, < 5) + teaspoon (1.1.5) + railties (>= 3.2.5, < 6) teaspoon-jasmine (2.2.0) teaspoon (>= 1.0.0) - temple (0.7.6) - term-ansicolor (1.3.2) - tins (~> 1.0) - terminal-table (1.5.2) + temple (0.7.7) test_after_commit (0.4.2) activerecord (>= 3.2) - thin (1.6.4) + thin (1.7.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) - rack (~> 1.0) + rack (>= 1, < 3) thor (0.19.1) thread_safe (0.3.5) - tilt (1.4.1) + tilt (2.0.5) + timecop (0.8.1) timfel-krb5-auth (0.8.3) tinder (1.10.1) eventmachine (~> 1.0) @@ -820,7 +743,6 @@ GEM mime-types multi_json (~> 1.7) twitter-stream (~> 0.1) - tins (1.6.0) turbolinks (2.5.3) coffee-rails twitter-stream (0.1.16) @@ -829,14 +751,16 @@ GEM simple_oauth (~> 0.1.4) tzinfo (1.2.2) thread_safe (~> 0.1) + u2f (0.2.1) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) underscore-rails (1.8.3) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) - unicorn (4.8.3) + unf_ext (0.0.7.2) + unicode-display_width (1.1.0) + unicorn (4.9.0) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -852,9 +776,10 @@ GEM coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - warden (1.2.4) + vmstat (2.1.1) + warden (1.2.6) rack (>= 1.0) - web-console (2.2.1) + web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) @@ -877,86 +802,93 @@ PLATFORMS ruby DEPENDENCIES - RedCloth (~> 4.2.9) - ace-rails-ap (~> 2.0.1) - activerecord-deprecated_finders (~> 1.0.3) + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.0.2) activerecord-nulldb-adapter - activerecord-session_store (~> 0.1.0) + activerecord-session_store (~> 1.0.0) acts-as-taggable-on (~> 3.4) addressable (~> 2.3.8) - after_commit_queue + after_commit_queue (~> 1.3.0) akismet (~> 2.0) allocations (~> 1.0) - annotate (~> 2.6.0) asana (~> 0.4.0) asciidoctor (~> 1.5.2) - attr_encrypted (~> 1.3.4) + attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) - benchmark-ips + base32 (~> 0.3.0) + benchmark-ips (~> 2.3.0) better_errors (~> 1.0.1) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) - brakeman (~> 3.1.0) - browser (~> 1.0.0) - bullet - bundler-audit - byebug - cal-heatmap-rails (~> 3.5.0) - capybara (~> 2.4.0) + brakeman (~> 3.3.0) + browser (~> 2.2) + bullet (~> 5.0.0) + bundler-audit (~> 0.5.0) + byebug (~> 8.2.1) + capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.9.0) + carrierwave (~> 0.10.0) charlock_holmes (~> 0.7.3) + chronic_duration (~> 0.10.6) coffee-rails (~> 4.1.0) - colorize (~> 0.7.0) connection_pool (~> 2.0) - coveralls (~> 0.8.2) creole (~> 0.5.0) d3_rails (~> 3.5.0) database_cleaner (~> 1.4.0) default_value_for (~> 3.0.0) - devise (~> 3.5.4) - devise-async (~> 0.9.0) - devise-two-factor (~> 2.0.0) + devise (~> 4.0) + devise-two-factor (~> 3.0.0) diffy (~> 3.0.3) - doorkeeper (~> 2.2.0) + doorkeeper (~> 4.0) dropzonejs-rails (~> 0.7.1) email_reply_parser (~> 0.5.8) email_spec (~> 1.6.0) - factory_girl_rails (~> 4.3.0) + factory_girl_rails (~> 4.6.0) ffaker (~> 2.0.0) - flay - flog - fog (~> 1.36.0) - font-awesome-rails (~> 4.2) - foreman + flay (~> 2.6.1) + flog (~> 4.3.2) + fog-aws (~> 0.9) + fog-azure (~> 0.0) + fog-core (~> 1.40) + fog-google (~> 0.3) + fog-local (~> 0.3) + fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) + font-awesome-rails (~> 4.6.1) + foreman (~> 0.78.0) fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) + gemojione (~> 3.0) github-linguist (~> 4.7.0) - github-markup (~> 1.3.1) + github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_emoji (~> 0.3.0) - gitlab_git (~> 8.2) + gitlab_git (~> 10.3.2) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) - gollum-lib (~> 4.1.0) + gollum-lib (~> 4.2) + gollum-rugged_adapter (~> 0.4.2) gon (~> 6.0.1) grape (~> 0.13.0) grape-entity (~> 0.4.2) - haml-rails (~> 0.9.0) + hamlit (~> 2.5) + health_check (~> 2.1.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty (~> 0.13.3) influxdb (~> 0.2) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.0.0) - jquery-scrollto-rails (~> 1.4.3) + jquery-rails (~> 4.1.0) jquery-turbolinks (~> 2.1.0) jquery-ui-rails (~> 5.0.0) - kaminari (~> 0.16.3) - letter_opener (~> 1.1.2) + jwt + kaminari (~> 0.17.0) + knapsack (~> 1.11.0) + letter_opener_web (~> 1.3.0) + license_finder (~> 2.1.0) + licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.6.1) + mail_room (~> 0.8) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) @@ -964,88 +896,96 @@ DEPENDENCIES nested_form (~> 0.3.2) net-ssh (~> 3.0.1) newrelic_rpm (~> 3.14) - nokogiri (~> 1.6.7, >= 1.6.7.2) - nprogress-rails (~> 0.1.6.7) - oauth2 (~> 1.0.0) - octokit (~> 3.8.0) + nokogiri (~> 1.6.7, >= 1.6.7.2, < 1.6.8) + oauth2 (~> 1.2.0) + octokit (~> 4.3.0) omniauth (~> 1.3.1) + omniauth-auth0 (~> 1.4.1) omniauth-azure-oauth2 (~> 0.0.6) omniauth-bitbucket (~> 0.0.2) omniauth-cas3 (~> 1.1.2) omniauth-facebook (~> 3.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) + omniauth-google-oauth2 (~> 0.4.1) omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.4.2) + omniauth-saml (~> 1.6.0) omniauth-shibboleth (~> 1.2.0) omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) paranoia (~> 2.0) pg (~> 0.18.2) - poltergeist (~> 1.8.1) - pry-rails - quiet_assets (~> 1.0.2) + poltergeist (~> 1.9.0) + premailer-rails (~> 1.9.0) + pry-rails (~> 0.3.4) rack-attack (~> 4.3.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) - rails (= 4.2.5.2) + rails (= 4.2.7) rails-deprecated_sanitizer (~> 1.0.3) - raphael-rails (~> 2.1.2) - rblineprof + rainbow (~> 2.1.0) + rblineprof (~> 0.3.6) rdoc (~> 3.6) - recaptcha + recaptcha (~> 3.0) redcarpet (~> 3.3.3) - redis-namespace + redis (~> 3.2) + redis-namespace (~> 1.5.2) redis-rails (~> 4.0.0) - request_store (~> 1.2.0) + request_store (~> 1.3.0) rerun (~> 0.11.0) responders (~> 2.0) - rouge (~> 1.10.1) + rouge (~> 2.0) rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.3.0) - rubocop (~> 0.35.0) + rspec-rails (~> 3.5.0) + rspec-retry (~> 0.4.5) + rubocop (~> 0.41.2) + rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) sanitize (~> 2.0) sass-rails (~> 5.0.0) + scss_lint (~> 0.47.0) sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) - sentry-raven (~> 0.15) + sentry-raven (~> 1.1.0) settingslogic (~> 2.0.9) - sham_rack + sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) sidekiq (~> 4.0) sidekiq-cron (~> 0.4.0) - simplecov (~> 0.10.0) + simplecov (~> 0.11.0) sinatra (~> 1.4.4) six (~> 0.2.0) slack-notifier (~> 1.2.0) spinach-rails (~> 0.2.1) - spring (~> 1.3.6) + spinach-rerun-reporter (~> 0.0.2) + spring (~> 1.7.0) spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.0.0) + spring-commands-spinach (~> 1.1.0) spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 2.12.3) - state_machines-activerecord (~> 0.3.0) + sprockets (~> 3.6.0) + state_machines-activerecord (~> 0.4.0) + sys-filesystem (~> 1.1.6) task_list (~> 1.0.2) - teaspoon (~> 1.0.0) + teaspoon (~> 1.1.0) teaspoon-jasmine (~> 2.2.0) test_after_commit (~> 0.4.2) - thin (~> 1.6.1) + thin (~> 1.7.0) tinder (~> 1.10.0) turbolinks (~> 2.5.0) + u2f (~> 0.2.1) uglifier (~> 2.7.2) underscore-rails (~> 1.8.0) unf (~> 0.1.4) - unicorn (~> 4.8.2) + unicorn (~> 4.9.0) unicorn-worker-killer (~> 0.4.2) version_sorter (~> 2.0.0) virtus (~> 1.0.1) + vmstat (~> 2.1.1) web-console (~> 2.0) webmock (~> 1.21.0) wikicloth (= 0.8.1) BUNDLED WITH - 1.11.2 + 1.12.5 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c3aef17513f..fadb14dc782 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,20 +24,19 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.5.12"; + version = "8.10.3"; - buildInputs = [ ruby bundler tzdata git nodejs procps ]; + buildInputs = [ env ruby bundler tzdata git nodejs procps ]; src = fetchFromGitHub { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "144i97ywnr0xgm7gnwnwiy7kk5z1d71ccawl8qdhapz0705993l8"; + sha256 = "0fhnwrgrpccc2j9wgdmwwi9h1ym3ll97lhmddq0xfzivc302ri3w"; }; patches = [ ./remove-hardcoded-locations.patch - ./disable-dump-schema-after-migration.patch ./nulladapter.patch ]; @@ -66,9 +65,10 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - export GEM_HOME=${env}/${ruby.gemPath} mv config/gitlab.yml.example config/gitlab.yml - GITLAB_DATABASE_ADAPTER=nulldb bundle exec rake assets:precompile RAILS_ENV=production + GITLAB_DATABASE_ADAPTER=nulldb \ + SKIP_STORAGE_VALIDATION=true \ + rake assets:precompile RAILS_ENV=production mv config/gitlab.yml config/gitlab.yml.example mv config config.dist ''; diff --git a/pkgs/applications/version-management/gitlab/disable-dump-schema-after-migration.patch b/pkgs/applications/version-management/gitlab/disable-dump-schema-after-migration.patch deleted file mode 100644 index bc1f638cee0..00000000000 --- a/pkgs/applications/version-management/gitlab/disable-dump-schema-after-migration.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/config/environments/production.rb b/config/environments/production.rb -index 3316ece..d60566c 100644 ---- a/config/environments/production.rb -+++ b/config/environments/production.rb -@@ -77,4 +77,6 @@ Gitlab::Application.configure do - config.eager_load = true - - config.allow_concurrency = false -+ -+ config.active_record.dump_schema_after_migration = false - end diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 870f5e79f3a..ce7ecd9f030 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -2,98 +2,82 @@ ace-rails-ap = { source = { remotes = ["https://rubygems.org"]; - sha256 = "082n12rkd9j7d89030nhmi4fx1gqaf13knps6cknsyvwix7fryvv"; + sha256 = "1y1xdjmdb7fg1w0ym7xizpfvll8bicnhli2s65bzvpk3zp7h8qmi"; type = "gem"; }; - version = "2.0.1"; + version = "4.0.2"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "8cee5f2f1e58c8ada17cca696377443c0cbc9675df2b7eef97a04318876484b5"; + sha256 = "1fhq3dg3icbi1vrz55xwalzn4wpbrdgm41ma1jkrgbwl4qqqrrsq"; type = "gem"; }; - version = "4.2.5.2"; + version = "4.2.7"; }; actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "a22e1818f06b707433c9a76867932929751b5d57edbeacc258635a7b23da12cf"; + sha256 = "0swhxylh0mrq7b8am3b90xqnwldvfn52jd2m9zmc27r8hvc0h2fp"; type = "gem"; }; - version = "4.2.5.2"; + version = "4.2.7"; }; actionview = { - dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "e8ce01cf6cc822ec023a15a856a0fae0e078ebb232b95b722c23af4117d2d635"; + sha256 = "0wsxa7zkvacmv4vf528nmid2v5smqy54vh17srj3997bgjyr68f3"; type = "gem"; }; - version = "4.2.5.2"; + version = "4.2.7"; }; activejob = { - dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "cecb9bbc55292dee064ca479990c6e50fa3e2273aac6722ce058d18c22383026"; + sha256 = "19bf6fpl1vw6qnpsqcvdhljrvp67a7j72x1ydz4rj2s7g4xbjas3"; type = "gem"; }; - version = "4.2.5.2"; + version = "4.2.7"; }; activemodel = { - dependencies = ["activesupport" "builder"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09ce967be3086b34ae9fcbd919e714b2bdf72b8ab6e89b64aa74627267d93962"; + sha256 = "0v991wipszd5ly1fba8qzfyg86r06k8l8y353dv7438sngwd7slk"; type = "gem"; }; - version = "4.2.5.2"; + version = "4.2.7"; }; activerecord = { - dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "c2b1b6a4c6b8542c2464b457dce4cac4915efcbd3d5acfba57102e58474c33f2"; + sha256 = "0m04absj00hxj4q527ng0w0ydgbfc1cgxlcksjixgnx4j1visibn"; type = "gem"; }; - version = "4.2.5.2"; - }; - activerecord-deprecated_finders = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03xplckz7v3nm6inqkwdd44h6gpbpql0v02jc1rz46a38rd6cj6m"; - type = "gem"; - }; - version = "1.0.4"; + version = "4.2.7"; }; activerecord-nulldb-adapter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ym3paxp5lqr2kr4hkqj6xxqvgl57fv8jqhvgjfxb9lk7k5jlfmp"; + sha256 = "1m8jlbzmwc1cx4fb54m9adw962anpz5cazbyirb4qs5brxma63fp"; type = "gem"; }; - version = "0.3.2"; + version = "0.3.3"; }; activerecord-session_store = { - dependencies = ["actionpack" "activerecord" "railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rp5q0q5i5syfgw7qpiq3a42x13p7myyv1c5hmnczpdlh57axs3p"; + sha256 = "1b8q5p7wl0xpmlcjig2im1yryzj4aipvw7zq3z1ig8fdg4m2m943"; type = "gem"; }; - version = "0.1.2"; + version = "1.0.0"; }; activesupport = { - dependencies = ["i18n" "json" "minitest" "thread_safe" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "80ad345adf7e2b72c5d90753c0df91eacc34f4de02b34cfbf60bcf6c83483031"; + sha256 = "1pm0gw4ykq9137n8i815vayyah0mk2m920clgg02jr3l23w6gsnj"; type = "gem"; }; - version = "4.2.5.2"; + version = "4.2.7"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -132,19 +116,10 @@ allocations = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0iynf7gkbnbr5mgl2wgbgvxmjdiawh7ywwbnyjm94bj3pkybzgkc"; + sha256 = "1y7z66lpzabyvviphk1fnzvrj5vhv7v9vppcnkrf0n5wh8qwx2zi"; type = "gem"; }; - version = "1.0.4"; - }; - annotate = { - dependencies = ["activerecord" "rake"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wdw9phsv2dndgid3pd8h0hl4zycwy11jc9iz6prwza0xax0i7hg"; - type = "gem"; - }; - version = "2.6.10"; + version = "1.0.5"; }; arel = { source = { @@ -174,28 +149,18 @@ ast = { source = { remotes = ["https://rubygems.org"]; - sha256 = "102bywfxrv0w3n4s6lg25d7xxshd344sc7ijslqmganj5bany1pk"; + sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; type = "gem"; }; - version = "2.1.0"; - }; - astrolabe = { - dependencies = ["parser"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ybbmjxaf529vvhrj4y8d4jpf87f3hgczydzywyg1d04gggjx7l7"; - type = "gem"; - }; - version = "1.3.1"; + version = "2.3.0"; }; attr_encrypted = { - dependencies = ["encryptor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hm2844qm37kflqq5v0x2irwasbhcblhp40qk10m3wlkj4m9wp8p"; + sha256 = "0xqb753sjgwxpb2s375j8nkrk8kjhjijzywyl6vps5r3nbs0l51k"; type = "gem"; }; - version = "1.3.4"; + version = "3.0.1"; }; attr_required = { source = { @@ -231,6 +196,22 @@ }; version = "0.1.1"; }; + azure = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vfnx47ihizg1d6szdyf48xfdghjfk66k4r39z6b0gl5i40vcm8v"; + type = "gem"; + }; + version = "0.7.5"; + }; + azure-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "016krlc7wfg27zgg5i6j0pys32ra8jszgls8wz4dz64h2zf1kd7a"; + type = "gem"; + }; + version = "0.1.2"; + }; babosa = { source = { remotes = ["https://rubygems.org"]; @@ -239,13 +220,21 @@ }; version = "1.0.2"; }; + base32 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b7y8sy6j9v1lvfzd4va88k5vg9yh0xcjzzn3llcw7yxqlcrnbjk"; + type = "gem"; + }; + version = "0.3.2"; + }; bcrypt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "15cf7zzlj9b0xcx12jf8fmnpc8g1b0yhxal1yr5p7ny3mrz5pll6"; + sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50"; type = "gem"; }; - version = "3.1.10"; + version = "3.1.11"; }; benchmark-ips = { source = { @@ -283,21 +272,20 @@ version = "3.3.6"; }; brakeman = { - dependencies = ["erubis" "fastercsv" "haml" "highline" "multi_json" "ruby2ruby" "ruby_parser" "safe_yaml" "sass" "slim" "terminal-table"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15v13yizpvp1rm86raqggmsmm51v6p8fqw3pfgi6xpvx1ba06cfm"; + sha256 = "0v2yllqcn2zyi60ahgi8ds8pix6a82703ln25p9pkm1bvrwj3fsq"; type = "gem"; }; - version = "3.1.4"; + version = "3.3.2"; }; browser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01bkb64w2ld2q5r3chc4f6spbjrmginyg8wlzg130zmx2z4jia2h"; + sha256 = "055r4wyc3z61r7mg2bgqpzabpkg8db2q5rciwfx9lwfyhjx19pbv"; type = "gem"; }; - version = "1.0.1"; + version = "2.2.0"; }; builder = { source = { @@ -308,22 +296,20 @@ version = "3.2.2"; }; bullet = { - dependencies = ["activesupport" "uniform_notifier"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h3iaflcz5a1xr32bdb8sk4nx06yhh5d8y7w294w49xigfv4hzj3"; + sha256 = "14i3ci990sygxzdsy9jsgzfs5zkzgx6fd56i0d58s77wmn2myham"; type = "gem"; }; - version = "4.14.10"; + version = "5.0.0"; }; bundler-audit = { - dependencies = ["thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0msv3k2277y7al5lbnw7q9lmb5fnrscpkmsb36wpn189pdq0akfv"; + sha256 = "1gr7k6m9fda7m66irxzydm8v9xbmlryjj65cagwm1zyi5f317srb"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; byebug = { source = { @@ -333,22 +319,13 @@ }; version = "8.2.1"; }; - cal-heatmap-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lrmcyj3iixkprqi9fb9vcn97wpp779sl5hxxgx57r3rb7l4d20w"; - type = "gem"; - }; - version = "3.5.1"; - }; capybara = { - dependencies = ["mime-types" "nokogiri" "rack" "rack-test" "xpath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f"; + sha256 = "0ln77a5wwhd5sbxsh3v26xrwjnza0rgx2hn23yjggdlha03b00yw"; type = "gem"; }; - version = "2.4.4"; + version = "2.6.2"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -360,13 +337,12 @@ version = "1.0.11"; }; carrierwave = { - dependencies = ["activemodel" "activesupport" "json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b1av1ancby6brhmypl5k8xwrasd8bd3kqp9ri8kbq7z8nj6k445"; + sha256 = "0h9179vcsv5mhdd83zx13bisk6x5c7j97mhqaxagimjbkszwsvr0"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.0"; }; cause = { source = { @@ -376,14 +352,6 @@ }; version = "0.1"; }; - CFPropertyList = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mjb46368z4hiax3fcsgxk14fxrhwnvcmakc2f5sx8nz0wvvkwg2"; - type = "gem"; - }; - version = "2.3.2"; - }; charlock_holmes = { source = { remotes = ["https://rubygems.org"]; @@ -392,6 +360,14 @@ }; version = "0.7.3"; }; + chronic_duration = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k7sx3xqbrn6s4pishh2pgr4kw6fmw63h00lh503l66k8x0qvigs"; + type = "gem"; + }; + version = "0.10.6"; + }; chunky_png = { source = { remotes = ["https://rubygems.org"]; @@ -426,13 +402,12 @@ version = "1.0.0"; }; coffee-rails = { - dependencies = ["coffee-script" "railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3zhs44gsy1p90nmghihzfyl7bsk8kv6j3q7rj3bn74wg8w7nqs"; + sha256 = "1mv1kaw3z4ry6cm51w8pfrbby40gqwxanrqyqr0nvs8j1bscc1gw"; type = "gem"; }; - version = "4.1.0"; + version = "4.1.1"; }; coffee-script = { dependencies = ["coffee-script-source" "execjs"]; @@ -462,10 +437,10 @@ concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qqdgcfkzv90nznrpsvg3cgg5xiqz4c8hnv7va5gm4fp4lf4k85v"; + sha256 = "1kb4sav7yli12pjr8lscv8z49g52a5xzpfg3z9h8clzw6z74qjsw"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; connection_pool = { source = { @@ -475,15 +450,6 @@ }; version = "2.2.0"; }; - coveralls = { - dependencies = ["json" "rest-client" "simplecov" "term-ansicolor" "thor" "tins"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03vnvcw1fdmkp3405blcxpsjf89jxd2061474a32fchsmv2das9y"; - type = "gem"; - }; - version = "0.8.9"; - }; crack = { dependencies = ["safe_yaml"]; source = { @@ -501,6 +467,14 @@ }; version = "0.5.0"; }; + css_parser = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ql5q4n39278prbdjdsxx9wkxkxblgzzn0qcdqnwibgd1dkvb5av"; + type = "gem"; + }; + version = "1.4.1"; + }; d3_rails = { dependencies = ["railties"]; source = { @@ -561,31 +535,20 @@ version = "0.0.4"; }; devise = { - dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "thread_safe" "warden"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00h0xdl4a8pjpb0gbgy4w6q9j2mpczkmj23195zmjrg2b1gl8f2q"; + sha256 = "1i5glkxmn0ymj50pz05nh6xcffc9giqajgfg6qrcbs2n552hbr5k"; type = "gem"; }; - version = "3.5.4"; - }; - devise-async = { - dependencies = ["devise"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11llg7ggzpmg4lb9gh4sx55spvp98sal5r803gjzamps9crfq6mm"; - type = "gem"; - }; - version = "0.9.0"; + version = "4.1.1"; }; devise-two-factor = { - dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v2wva971ds48af47rj4ywavlmz7qzbmf1jpf1l3xn3mscz52hln"; + sha256 = "1pkldws5lga4mlv4xmcrfb0yivl6qad0l8qyb2hdb50adv6ny4gs"; type = "gem"; }; - version = "2.0.1"; + version = "3.0.0"; }; diff-lcs = { source = { @@ -611,23 +574,13 @@ }; version = "1.1.5"; }; - domain_name = { - dependencies = ["unf"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16qvfrmcwlzz073aas55mpw2nhyhjcn96s524w0g1wlml242hjav"; - type = "gem"; - }; - version = "0.5.25"; - }; doorkeeper = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wim84wkvx758cfb8q92w3hhvnfbwr990x1mmfv1ss1ivjz8fmm0"; + sha256 = "0lillrbd2sy7zzni6a2kf3p09lfd0br831zzv22zsv4ffr6n1va1"; type = "gem"; }; - version = "2.2.2"; + version = "4.0.0"; }; dropzonejs-rails = { dependencies = ["rails"]; @@ -658,10 +611,10 @@ encryptor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "04wqqda081h7hmhwjjx1yqxprxjk8s5jgv837xqv1bpxiv7f4v1y"; + sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; type = "gem"; }; - version = "1.3.0"; + version = "3.0.0"; }; equalizer = { source = { @@ -682,10 +635,10 @@ escape_utils = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0hb8nmrgmd9n5dhih86fp91sf26mmw14sdn5vswg5g20svrqxc7x"; + sha256 = "088r5c2mz2vy2jbbx1xjbi8msnzg631ggli29nhik2spbcp1z6vh"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; eventmachine = { source = { @@ -698,10 +651,10 @@ excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1shb4g3dhsfkywgjv6123yrvp2c8bvi8hqmq47iqa5lp72sn4b4w"; + sha256 = "0jmdgc4lhlbxccpg79a32vn3qngqipcaaq8bxa0ivfw5mvz0zc0z"; type = "gem"; }; - version = "0.45.4"; + version = "0.49.0"; }; execjs = { source = { @@ -720,22 +673,20 @@ version = "0.9.0"; }; factory_girl = { - dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13z20a4b7z1c8vbz0qz5ranssdprldwvwlgjmn38x311sfjmp9dz"; + sha256 = "0qn34ba1midnzms1854yzx0g16sgy7bd9wcsvs66rxd65idsay20"; type = "gem"; }; - version = "4.3.0"; + version = "4.5.0"; }; factory_girl_rails = { - dependencies = ["factory_girl" "railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jj0yl6mfildb4g79dwgc1q5pv2pa65k9b1ml43mi8mg62j8mrhz"; + sha256 = "00vngc59bww75hqkr1hbnvnqm5763w0jlv3lsq3js1r1wxdzix2r"; type = "gem"; }; - version = "4.3.0"; + version = "4.6.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -764,14 +715,6 @@ }; version = "0.0.6"; }; - fastercsv = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h"; - type = "gem"; - }; - version = "1.5.5"; - }; ffaker = { source = { remotes = ["https://rubygems.org"]; @@ -788,15 +731,6 @@ }; version = "1.9.10"; }; - fission = { - dependencies = ["CFPropertyList"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh"; - type = "gem"; - }; - version = "0.5.0"; - }; flay = { dependencies = ["ruby_parser" "sexp_processor"]; source = { @@ -824,86 +758,37 @@ }; version = "0.7.1"; }; - fog = { - dependencies = ["fog-aliyun" "fog-atmos" "fog-aws" "fog-brightbox" "fog-core" "fog-dynect" "fog-ecloud" "fog-google" "fog-json" "fog-local" "fog-powerdns" "fog-profitbricks" "fog-radosgw" "fog-riakcs" "fog-sakuracloud" "fog-serverlove" "fog-softlayer" "fog-storm_on_demand" "fog-terremark" "fog-vmfusion" "fog-voxel" "fog-xenserver" "fog-xml" "ipaddress" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ml31jdycqdm8w7w3l9pbyrgbnmrrnhmkppa2x4bwi9as1n1jmwq"; - type = "gem"; - }; - version = "1.36.0"; - }; - fog-aliyun = { - dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj"; - type = "gem"; - }; - version = "0.1.0"; - }; - fog-atmos = { - dependencies = ["fog-core" "fog-xml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9"; - type = "gem"; - }; - version = "0.1.0"; - }; fog-aws = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzfahq8h3alfflb5dr8lm02q27x81vm96qn5zyfdlx86yy7bq96"; + sha256 = "0imhhxrw8m031lc912bnlqzgac41sjsip1fa8v845ldmn56kn9zg"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.2"; }; - fog-brightbox = { - dependencies = ["fog-core" "fog-json" "inflecto"]; + fog-azure = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0p7rbx587hb1d1am90dcr3zdp6y50c2zddh97yfgl62vji0pbkkd"; - type = "gem"; - }; - version = "0.10.1"; - }; - fog-core = { - dependencies = ["builder" "excon" "formatador"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02z91r3f5a64hlalm6h39v0778yl2kk3qvva0zvplpp9hpwbwzhl"; - type = "gem"; - }; - version = "1.35.0"; - }; - fog-dynect = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18lqmdkm22254z86jh3aa9v9vqk8bgbd3d1m0w7az3ij47ak7kch"; + sha256 = "1bdgzn1a1z79drfvashs6gzpg98dijvxm168cq0czzkx3wvbrfcl"; type = "gem"; }; version = "0.0.2"; }; - fog-ecloud = { - dependencies = ["fog-core" "fog-xml"]; + fog-core = { source = { remotes = ["https://rubygems.org"]; - sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06"; + sha256 = "1flkprsdm1qr38bzd80wxpkbcwm5zshivbg2k8pjls9i6jh6a0z7"; type = "gem"; }; - version = "0.3.0"; + version = "1.40.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z4vmswpqwph04c0wqzrscns1d1wdm8kbxx457bv156mawzrhfj3"; + sha256 = "0vzwid3s4c39fqixg1zb0dr5g3q6lafm9pan6bk3csys62v6fnm9"; type = "gem"; }; - version = "0.1.0"; + version = "0.3.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -915,122 +800,29 @@ version = "1.0.2"; }; fog-local = { - dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3"; + sha256 = "0256l3q2f03q8fk49035h5jij388rcz9fqlwri7y788492b4vs3c"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.0"; }; - fog-powerdns = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; + fog-openstack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7"; + sha256 = "1pw2ypxbbmfscmhcz05ry5kc7c5rjr61lv9zj6zpr98fg1wad3a6"; + type = "gem"; + }; + version = "0.1.6"; + }; + fog-rackspace = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a"; type = "gem"; }; version = "0.1.1"; }; - fog-profitbricks = { - dependencies = ["fog-core" "fog-xml" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "154sqs2dcmvg21v4m3fj8f09z5i70sq8a485v6rdygsffs8xrycn"; - type = "gem"; - }; - version = "0.0.5"; - }; - fog-radosgw = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nslgv8yp5qkiryj3zsm91gs7s6i626igj61kwxjjwk2yv6swyr6"; - type = "gem"; - }; - version = "0.0.5"; - }; - fog-riakcs = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm"; - type = "gem"; - }; - version = "0.1.0"; - }; - fog-sakuracloud = { - dependencies = ["fog-core" "fog-json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08krsn9sk5sx0aza812g31r169bd0zanb8pq5am3a64j6azarimd"; - type = "gem"; - }; - version = "1.7.5"; - }; - fog-serverlove = { - dependencies = ["fog-core" "fog-json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci"; - type = "gem"; - }; - version = "0.1.2"; - }; - fog-softlayer = { - dependencies = ["fog-core" "fog-json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zax2wws0q8pm787jnlxd2xlj23f2acz0s6jl5nzczyxjgll571r"; - type = "gem"; - }; - version = "1.0.3"; - }; - fog-storm_on_demand = { - dependencies = ["fog-core" "fog-json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y"; - type = "gem"; - }; - version = "0.1.1"; - }; - fog-terremark = { - dependencies = ["fog-core" "fog-xml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf"; - type = "gem"; - }; - version = "0.1.0"; - }; - fog-vmfusion = { - dependencies = ["fission" "fog-core"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4"; - type = "gem"; - }; - version = "0.1.0"; - }; - fog-voxel = { - dependencies = ["fog-core" "fog-xml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx"; - type = "gem"; - }; - version = "0.1.0"; - }; - fog-xenserver = { - dependencies = ["fog-core" "fog-xml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ngw8hh8ljk7wi0cp8n4b4jcy2acx0yqzjk7851m3mp0kji5dlgl"; - type = "gem"; - }; - version = "0.2.2"; - }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; source = { @@ -1041,13 +833,12 @@ version = "0.1.2"; }; font-awesome-rails = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09x1bg98sp2v1lsg9h2bal915q811xq84h9d74p1f3378ga63c1x"; + sha256 = "04cq20l6g5byjnqvm9n02wangakxfj5kaxk1447y5mi0a87x184c"; type = "gem"; }; - version = "4.5.0.0"; + version = "4.6.1.0"; }; foreman = { dependencies = ["thor"]; @@ -1087,10 +878,10 @@ gemojione = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0av60lajn64z1csmkzfaf5wvpd3x48lcshiknkqr8m0zx3sg7w3h"; + sha256 = "17yy3cp7b75ngc2v4f0cacvq3f1bk3il5a0ykvnypl6fcj6r6b3w"; type = "gem"; }; - version = "2.2.1"; + version = "3.0.1"; }; get_process_mem = { source = { @@ -1111,18 +902,18 @@ github-linguist = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1xxm2lbabkc1xmx2myv56a4fkw3wwg9n8w2bzwrl4s33kf6x62ag"; + sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd"; type = "gem"; }; - version = "4.7.5"; + version = "4.7.6"; }; github-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq"; + sha256 = "046bvnbhk3bw021sd88808n71dya0b0dmx8hm64rj0fvs2jzg54z"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.0"; }; gitlab-flowdock-git-hook = { dependencies = ["flowdock" "gitlab-grit" "multi_json"]; @@ -1134,29 +925,20 @@ version = "1.0.1"; }; gitlab-grit = { - dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b"; + sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; type = "gem"; }; - version = "2.7.3"; - }; - gitlab_emoji = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dy746icdmyc548mb5xkavvkn37pk7vv3gznx0p6hff325pan8dj"; - type = "gem"; - }; - version = "0.3.1"; + version = "2.8.1"; }; gitlab_git = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0311dl4vh6h7k8xarmpr61fndrhbmfskzjzkkj1rr8321gn8znfv"; + sha256 = "00l5dv4k6q21yzxnviqh5ab6i2i6ajzlyjbwm1vgag7663wscny6"; type = "gem"; }; - version = "8.2.0"; + version = "10.3.2"; }; gitlab_meta = { source = { @@ -1185,22 +967,28 @@ version = "0.3.6"; }; gollum-grit_adapter = { - dependencies = ["gitlab-grit"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7"; + sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; gollum-lib = { - dependencies = ["github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm"; + sha256 = "1q668c76gnyyyl8217gnblbj50plm7giacs5lgf7ix2rj8rdxzj7"; type = "gem"; }; - version = "4.1.0"; + version = "4.2.1"; + }; + gollum-rugged_adapter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qs5bzjnvk2269jaq7b7vxghhim50sswjf9fclqs33r8bym7zxk3"; + type = "gem"; + }; + version = "0.4.2"; }; gon = { dependencies = ["actionpack" "json" "multi_json" "request_store"]; @@ -1229,23 +1017,13 @@ }; version = "0.4.8"; }; - haml = { - dependencies = ["tilt"]; + hamlit = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; + sha256 = "00360fr2kq9f31p6mq965z0lpb16vhji3mzgkywcsxym1z9srvwm"; type = "gem"; }; - version = "4.0.7"; - }; - haml-rails = { - dependencies = ["actionpack" "activesupport" "haml" "html2haml" "railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hbfznkxab663hxp1v6gpsa7sv6w1fnw9r8b3flixwylnwh3c5dz"; - type = "gem"; - }; - version = "0.9.0"; + version = "2.5.0"; }; hashie = { source = { @@ -1255,21 +1033,13 @@ }; version = "3.4.3"; }; - highline = { + health_check = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + sha256 = "1jhm5342ngm2qfa1s6g0k09rszvb0h9jkxgda7dkwhg2v4cgj976"; type = "gem"; }; - version = "1.7.8"; - }; - hike = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - type = "gem"; - }; - version = "1.2.3"; + version = "2.1.0"; }; hipchat = { dependencies = ["httparty" "mimemagic"]; @@ -1289,23 +1059,13 @@ }; version = "1.11.0"; }; - html2haml = { - dependencies = ["erubis" "haml" "nokogiri" "ruby_parser"]; + htmlentities = { source = { remotes = ["https://rubygems.org"]; - sha256 = "069zcy8lr010hn4qmbi8g5srdf69brk8nbgx4zcqcgbgsl4m8d4i"; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; type = "gem"; }; - version = "2.0.0"; - }; - http-cookie = { - dependencies = ["domain_name"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw"; - type = "gem"; - }; - version = "1.0.2"; + version = "4.3.4"; }; "http_parser.rb" = { source = { @@ -1348,14 +1108,6 @@ }; version = "0.11.1"; }; - inflecto = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4"; - type = "gem"; - }; - version = "0.0.2"; - }; influxdb = { dependencies = ["cause" "json"]; source = { @@ -1368,10 +1120,10 @@ ipaddress = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0sl0ldvhd6j0qbwhz18w24qy65mdj448b2vhgh2cwn7xrkksmv9l"; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; type = "gem"; }; - version = "0.8.2"; + version = "0.8.3"; }; jquery-atwho-rails = { source = { @@ -1382,22 +1134,12 @@ version = "1.3.2"; }; jquery-rails = { - dependencies = ["rails-dom-testing" "railties" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "028dv2n0r2r8qj1bqcbzmih0hwzh5km6cvscn2808v5gd44z48r1"; + sha256 = "1asbrr9hqf43q9qbjf87f5lm7fp12pndh76z89ks6jwxf1350fj1"; type = "gem"; }; - version = "4.0.5"; - }; - jquery-scrollto-rails = { - dependencies = ["railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12ic0zxw60ryglm1qjq5ralqd6k4jawmjj7kqnp1nkqds2nvinvp"; - type = "gem"; - }; - version = "1.4.3"; + version = "4.1.1"; }; jquery-turbolinks = { dependencies = ["railties" "turbolinks"]; @@ -1428,19 +1170,18 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0is8973si98rsry5igqdag2jb1knj6jhmfkr9r4mc5n0yvgr5n2q"; + sha256 = "0s5llb4mhpy0phzbrc4jd2jd2b91h1axy4bhci7g1bdz1w2m3a2i"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.4"; }; kaminari = { - dependencies = ["actionpack" "activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "14vx3kgssl4lv2kn6grr5v2whsynx5rbl1j9aqiq8nc3d7j74l67"; + sha256 = "1n063jha143mw4fklpq5f4qs7saakx4s4ps1zixj0s5y8l9pam54"; type = "gem"; }; - version = "0.16.3"; + version = "0.17.0"; }; kgio = { source = { @@ -1450,6 +1191,14 @@ }; version = "2.10.0"; }; + knapsack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z0bp5al0b8wyzw8ff99jwr6qsh5n52xqryvzvy2nbrma9qr7dam"; + type = "gem"; + }; + version = "1.11.0"; + }; launchy = { dependencies = ["addressable"]; source = { @@ -1460,13 +1209,36 @@ version = "2.4.3"; }; letter_opener = { - dependencies = ["launchy"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kzbmc686hfh4jznyckq6g40kn14nhb71znsjjm0rc13nb3n0c5l"; + sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21"; type = "gem"; }; - version = "1.1.2"; + version = "1.4.1"; + }; + letter_opener_web = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050x5cwqbxj2cydd2pzy9vfhmpgn1w6lfbwjaax1m1vpkn3xg9bv"; + type = "gem"; + }; + version = "1.3.0"; + }; + license_finder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "092rwf1yjq1l63zbqanmbnbky8g5pj7c3g30mcqbyppbqrsflx80"; + type = "gem"; + }; + version = "2.1.0"; + }; + licensee = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "013wrp4sampgypx9ar48cv4ai487l2bg8a2b2z6srd77najf70gr"; + type = "gem"; + }; + version = "8.0.0"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -1496,21 +1268,20 @@ version = "1.7.1"; }; mail = { - dependencies = ["mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; + sha256 = "0c9vqfy0na9b5096i5i4qvrvhwamjnmajhgqi3kdsdfl8l6agmkp"; type = "gem"; }; - version = "2.6.3"; + version = "2.6.4"; }; mail_room = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpybhgw9yi50g422qvnwadn5jnj563vh70qaml5cxzdqxbd7fj1"; + sha256 = "00jaj42z6rhgpxprs7wb0a9gq33zsfalah3ddpynxldij5iz8mg0"; type = "gem"; }; - version = "0.6.1"; + version = "0.8.0"; }; method_source = { source = { @@ -1523,10 +1294,10 @@ mime-types = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + sha256 = "06lnv0w9j45llai5qhvc1m7w409j5lhnssdzkvv6yw49d632jxkz"; type = "gem"; }; - version = "1.25.1"; + version = "2.99.2"; }; mimemagic = { source = { @@ -1563,10 +1334,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.1"; }; multi_xml = { source = { @@ -1616,14 +1387,6 @@ }; version = "3.0.1"; }; - netrc = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; - type = "gem"; - }; - version = "0.11.0"; - }; newrelic_rpm = { source = { remotes = ["https://rubygems.org"]; @@ -1633,7 +1396,6 @@ version = "3.14.1.311"; }; nokogiri = { - dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; @@ -1641,13 +1403,13 @@ }; version = "1.6.7.2"; }; - nprogress-rails = { + numerizer = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ylq2208i95661ba0p1ng2i38z4978ddwiidvpb614amfdq5pqvn"; + sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h"; type = "gem"; }; - version = "0.1.6.7"; + version = "0.1.1"; }; oauth = { source = { @@ -1658,21 +1420,20 @@ version = "0.4.7"; }; oauth2 = { - dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zaa7qnvizv363apmxx9vxa8f6c6xy70z0jm0ydx38xvhxr8898r"; + sha256 = "0z25sx8i82wczzhv6xr4g3zi3ik6fr8qr9n7r96gd65fdlw5ka93"; type = "gem"; }; - version = "1.0.0"; + version = "1.2.0"; }; octokit = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0vmknh0vz1g734q32kgpxv0qwz9ifmnw2jfpd2w5rrk6xwq1k7a8"; + sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np"; type = "gem"; }; - version = "3.8.0"; + version = "4.3.0"; }; omniauth = { source = { @@ -1682,6 +1443,14 @@ }; version = "1.3.1"; }; + omniauth-auth0 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dhfl01519q1cp4w0ml481j1cg05g7qvam0x4ia9jhdz8yx6npfs"; + type = "gem"; + }; + version = "1.4.1"; + }; omniauth-azure-oauth2 = { dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; source = { @@ -1737,13 +1506,12 @@ version = "1.0.1"; }; omniauth-google-oauth2 = { - dependencies = ["addressable" "jwt" "multi_json" "omniauth" "omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm4fk6ig9vwzv7398qd861325g678sfr1iv2mm60xswl69964fi"; + sha256 = "1m6v2vm3h21ychd10wzkdhyhnrk9zhc1bgi4ahp5gwy00pggrppw"; type = "gem"; }; - version = "0.2.10"; + version = "0.4.1"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -1784,10 +1552,10 @@ omniauth-saml = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0c7pypskq9y6wbl7c8gnp48j256snph11br3csgwvy9whjfisx65"; + sha256 = "0xs7v08s34s2bpyd3i8i8kj73zqb6wgn51ix3pmcwsifns0c8npr"; type = "gem"; }; - version = "1.4.2"; + version = "1.6.0"; }; omniauth-shibboleth = { dependencies = ["omniauth"]; @@ -1843,13 +1611,12 @@ version = "2.1.4"; }; parser = { - dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "14db0gam24j04iprqz4m3hxygkb8h0plnbm0yk4k3lzq6j5wzcac"; + sha256 = "0fxcs83z28wxn6bphbq5q40c1y5ab8zl8ww17jwkbi032wf6iik6"; type = "gem"; }; - version = "2.2.3.0"; + version = "2.3.1.2"; }; pg = { source = { @@ -1859,14 +1626,21 @@ }; version = "0.18.4"; }; - poltergeist = { - dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"]; + pkg-config = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ppm4isvbxm739508yjhvisq1iwp1q6h8dx4hkndj2krskavz4i9"; + sha256 = "0lljiqnm0b4z6iy87lzapwrdfa6ps63x2z5zbs038iig8dqx2g0z"; type = "gem"; }; - version = "1.8.1"; + version = "1.1.7"; + }; + poltergeist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fnkly1ks31nf5cdks9jd5c5vynbanrr8pwp801qq2i8bg78rwc0"; + type = "gem"; + }; + version = "1.9.0"; }; posix-spawn = { source = { @@ -1884,6 +1658,22 @@ }; version = "0.1.1"; }; + premailer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xhi427j99rgaxf5ga8rairicgbyc1bdky9ipbsw0sy0alv93346"; + type = "gem"; + }; + version = "1.8.6"; + }; + premailer-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2ls42bnqirim2j1blwqa0dk5lhdh6qvczpqilm6n90c2zq3xwx"; + type = "gem"; + }; + version = "1.9.2"; + }; pry = { dependencies = ["coderay" "method_source" "slop"]; source = { @@ -1910,15 +1700,6 @@ }; version = "0.0.3.3"; }; - quiet_assets = { - dependencies = ["railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q4azw4j1xsgd7qwcig110mfdn1fm0y34y87zw9j9v187xr401b1"; - type = "gem"; - }; - version = "1.0.3"; - }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -1990,13 +1771,12 @@ version = "0.6.3"; }; rails = { - dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "aa93c1b9eb8b535eee58280504e30237f88217699fe9bb016e458e5122eefa2e"; + sha256 = "033wfvqjzlzkm0nrqrjpxxrp0lwhfm8sjlxn5zdhxhkzmhibrnvn"; type = "gem"; }; - version = "4.2.5.2"; + version = "4.2.7"; }; rails-deprecated_sanitizer = { dependencies = ["activesupport"]; @@ -2026,21 +1806,20 @@ version = "1.0.3"; }; railties = { - dependencies = ["actionpack" "activesupport" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "cfff64cbc0e409341003c35fa2e576e6a8cd8259a9894d09f15c6123be73f146"; + sha256 = "0psnr9g436k2fkkjlhs7mq090i7vh0cvh7qwwrb8ppzbcr15hhab"; type = "gem"; }; - version = "4.2.5.2"; + version = "4.2.7"; }; rainbow = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0dsnzfjiih2w8npsjab3yx1ssmmvmgjkbxny0i9yzrdy7whfw7b4"; + sha256 = "11licivacvfqbjx2rwppi8z89qff2cgs67d4wyx42pc5fg7g9f00"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; raindrops = { source = { @@ -2058,14 +1837,6 @@ }; version = "10.5.0"; }; - raphael-rails = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sjiaymvfn4al5dr1pza5i142byan0fxnj4rymziyql2bzvdm2bc"; - type = "gem"; - }; - version = "2.1.2"; - }; rb-fsevent = { source = { remotes = ["https://rubygems.org"]; @@ -2102,13 +1873,12 @@ version = "3.12.2"; }; recaptcha = { - dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "190qqklirmi31s6ih7png4h9xmx1p5h2n5fi45z90y8hsp5w1sh1"; + sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n"; type = "gem"; }; - version = "1.0.2"; + version = "3.0.0"; }; redcarpet = { source = { @@ -2121,10 +1891,10 @@ RedCloth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl"; + sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; type = "gem"; }; - version = "4.2.9"; + version = "4.3.2"; }; redis = { source = { @@ -2191,10 +1961,10 @@ request_store = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01rxi2hw84y133z0r91jns4aaywd8d83wjq0xgb42iaicf0a90p9"; + sha256 = "1vw3vkgnpbpgzc1b4cg2ifn3rb5w7bvk62x9jfy9laz40816nvkn"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; rerun = { dependencies = ["listen"]; @@ -2214,38 +1984,29 @@ }; version = "2.1.1"; }; - rest-client = { - dependencies = ["http-cookie" "mime-types" "netrc"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7"; - type = "gem"; - }; - version = "1.8.0"; - }; rinku = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh6nys332brph55i6x6cil6swm086kxjw34wq131nl6mwryqp7b"; + sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y"; type = "gem"; }; - version = "1.7.3"; + version = "2.0.0"; }; rotp = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nzsc9hfxijnyzjbv728ln9dm80bc608chaihjdk63i2wi4m529g"; + sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz"; + sha256 = "07nda5cfrxxizcd4ff7ad8z3i0j9jaff8q7q6ddpxcj0s80nvvpi"; type = "gem"; }; - version = "1.10.1"; + version = "2.0.5"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -2266,66 +2027,76 @@ version = "0.1.7"; }; rspec = { - dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bn5zs71agc0zyns2r3c8myi5bxw3q7xnzp7f3v5b7hbil1qym4r"; + sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.0"; }; rspec-core = { - dependencies = ["rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xw5qi936j6nz9fixi2mwy03f406761cd72bzyvd61pr854d7hy1"; + sha256 = "03m0pn5lwlix094khfwlv50n963p75vjsg6w2g0b3hqcvvlch1mx"; type = "gem"; }; - version = "3.3.2"; + version = "3.5.0"; }; rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0b5hpkxlr9f3xpsbhvl3irnk4smmycx2xnmc8qv3pqaa7mb7ah"; + sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs"; type = "gem"; }; - version = "3.3.1"; + version = "3.5.0"; }; rspec-mocks = { - dependencies = ["diff-lcs" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfbzscmpyixlbapxmhy2s69596vs1z00lv590l51hgdw70z92vg"; + sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24"; type = "gem"; }; - version = "3.3.2"; + version = "3.5.0"; }; rspec-rails = { - dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m66n9p3a7d3fmrzkbh8312prb6dhrgmp53g1amck308ranasv2a"; + sha256 = "0zzd75v8vpa1r30j3hsrprza272rcx54hb0klwpzchr9ch6c9z2a"; type = "gem"; }; - version = "3.3.3"; + version = "3.5.0"; + }; + rspec-retry = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0izvxab7jvk25kaprk0i72asjyh1ip3cm70bgxlm8lpid35qjar6"; + type = "gem"; + }; + version = "0.4.5"; }; rspec-support = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1cyagig8slxjas8mbg5f8bl240b8zgr8mnjsvrznag1fwpkh4h27"; + sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0"; type = "gem"; }; - version = "3.3.0"; + version = "3.5.0"; }; rubocop = { - dependencies = ["astrolabe" "parser" "powerpack" "rainbow" "ruby-progressbar" "tins"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1grqda2fdknm43zyagh8gcmnhjkypyfw98q92hmvprprwghkq2sg"; + sha256 = "02adr908a9l8nhdfjz137i20w1dv8mbfiamy0m9z9q0fvslfdxly"; type = "gem"; }; - version = "0.35.1"; + version = "0.41.2"; + }; + rubocop-rspec = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11701iw858vkxmb6khc9apmagz3lmnbdxm8irsxsgg57d0p8bs8p"; + type = "gem"; + }; + version = "1.5.0"; }; ruby-fogbugz = { dependencies = ["crack"]; @@ -2339,36 +2110,26 @@ ruby-progressbar = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.1"; }; ruby-saml = { source = { remotes = ["https://rubygems.org"]; - sha256 = "151jbak16y87dbj3ma2nc03rh37z7lixcwgaqahncq80rgnv45a8"; + sha256 = "0qhma3cdmi9acpsn6r3x5mjjgfqxkhzxgy2pd3bc6rddghpa3x5l"; type = "gem"; }; - version = "1.1.1"; - }; - ruby2ruby = { - dependencies = ["ruby_parser" "sexp_processor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kmc0503s9mqnjyypx51wsi6zz9zj550ch43rag23wpj4qd6i6pm"; - type = "gem"; - }; - version = "2.2.0"; + version = "1.3.0"; }; ruby_parser = { - dependencies = ["sexp_processor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rip6075b4k5a7s8w2klwc3jaqx31h69k004ac5nhl8y0ja92qvz"; + sha256 = "0wr15wjkvq4wcm2ia3ajfxqwwd5szzpvnrbbq3c2bnd9g7ghqq0c"; type = "gem"; }; - version = "3.7.2"; + version = "3.8.2"; }; rubyntlm = { source = { @@ -2386,6 +2147,14 @@ }; version = "0.2.0"; }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s"; + type = "gem"; + }; + version = "1.2.0"; + }; rufus-scheduler = { source = { remotes = ["https://rubygems.org"]; @@ -2397,10 +2166,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0v0cvdw8cgy1hf5h3cx796zpxhbad8d5cm50nykyhwjc00q80zrr"; + sha256 = "0fnldbha5npdapij6xhrm7qj5qicnswrcfxa5dbk7wjaq482gh6r"; type = "gem"; }; - version = "0.24.0b13"; + version = "0.24.0"; }; safe_yaml = { source = { @@ -2422,28 +2191,34 @@ sass = { source = { remotes = ["https://rubygems.org"]; - sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf"; + sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy"; type = "gem"; }; - version = "3.4.20"; + version = "3.4.22"; }; sass-rails = { - dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f6357vw944w2ayayqmz8ai9myl6xbnry06sx5b5ms4r9lny8hj8"; + sha256 = "1ag66qa1f4agghdmnmn199s4sp7x54msa3abs31vl89ncbdf933i"; type = "gem"; }; - version = "5.0.4"; + version = "5.0.5"; }; sawyer = { - dependencies = ["addressable" "faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fk43bzwn816qj1ksiicm2i1kmzv5675cmnvk57kmfmi4rfsyjpy"; + sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; + }; + scss_lint = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q6yankh4ay4fqz7s19p2r2nqhzv93gihc5c6xnqka3ch1z6v9fv"; + type = "gem"; + }; + version = "0.47.1"; }; sdoc = { dependencies = ["json" "rdoc"]; @@ -2455,13 +2230,12 @@ version = "0.3.20"; }; seed-fu = { - dependencies = ["activerecord" "activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "11xja82yxir1kwccrzng29h7w911i9j0xj2y7y949yqnw91v12vw"; + sha256 = "1nkp1pvkdydclbl2v4qf9cixmiycvlqnrgxd61sv9r85spb01z3p"; type = "gem"; }; - version = "2.3.5"; + version = "2.3.6"; }; select2-rails = { dependencies = ["thor"]; @@ -2475,10 +2249,10 @@ sentry-raven = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0iqnwfmf6rnpgrvl3c8gh2gkix91nhm21j5qf389g4mi2rkc0ky8"; + sha256 = "0fjfq3hkfv3a415mk6cjwknnxg9d71x0b8x7szgbwhyqa8ahj3j3"; type = "gem"; }; - version = "0.15.6"; + version = "1.1.0"; }; settingslogic = { source = { @@ -2491,10 +2265,10 @@ sexp_processor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxlcpg81wfjf5gpggf8h6l2dbq3ikgavbrr2yfw3m2vqy88yjg2"; + sha256 = "0gs57v3gvbh83cknzkq20giqygdzhhbm7s7i7kxramf945diyfln"; type = "gem"; }; - version = "4.6.0"; + version = "4.7.0"; }; sham_rack = { dependencies = ["rack"]; @@ -2515,13 +2289,12 @@ version = "2.8.0"; }; sidekiq = { - dependencies = ["concurrent-ruby" "connection_pool" "json" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7jfc2va0x6fcfffdf0wdiyk4krjw8053jzwffa63wkqr5jvg3y"; + sha256 = "0j0yz9fv79d7sasz7lsrb9fnymxg58jpykgr58r73nv2v8nsx1nm"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.4"; }; sidekiq-cron = { dependencies = ["redis-namespace" "rufus-scheduler" "sidekiq"]; @@ -2541,13 +2314,12 @@ version = "0.1.9"; }; simplecov = { - dependencies = ["docile" "json" "simplecov-html"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q2iq2vgrdvvla5y907gkmqx6ry2qvnvc7a90hlcbwgp1w0sv6z4"; + sha256 = "1p0jhxwsv2ksk4hmp8qbhnr325z9fhs26z9y8in5v5c49y331qw2"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.2"; }; simplecov-html = { source = { @@ -2558,13 +2330,12 @@ version = "0.10.0"; }; sinatra = { - dependencies = ["rack" "rack-protection" "tilt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7"; + sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp"; type = "gem"; }; - version = "1.4.6"; + version = "1.4.7"; }; six = { source = { @@ -2582,15 +2353,6 @@ }; version = "1.2.1"; }; - slim = { - dependencies = ["temple" "tilt"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k"; - type = "gem"; - }; - version = "3.0.6"; - }; slop = { source = { remotes = ["https://rubygems.org"]; @@ -2617,13 +2379,21 @@ }; version = "0.2.1"; }; + spinach-rerun-reporter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fkmp99cpxrdzkjrxw9y9qp8qxk5d1arpmmlg5njx40rlcvx002k"; + type = "gem"; + }; + version = "0.0.2"; + }; spring = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xvz2x6nvza5i53p7mddnf11j2wshqmbaphi6ngd6nar8v35y0k1"; + sha256 = "17clm28dp140rw3761z9g8kjnnlpv9nv4flvpryhaasihjvjgfy1"; type = "gem"; }; - version = "1.3.6"; + version = "1.7.2"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -2635,13 +2405,12 @@ version = "1.0.4"; }; spring-commands-spinach = { - dependencies = ["spring"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "138jardqyj96wz68njdgy55qjbpl2d0g8bxbkz97ndaz3c2bykv9"; + sha256 = "12qa60sclhnclwi6lskhdgr1l007bca831vhp35f06hq1zmimi2x"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; spring-commands-teaspoon = { dependencies = ["spring"]; @@ -2653,22 +2422,20 @@ version = "0.0.2"; }; sprockets = { - dependencies = ["hike" "multi_json" "rack" "tilt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15818683yz27w4hgywccf27n91azy9a4nmb5qkklzb08k8jw9gp3"; + sha256 = "0flynmaaxa53pv15x7kcxr7z6h1hn7ifrxk13dfhhvh6h38jnzkv"; type = "gem"; }; - version = "2.12.4"; + version = "3.6.3"; }; sprockets-rails = { - dependencies = ["actionpack" "activesupport" "sprockets"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vsl6ryxdjpp97nl4ghhk1v6p50zh3sx9qv81bhmlffc234r91wn"; + sha256 = "1sak0as7ka964f6zjb1w8hkvfkkbf55kpcyvh7k6nyrb6pqnwmnf"; type = "gem"; }; - version = "2.3.3"; + version = "3.1.1"; }; state_machines = { source = { @@ -2679,22 +2446,20 @@ version = "0.4.0"; }; state_machines-activemodel = { - dependencies = ["activemodel" "state_machines"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bshcm53v2vfpapvhws1h0dq1h4f3p6bvpdkjpydb52a3m0w2z0y"; + sha256 = "0p6560jsb4flapd1vbc50bqjk6dzykkwbmyivchyjh5ncynsdb8v"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; state_machines-activerecord = { - dependencies = ["activerecord" "state_machines-activemodel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "10dplkn4cm49xby8s0sn7wxww4hnxi4dgikfsmhp1rbsa24d76vx"; + sha256 = "0x5wx1s2i3qc4p2knkf2n9h8b49pla9rjidkwxqzi781qm40wdxx"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; stringex = { source = { @@ -2704,6 +2469,14 @@ }; version = "2.5.2"; }; + sys-filesystem = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq"; + type = "gem"; + }; + version = "1.1.6"; + }; systemu = { source = { remotes = ["https://rubygems.org"]; @@ -2722,13 +2495,12 @@ version = "1.0.2"; }; teaspoon = { - dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cprz18vgf0jgcggcxf4pwx8jcwbiyj1p0dnck5aavlvaxaic58s"; + sha256 = "1xz5f1w8jm2fg1g194kf17gh36imd7sgs9cx0adqx1l22p7jrkvv"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.5"; }; teaspoon-jasmine = { dependencies = ["teaspoon"]; @@ -2742,27 +2514,10 @@ temple = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0"; + sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6"; type = "gem"; }; - version = "0.7.6"; - }; - term-ansicolor = { - dependencies = ["tins"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys"; - type = "gem"; - }; - version = "1.3.2"; - }; - terminal-table = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s6qyj9ir1agbbi32li9c0c34dcl0klyxqif6mxy0dbvq7kqfp8f"; - type = "gem"; - }; - version = "1.5.2"; + version = "0.7.7"; }; test_after_commit = { dependencies = ["activerecord"]; @@ -2774,13 +2529,12 @@ version = "0.4.2"; }; thin = { - dependencies = ["daemons" "eventmachine" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyc602sa8fqwjyssn9yvf3fqrr14jk7hj9hsjlan1mq4zvim1lf"; + sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; type = "gem"; }; - version = "1.6.4"; + version = "1.7.0"; }; thor = { source = { @@ -2801,10 +2555,18 @@ tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; + sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; type = "gem"; }; - version = "1.4.1"; + version = "2.0.5"; + }; + timecop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vwbkwqyxhavzvr1820hqwz43ylnfcf6w4x6sag0nghi44sr9kmx"; + type = "gem"; + }; + version = "0.8.1"; }; timfel-krb5-auth = { source = { @@ -2823,14 +2585,6 @@ }; version = "1.10.1"; }; - tins = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz"; - type = "gem"; - }; - version = "1.6.0"; - }; turbolinks = { dependencies = ["coffee-rails"]; source = { @@ -2858,6 +2612,14 @@ }; version = "1.2.2"; }; + u2f = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr"; + type = "gem"; + }; + version = "0.2.1"; + }; uglifier = { dependencies = ["execjs" "json"]; source = { @@ -2887,19 +2649,26 @@ unf_ext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b"; + sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8"; type = "gem"; }; - version = "0.0.7.1"; + version = "0.0.7.2"; }; - unicorn = { - dependencies = ["kgio" "rack" "raindrops"]; + unicode-display_width = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kpg2vikx2hxdyrl45bqcr89a0w59hfw7yn7xh87bmlczi34xds4"; + sha256 = "194d70pfxq4d7rrk0vsk1dvj46ns2f350308khi7q5cvnmg3h1xs"; type = "gem"; }; - version = "4.8.3"; + version = "1.1.0"; + }; + unicorn = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02xgk7gajnp8zqd2wvk1hbbwz7czlbpk29ahs9ph0jprsssnzzrv"; + type = "gem"; + }; + version = "4.9.0"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -2944,23 +2713,29 @@ }; version = "1.0.5"; }; - warden = { - dependencies = ["rack"]; + vmstat = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1iyxw1ms3930dh7vcrfyi4ifpdbkfsr8k7fzjryva0r7k3c71gb7"; + sha256 = "02yf9y7050zk1k7mn7dkp81wwa220kpkpdnlv4bg5mp65w33g5jf"; type = "gem"; }; - version = "1.2.4"; + version = "2.1.1"; + }; + warden = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04gpmnvkp312wxmsvvbq834iyab58vjmh6w4x4qpgh4p1lzkiq1l"; + type = "gem"; + }; + version = "1.2.6"; }; web-console = { - dependencies = ["activemodel" "binding_of_caller" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13rwps8m76j45iqhggm810j78i8bg4nqzgi8k7amxplik2zm5blf"; + sha256 = "0f8mgdjnkwb2gmnd73hnlx8p2clzvpz007alhsglqgylpj6m20jk"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; webmock = { dependencies = ["addressable" "crack"]; diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch index 0d5c1749e83..92a3cb55e4d 100644 --- a/pkgs/applications/version-management/gitlab/nulladapter.patch +++ b/pkgs/applications/version-management/gitlab/nulladapter.patch @@ -1,29 +1,70 @@ -index acd1874..f493451 100644 +diff --git a/Gemfile b/Gemfile +index 92e666c..f97c991 100644 --- a/Gemfile +++ b/Gemfile -@@ -318,3 +318,5 @@ gem 'oauth2', '~> 1.0.0' +@@ -117,7 +117,7 @@ gem 'rouge', '~> 2.0' - # Soft deletion - gem "paranoia", "~> 2.0" + # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s + # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM +-gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' ++gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8' + + # Diffs + gem 'diffy', '~> 3.0.3' +@@ -349,3 +349,5 @@ gem 'health_check', '~> 2.1.0' + # System information + gem 'vmstat', '~> 2.1.1' + gem 'sys-filesystem', '~> 1.1.6' + +gem "activerecord-nulldb-adapter" -index 14d2c76..7a010f0 100644 +diff --git a/Gemfile.lock b/Gemfile.lock +index e2b3d55..23a5454 100644 --- a/Gemfile.lock +++ b/Gemfile.lock -@@ -34,6 +34,8 @@ GEM - activesupport (= 4.2.5.1) +@@ -32,6 +32,8 @@ GEM + activemodel (= 4.2.7) + activesupport (= 4.2.7) arel (~> 6.0) - activerecord-deprecated_finders (1.0.4) -+ activerecord-nulldb-adapter (0.3.2) ++ activerecord-nulldb-adapter (0.3.3) + activerecord (>= 2.0.0) - activerecord-session_store (0.1.2) - actionpack (>= 4.0.0, < 5) - activerecord (>= 4.0.0, < 5) -@@ -880,6 +882,7 @@ DEPENDENCIES - RedCloth (~> 4.2.9) - ace-rails-ap (~> 2.0.1) - activerecord-deprecated_finders (~> 1.0.3) + activerecord-session_store (1.0.0) + actionpack (>= 4.0, < 5.1) + activerecord (>= 4.0, < 5.1) +@@ -390,7 +392,7 @@ GEM + method_source (0.8.2) + mime-types (2.99.2) + mimemagic (0.3.0) +- mini_portile2 (2.1.0) ++ mini_portile2 (2.0.0) + minitest (5.7.0) + mousetrap-rails (1.4.6) + multi_json (1.12.1) +@@ -401,9 +403,8 @@ GEM + net-ldap (0.12.1) + net-ssh (3.0.1) + newrelic_rpm (3.14.1.311) +- nokogiri (1.6.8) +- mini_portile2 (~> 2.1.0) +- pkg-config (~> 1.1.7) ++ nokogiri (1.6.7.2) ++ mini_portile2 (~> 2.0.0.rc2) + numerizer (0.1.1) + oauth (0.4.7) + oauth2 (1.2.0) +@@ -803,6 +803,7 @@ PLATFORMS + DEPENDENCIES + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.0.2) + activerecord-nulldb-adapter - activerecord-session_store (~> 0.1.0) + activerecord-session_store (~> 1.0.0) acts-as-taggable-on (~> 3.4) addressable (~> 2.3.8) +@@ -894,7 +895,7 @@ DEPENDENCIES + nested_form (~> 0.3.2) + net-ssh (~> 3.0.1) + newrelic_rpm (~> 3.14) +- nokogiri (~> 1.6.7, >= 1.6.7.2) ++ nokogiri (~> 1.6.7, >= 1.6.7.2, < 1.6.8) + oauth2 (~> 1.2.0) + octokit (~> 4.3.0) + omniauth (~> 1.3.1) diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index fbf5a05fc4e..a8a0542a882 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -1,8 +1,8 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index 9095266..694a4c5 100644 +index a9d8ac4..85f13f5 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb -@@ -67,10 +67,10 @@ Rails.application.configure do +@@ -70,14 +70,16 @@ Rails.application.configure do config.action_mailer.delivery_method = :sendmail # Defaults to: @@ -17,11 +17,17 @@ index 9095266..694a4c5 100644 config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true + config.eager_load = true + + config.allow_concurrency = false ++ ++ config.active_record.dump_schema_after_migration = false + end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 05f127d..6a4ae68 100644 +index 1470a6e..1b2660d 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -423,7 +423,7 @@ production: &base +@@ -476,7 +476,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -30,6 +36,28 @@ index 05f127d..6a4ae68 100644 # The next value is the maximum memory size grit can use # Given in number of bytes per git object (e.g. a commit) # This value can be increased if you have very large commits +diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb +index 86f5521..3bf006b 100644 +--- a/config/initializers/1_settings.rb ++++ b/config/initializers/1_settings.rb +@@ -192,7 +192,7 @@ Settings.gitlab['user'] ||= 'git' + Settings.gitlab['user_home'] ||= begin + Etc.getpwnam(Settings.gitlab['user']).dir + rescue ArgumentError # no user configured +- '/home/' + Settings.gitlab['user'] ++ '/homeless-shelter' + end + Settings.gitlab['time_zone'] ||= nil + Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? +@@ -350,7 +350,7 @@ Settings.backup['upload']['encryption'] ||= nil + # + Settings['git'] ||= Settingslogic.new({}) + Settings.git['max_size'] ||= 20971520 # 20.megabytes +-Settings.git['bin_path'] ||= '/usr/bin/git' ++Settings.git['bin_path'] ||= 'git' + Settings.git['timeout'] ||= 10 + + # Important: keep the satellites.path setting until GitLab 9.0 at diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 59b2114..4f4a39a 100644 --- a/lib/gitlab/logger.rb @@ -72,7 +100,7 @@ index be8fcc7..7642d74 100644 end end diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake -index d59872d..0b8007f 100644 +index 60f4636..157641f 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -223,7 +223,7 @@ namespace :gitlab do @@ -83,23 +111,22 @@ index d59872d..0b8007f 100644 + log_path = ENV["GITLAB_LOG_PATH"] if File.writable?(log_path) - puts "yes".green -@@ -263,10 +263,12 @@ namespace :gitlab do + puts "yes".color(:green) +@@ -263,10 +263,11 @@ namespace :gitlab do def check_uploads print "Uploads directory setup correctly? ... " - unless File.directory?(Rails.root.join('public/uploads')) + uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads') -+ + unless File.directory?(uploads_dir) - puts "no".red + puts "no".color(:red) try_fixing_it( - "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads" + "sudo -u #{gitlab_user} mkdir #{uploads_dir}" ) for_more_information( see_installation_guide_section "GitLab" -@@ -275,7 +277,7 @@ namespace :gitlab do +@@ -275,7 +276,7 @@ namespace :gitlab do return end From d8fd06641ac9b7ce131afd5eaa626d60c8645b21 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 4 Aug 2016 02:08:26 +0200 Subject: [PATCH 077/168] gitlab module: split up gitlab-runner script The name gitlab-runner clashes with a component of Gitlab CI with the same name and only confuses people. It's now called gitlab-bundle and a convenience-script gitlab-rake for easier invocation of rake tasks was added. This was the primary use case of gitlab-runner. --- nixos/doc/manual/release-notes/rl-1609.xml | 7 ++++++- nixos/modules/services/misc/gitlab.nix | 18 ++++++++++-------- nixos/modules/services/misc/gitlab.xml | 14 +++++++------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 8dbf03ee42b..7a85d5cd5cb 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -42,10 +42,15 @@ following incompatible changes: - Redis now binds to 127.0.0.1 only instead of listening to all network interfaces. This is the default + Redis now binds to 127.0.0.1 only instead of listening to all network interfaces. This is the default behavior of Redis 3.2 + + Gitlab's maintainence script gitlab-runner was removed and split up into the more clearer + gitlab-run and gitlab-rake scripts because gitlab-runner is a component of Gitlab CI. + + diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 46af78d58a1..ac2e94c25c3 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -106,20 +106,22 @@ let unicornConfig = builtins.readFile ./defaultUnicornConfig.rb; - gitlab-runner = pkgs.stdenv.mkDerivation rec { - name = "gitlab-runner"; + gitlab-rake = pkgs.stdenv.mkDerivation rec { + name = "gitlab-rake"; buildInputs = [ cfg.packages.gitlab cfg.packages.gitlab.env pkgs.makeWrapper ]; phases = "installPhase fixupPhase"; buildPhase = ""; installPhase = '' mkdir -p $out/bin - makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-runner \ + makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ --set PATH '${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' - ''; + makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \ + --add-flags "exec rake" + ''; }; smtpSettings = pkgs.writeText "gitlab-smtp-settings.rb" '' @@ -331,7 +333,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.git gitlab-runner cfg.packages.gitlab-shell ]; + environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ]; assertions = [ { assertion = cfg.databasePassword != ""; @@ -480,14 +482,14 @@ in { touch "${cfg.statePath}/db-created" # The gitlab:setup task is horribly broken somehow, these two tasks will do the same for setting up the initial database - ${gitlab-runner}/bin/gitlab-runner exec rake db:migrate RAILS_ENV=production - ${gitlab-runner}/bin/gitlab-runner exec rake db:seed_fu RAILS_ENV=production \ + ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production + ${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \ GITLAB_ROOT_PASSWORD="${cfg.initialRootPassword}" GITLAB_ROOT_EMAIL="${cfg.initialRootEmail}"; fi fi # Always do the db migrations just to be sure the database is up-to-date - ${gitlab-runner}/bin/gitlab-runner exec rake db:migrate RAILS_ENV=production + ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production # Change permissions in the last step because some of the # intermediary scripts like to create directories as root. diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index b630fe42113..30bc39d2568 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -80,21 +80,21 @@ options for the services.gitlab module.
Maintenance -You can run all Gitlab related commands like rake tasks with -gitlab-runner which will be available on the system -when gitlab is enabled. You will have to run the commands as the user that -you configured to run gitlab. +You can run Gitlab's rake tasks with gitlab-rake +which will be available on the system when gitlab is enabled. You will +have to run the command as the user that you configured to run gitlab +with. -For instance, to backup a Gitlab instance: +For example, to backup a Gitlab instance: -$ sudo -u git -H gitlab-runner exec rake gitlab:backup:create +$ sudo -u git -H gitlab-rake gitlab:backup:create A list of all availabe rake tasks can be obtained by running: -$ sudo -u git -H gitlab-runner exec rake -T +$ sudo -u git -H gitlab-rake -T From 8a8971788c47f4b2f5173cd5b71082fdfd79bf49 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 4 Aug 2016 02:23:08 +0200 Subject: [PATCH 078/168] gitlab module: update documentation --- nixos/modules/services/misc/gitlab.xml | 49 +++++++++++++------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index 30bc39d2568..a8147b3a74f 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -14,29 +14,22 @@ /run/gitlab/gitlab-workhorse.socket. You need to configure a webserver to proxy HTTP requests to the socket. -For instance, this could be used for Nginx: +For instance, the following configuration could be used to use nginx as + frontend proxy: -services.nginx.httpConfig = '' - server { - server_name git.example.com; - listen 443 ssl spdy; - listen [::]:443 ssl spdy; - - ssl_certificate /var/lib/acme/git.example.com/fullchain.pem; - ssl_certificate_key /var/lib/acme/git.example.com/key.pem; - - location / { - proxy_http_version 1.1; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Ssl on; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_pass http://unix:/run/gitlab/gitlab-workhorse.socket; - } - } + services.nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + virtualHosts."git.example.com" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + }; + }; ''; @@ -49,10 +42,10 @@ services.nginx.httpConfig = '' both services. In the case of PostgreSQL, a database and a role will be created. -The default state dir is /var/gitlab/state. This is where all data like -the repositories and uploads will be stored. +The default state dir is /var/gitlab/state. This is where +all data like the repositories and uploads will be stored. -A basic configuration could look like this: +A basic configuration with some custom settings could look like this: services.gitlab = { @@ -64,8 +57,16 @@ services.gitlab = { port = 443; user = "git"; group = "git"; + smtp = { + enable = true; + address = "localhost"; + port = 25; + }; extraConfig = { gitlab = { + email_from = "gitlab-no-reply@example.com"; + email_display_name = "Example GitLab"; + email_reply_to = "gitlab-no-reply@example.com"; default_projects_features = { builds = false; }; }; }; From 942aad7489605cb86c1f06720f6c0129160f33f5 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Wed, 3 Aug 2016 22:07:19 -0400 Subject: [PATCH 079/168] mosh: remove boost dependency boost was removed from the mosh dependency requirements in 2012. (It was only used from February and April 2012.) --- pkgs/tools/networking/mosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 80feeafdbca..9a7737e0195 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty +{ stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty , makeWrapper, perl, openssl, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s"; }; - buildInputs = [ autoreconfHook boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; + buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; patches = [ # remove automake detection macro patch on next release as it is already on mosh master From 78e5e61bbecf79cf85469b3fbbf381b6cc0b6a53 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 4 Aug 2016 00:21:12 -0400 Subject: [PATCH 080/168] Update google-chrome versions The previous download links were all broken. Stable: 51.0.2704.103 -> 52.0.2743.116 Beta: 52.0.2743.41 -> 53.0.2785.34 Dev: 53.0.2767.4 -> 54.0.2816.0 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 55cc35c2592..d7b9c74130b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "00dll63b3z1ijj60m0h8y2ydmkf91hyr6h98rqp21w11c2xbwzis"; - sha256bin64 = "1cdfvi5af18mlhn2ax3shsdm4p4jkhs29v3d2gmkyldfvvixh3zc"; - version = "52.0.2743.41"; + sha256 = "0brpkjg1rcq8c0h5hnzqg3bg4jj805dph67zzramlcvbr44a06r6"; + sha256bin64 = "0zqa40xz0v715ggb1g2hc2085k65m24mf8xl1n2fzj7k21hf7bkc"; + version = "53.0.2785.34"; }; dev = { - sha256 = "1pzcabdk7d9p4sc8wdpwvji9xvblsihpimnjh6n2jz5al9sm1q8j"; - sha256bin64 = "0k84hy4sj03h5bjciigagr83qf7yss22vj21fivgkvgasdmd12m8"; - version = "53.0.2767.4"; + sha256 = "1c73jfy11l4qiy553a3lvmd8kb29i25az6i5a4azmfc1abriwhjn"; + sha256bin64 = "06r53fnwp8v5drh3ilplqbwcak954gcgclc8mqq3mlx5530fp6fv"; + version = "54.0.2816.0"; }; stable = { - sha256 = "0aypf5lhi2l7cn41xhq2ck6bjblapwv26nygvg2883hhqinmnwvn"; - sha256bin64 = "1c1796sd82l480xjdw7w46867w2phw3ng2dvdb6njsvpg299chi8"; - version = "51.0.2704.103"; + sha256 = "00d16yr8d9280b2rcjmjxkqvdzgy6a7l7fmnsjrj8404vcgax551"; + sha256bin64 = "0knlxgcv3wfvpgysaxb83agmp88n4ljmyx40j4r8wb5cisnl6cs8"; + version = "52.0.2743.116"; }; } From 37aff96daf96ff84af9ab3a5a1b4a7f6f0144933 Mon Sep 17 00:00:00 2001 From: Erik Rybakken Date: Thu, 4 Aug 2016 10:21:48 +0200 Subject: [PATCH 081/168] ripser: init at 1.0 (#17481) --- .../science/math/ripser/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/applications/science/math/ripser/default.nix diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix new file mode 100644 index 00000000000..7f94b7408a1 --- /dev/null +++ b/pkgs/applications/science/math/ripser/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchurl, fetchFromGitHub +, assembleReductionMatrix ? false +, useCoefficients ? false +, indicateProgress ? false +, useGoogleHashmap ? false, sparsehash ? null +, fileFormat ? "lowerTriangularCsv" +}: + +with stdenv.lib; + +assert elem fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; +assert useGoogleHashmap -> sparsehash != null; + +let + inherit (stdenv.lib) optional; +in +stdenv.mkDerivation { + name = "ripser"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "Ripser"; + repo = "ripser"; + rev = "f69c6af6ca6883dd518c48faf41cf8901c379598"; + sha256 = "1mw2898s7l29hgajsaf75bs9bjn2sn4g2mvmh41a602jpwp9r0rz"; + }; + + #Patch from dev branch to make compilation work. + #Will be removed when it gets merged into master. + patches = [(fetchurl { + url = https://github.com/Ripser/ripser/commit/dc78d8ce73ee35f3828f0aad67a4e53620277ebf.patch; + sha256 = "1y93aqpqz8fm1cxxrf90dhh67im3ndkr8dnxgbw5y96296n4r924"; + })]; + + buildInputs = optional useGoogleHashmap sparsehash; + + buildFlags = [ + "-std=c++11" + "-Ofast" + "-D NDEBUG" + ] + ++ optional assembleReductionMatrix "-D ASSEMBLE_REDUCTION_MATRIX" + ++ optional useCoefficients "-D USE_COEFFICIENTS" + ++ optional indicateProgress "-D INDICATE_PROGRESS" + ++ optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP" + ++ optional (fileFormat == "lowerTriangularCsv") "-D FILE_FORMAT_LOWER_TRIANGULAR_CSV" + ++ optional (fileFormat == "upperTriangularCsv") "-D FILE_FORMAT_UPPER_TRIANGULAR_CSV" + ++ optional (fileFormat == "dipha") "-D FILE_FORMAT_DIPHA" + ; + + buildPhase = "c++ ripser.cpp -o ripser $buildFlags"; + + installPhase = '' + mkdir -p $out/bin + cp ripser $out/bin + ''; + + meta = { + description = "A lean C++ code for the computation of Vietoris–Rips persistence barcodes"; + homepage = "https://github.com/Ripser/ripser"; + license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [erikryb]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab6296fb42..747a53ddcc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14451,6 +14451,8 @@ in ricochet = qt55.callPackage ../applications/networking/instant-messengers/ricochet { }; + ripser = callPackage ../applications/science/math/ripser { }; + rkt = callPackage ../applications/virtualization/rkt { }; rofi = callPackage ../applications/misc/rofi { }; From c4cba0e51f9db45b3faee55e8a5ed6d63c227f92 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 19 Jun 2016 17:19:31 +0800 Subject: [PATCH 082/168] ssh module: ignore exit code when socket activated sshd will at times fail when exiting. When socket activated, this will leave a number of sshd@ service instances in the failed state, so we simply ignore the error code if we are running socket activated. Recommended by upstream: http://systemd-devel.freedesktop.narkive.com/d0eapMCG/socket-activated-sshd-service-showing-up-as-a-failure-when-the-client-connection-fails Fixes: #3279 --- nixos/modules/services/networking/ssh/sshd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index a464733a6a0..f900ef494ab 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -263,6 +263,7 @@ in serviceConfig = { ExecStart = + (optionalString cfg.startWhenNeeded "-") + "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}"; KillMode = "process"; From ea9d390c1af028dcb8dfc630095ae7caafeba135 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 4 Aug 2016 09:12:21 +0000 Subject: [PATCH 083/168] Update spotify (cherry picked from commit 25e68f79e6f30823ac413289b80754a95917b421) --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index e9c1d7d8119..019063f7a70 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.32.96.g3c8a06e6-37"; + version = "1.0.33.106.g60b5d1f0-22"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0nk5sf3x9vf5ivm035h7rnjx0wvqlvii1i2mwvv50h86wmc25iih"; + sha256 = "1hr127wnd45pyqj7j6dzinj2rcqjmv5gr26i9g43r6qp5cw1fc0f"; }; buildInputs = [ dpkg makeWrapper ]; From 20e4e2f9eb46bd13f0da34f8a680d30e1266217d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 4 Aug 2016 07:31:55 -0300 Subject: [PATCH 084/168] tint2: 0.12.11 -> 0.12.12 --- pkgs/applications/misc/tint2/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 163c4a60eba..40810adbbdc 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, pango, cairo, glib -, pcre , imlib2, libXinerama , libXrender, libXcomposite, libXdamage, libX11 -, libXrandr, gtk, libpthreadstubs , libXdmcp, librsvg -, libstartup_notification, hicolor_icon_theme, wrapGAppsHook +{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre +, glib , imlib2, gtk, libXinerama , libXrender, libXcomposite, libXdamage +, libX11 , libXrandr, librsvg, libpthreadstubs , libXdmcp +, libstartup_notification , hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "0.12.11"; + version = "0.12.12"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "0gfxbxslc8h95q7cq84a69yd7qdhyks978l3rmk48jhwwixdp0hr"; + sha256 = "0zgcdancsna95sjxslack9lh8f6qnj8d5wm02891mshn2jhgins3"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; - buildInputs = [ pango cairo glib pcre imlib2 libXinerama libXrender - libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs libXdmcp - librsvg libstartup_notification hicolor_icon_theme ]; + buildInputs = [ cairo pango pcre glib imlib2 gtk libXinerama libXrender + libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs + libXdmcp libstartup_notification hicolor_icon_theme ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc $out/etc From 1d1b875a9dc7b3912a8b05e22728eb384cd8ddd8 Mon Sep 17 00:00:00 2001 From: Mounium Date: Thu, 4 Aug 2016 13:02:22 +0200 Subject: [PATCH 085/168] flat-plat: made the theme discoverable --- pkgs/misc/themes/flat-plat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix index 0956bc59b42..da28f1892df 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/flat-plat/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p $out/share/themes + mkdir -p $out/share/themes/Flat-Plat rm .gitignore COPYING README.md - cp -r . $out/share/themes + cp -r . $out/share/themes/Flat-Plat ''; meta = with stdenv.lib; { From 1f7871fa937a48b3c906602df1fcae2368ffa945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 4 Aug 2016 08:05:50 -0300 Subject: [PATCH 086/168] mate-themes: 3.20.8 -> 3.20.10 --- pkgs/desktops/mate/mate-themes/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 1984e2dbdf9..5bb7424dc6b 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,27 +1,27 @@ { stdenv, fetchurl, pkgconfig, intltool, mate, gnome3, gtk2, gtk_engines, -gtk-engine-murrine, gdk_pixbuf, librsvg }: + gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { name = "mate-themes-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = gnome3.version; minor-ver = { - "3.18" = "2"; - "3.20" = "8"; + "3.18" = "3"; + "3.20" = "10"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.18" = "1yy22nk450wsx0mlsvdalkyj41mijlvy8s6kifh98d4dnk8dvgfj"; - "3.20" = "14jl3mbhzm7k2ilp8nmdwy9wrbmc7mbg2i0arf479xs2h7dz06f6"; + "3.18" = "09vglvjnjnm95wxw5b7pn6rf5xrr3nfyqs5c3y1c72z4p3w8qqn5"; + "3.20" = "0bhhidip8qbsq69a9n0dmxfryhvzngiy59vnms6xhya9n7y19hci"; }."${major-ver}"; }; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gtk-engine-murrine - gdk_pixbuf librsvg ]; + gdk_pixbuf librsvg ]; meta = { description = "A set of themes from MATE"; From 8f52a0f926cd8c3f8f6e24173b6c66eae5bcb5dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 30 Jul 2016 13:34:48 +0200 Subject: [PATCH 087/168] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v2.0-22-ga83e456 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/07ee4666b6ade40264c74c2faf28a3f72a8ac1a0 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/dfe21a3b8dec6f607d5e58a4877b47931a018f58 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/7c2bfd83dbda8289e98087cda10a5e27efb8e979 --- .../haskell-modules/configuration-lts.nix | 49 +- .../haskell-modules/hackage-packages.nix | 1755 ++++++++++++----- 2 files changed, 1358 insertions(+), 446 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index f05b2059833..3acc98754ec 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -467,6 +467,7 @@ self: super: { "HaLeX" = dontDistribute super."HaLeX"; "HaMinitel" = dontDistribute super."HaMinitel"; "HaPy" = dontDistribute super."HaPy"; + "HaRe" = doDistribute super."HaRe_0_8_2_3"; "HaTeX-meta" = dontDistribute super."HaTeX-meta"; "HaTeX-qq" = dontDistribute super."HaTeX-qq"; "HaVSA" = dontDistribute super."HaVSA"; @@ -1755,6 +1756,7 @@ self: super: { "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; "cascading" = dontDistribute super."cascading"; "case-conversion" = dontDistribute super."case-conversion"; + "case-insensitive-match" = dontDistribute super."case-insensitive-match"; "cash" = dontDistribute super."cash"; "casing" = dontDistribute super."casing"; "casr-logbook" = dontDistribute super."casr-logbook"; @@ -1858,7 +1860,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; + "clash-ghc" = doDistribute super."clash-ghc_0_6_21"; + "clash-lib" = doDistribute super."clash-lib_0_6_19"; + "clash-prelude" = doDistribute super."clash-prelude_0_10_10"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; + "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_7"; + "clash-verilog" = doDistribute super."clash-verilog_0_6_7"; + "clash-vhdl" = doDistribute super."clash-vhdl_0_6_15"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; @@ -2025,6 +2033,7 @@ self: super: { "console-program" = dontDistribute super."console-program"; "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; "constrained-categories" = dontDistribute super."constrained-categories"; + "constrained-dynamic" = dontDistribute super."constrained-dynamic"; "constrained-normal" = dontDistribute super."constrained-normal"; "constraint-classes" = dontDistribute super."constraint-classes"; "constructible" = dontDistribute super."constructible"; @@ -2072,6 +2081,7 @@ self: super: { "copilot-theorem" = dontDistribute super."copilot-theorem"; "copr" = dontDistribute super."copr"; "core" = dontDistribute super."core"; + "core-compiler" = dontDistribute super."core-compiler"; "core-haskell" = dontDistribute super."core-haskell"; "corebot-bliki" = dontDistribute super."corebot-bliki"; "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; @@ -2245,6 +2255,7 @@ self: super: { "data-extend-generic" = dontDistribute super."data-extend-generic"; "data-extra" = dontDistribute super."data-extra"; "data-filepath" = dontDistribute super."data-filepath"; + "data-files-gen" = dontDistribute super."data-files-gen"; "data-fin" = dontDistribute super."data-fin"; "data-fin-simple" = dontDistribute super."data-fin-simple"; "data-fix" = dontDistribute super."data-fix"; @@ -2479,6 +2490,7 @@ self: super: { "djembe" = dontDistribute super."djembe"; "djinn" = dontDistribute super."djinn"; "djinn-th" = dontDistribute super."djinn-th"; + "dlist" = doDistribute super."dlist_0_7_1_2"; "dnscache" = dontDistribute super."dnscache"; "dnsrbl" = dontDistribute super."dnsrbl"; "dnssd" = dontDistribute super."dnssd"; @@ -2720,6 +2732,7 @@ self: super: { "exception-mailer" = dontDistribute super."exception-mailer"; "exception-monads-fd" = dontDistribute super."exception-monads-fd"; "exception-monads-tf" = dontDistribute super."exception-monads-tf"; + "execs" = dontDistribute super."execs"; "exherbo-cabal" = dontDistribute super."exherbo-cabal"; "exif" = dontDistribute super."exif"; "exinst" = dontDistribute super."exinst"; @@ -2819,6 +2832,7 @@ self: super: { "fig" = dontDistribute super."fig"; "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; + "file-embed-poly" = dontDistribute super."file-embed-poly"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; "filepather" = dontDistribute super."filepather"; @@ -2948,6 +2962,7 @@ self: super: { "free-theorems-seq" = dontDistribute super."free-theorems-seq"; "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; "free-theorems-webui" = dontDistribute super."free-theorems-webui"; + "free-vector-spaces" = dontDistribute super."free-vector-spaces"; "freekick2" = dontDistribute super."freekick2"; "freer" = dontDistribute super."freer"; "freesect" = dontDistribute super."freesect"; @@ -3097,6 +3112,7 @@ self: super: { "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; "ghc-make" = dontDistribute super."ghc-make"; "ghc-man-completion" = dontDistribute super."ghc-man-completion"; + "ghc-mod" = doDistribute super."ghc-mod_5_5_0_0"; "ghc-options" = dontDistribute super."ghc-options"; "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; @@ -3545,6 +3561,7 @@ self: super: { "hakyll-convert" = dontDistribute super."hakyll-convert"; "hakyll-elm" = dontDistribute super."hakyll-elm"; "hakyll-filestore" = dontDistribute super."hakyll-filestore"; + "hakyll-ogmarkup" = dontDistribute super."hakyll-ogmarkup"; "halberd" = dontDistribute super."halberd"; "halfs" = dontDistribute super."halfs"; "halipeto" = dontDistribute super."halipeto"; @@ -3555,6 +3572,7 @@ self: super: { "hampp" = dontDistribute super."hampp"; "hamtmap" = dontDistribute super."hamtmap"; "hamusic" = dontDistribute super."hamusic"; + "handa-data" = dontDistribute super."handa-data"; "handa-gdata" = dontDistribute super."handa-gdata"; "handa-geodata" = dontDistribute super."handa-geodata"; "handa-opengl" = dontDistribute super."handa-opengl"; @@ -3675,6 +3693,7 @@ self: super: { "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; + "haskell-src-exts-simple" = dontDistribute super."haskell-src-exts-simple"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; "haskell-token-utils" = dontDistribute super."haskell-token-utils"; "haskell-tools-ast" = dontDistribute super."haskell-tools-ast"; @@ -3893,6 +3912,7 @@ self: super: { "hgeos" = dontDistribute super."hgeos"; "hgithub" = dontDistribute super."hgithub"; "hgl-example" = dontDistribute super."hgl-example"; + "hgmp" = dontDistribute super."hgmp"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; "hgrev" = dontDistribute super."hgrev"; @@ -4307,6 +4327,7 @@ self: super: { "http-proxy" = dontDistribute super."http-proxy"; "http-querystring" = dontDistribute super."http-querystring"; "http-response-decoder" = dontDistribute super."http-response-decoder"; + "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_3"; "http-server" = dontDistribute super."http-server"; "http-shed" = dontDistribute super."http-shed"; "http-test" = dontDistribute super."http-test"; @@ -4673,6 +4694,7 @@ self: super: { "karakuri" = dontDistribute super."karakuri"; "karver" = dontDistribute super."karver"; "katt" = dontDistribute super."katt"; + "kawaii" = dontDistribute super."kawaii"; "kawhi" = dontDistribute super."kawhi"; "kazura-queue" = dontDistribute super."kazura-queue"; "kbq-gu" = dontDistribute super."kbq-gu"; @@ -4715,6 +4737,8 @@ self: super: { "kit" = dontDistribute super."kit"; "kmeans-par" = dontDistribute super."kmeans-par"; "kmeans-vector" = dontDistribute super."kmeans-vector"; + "knead" = dontDistribute super."knead"; + "knead-arithmetic" = dontDistribute super."knead-arithmetic"; "knots" = dontDistribute super."knots"; "koellner-phonetic" = dontDistribute super."koellner-phonetic"; "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; @@ -5055,6 +5079,7 @@ self: super: { "lui" = dontDistribute super."lui"; "luis-client" = dontDistribute super."luis-client"; "luka" = dontDistribute super."luka"; + "luminance" = doDistribute super."luminance_0_11_0_2"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5198,6 +5223,7 @@ self: super: { "microlens" = doDistribute super."microlens_0_4_5_0"; "microlens-each" = dontDistribute super."microlens-each"; "microlens-ghc" = doDistribute super."microlens-ghc_0_4_5_0"; + "microlens-mtl" = doDistribute super."microlens-mtl_0_1_9_0"; "microlens-platform" = doDistribute super."microlens-platform_0_3_3_0"; "micrologger" = dontDistribute super."micrologger"; "microtimer" = dontDistribute super."microtimer"; @@ -5422,6 +5448,7 @@ self: super: { "mysql-effect" = dontDistribute super."mysql-effect"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; + "mystem" = dontDistribute super."mystem"; "mywatch" = dontDistribute super."mywatch"; "mzv" = dontDistribute super."mzv"; "n-m" = dontDistribute super."n-m"; @@ -5488,6 +5515,7 @@ self: super: { "netwire" = dontDistribute super."netwire"; "netwire-input" = dontDistribute super."netwire-input"; "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; + "network" = doDistribute super."network_2_6_2_1"; "network-address" = dontDistribute super."network-address"; "network-api-support" = dontDistribute super."network-api-support"; "network-bitcoin" = dontDistribute super."network-bitcoin"; @@ -5555,6 +5583,7 @@ self: super: { "nofib-analyze" = dontDistribute super."nofib-analyze"; "noise" = dontDistribute super."noise"; "non-empty" = dontDistribute super."non-empty"; + "non-empty-sequence" = dontDistribute super."non-empty-sequence"; "non-negative" = dontDistribute super."non-negative"; "nondeterminism" = dontDistribute super."nondeterminism"; "nonempty-alternative" = dontDistribute super."nonempty-alternative"; @@ -5614,6 +5643,7 @@ self: super: { "oden-go-packages" = dontDistribute super."oden-go-packages"; "oeis" = dontDistribute super."oeis"; "off-simple" = dontDistribute super."off-simple"; + "ogmarkup" = dontDistribute super."ogmarkup"; "ohloh-hs" = dontDistribute super."ohloh-hs"; "oi" = dontDistribute super."oi"; "oidc-client" = dontDistribute super."oidc-client"; @@ -5669,6 +5699,7 @@ self: super: { "opentheory-probability" = dontDistribute super."opentheory-probability"; "opentheory-stream" = dontDistribute super."opentheory-stream"; "opentheory-unicode" = dontDistribute super."opentheory-unicode"; + "operational" = doDistribute super."operational_0_2_3_2"; "operational-alacarte" = dontDistribute super."operational-alacarte"; "operational-extra" = dontDistribute super."operational-extra"; "opml" = dontDistribute super."opml"; @@ -5754,6 +5785,7 @@ self: super: { "parsec-numbers" = dontDistribute super."parsec-numbers"; "parsec-parsers" = dontDistribute super."parsec-parsers"; "parsec-permutation" = dontDistribute super."parsec-permutation"; + "parsec-pratt" = dontDistribute super."parsec-pratt"; "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; "parsec-trace" = dontDistribute super."parsec-trace"; "parsec-utils" = dontDistribute super."parsec-utils"; @@ -5907,6 +5939,7 @@ self: super: { "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; + "pipes-protolude" = dontDistribute super."pipes-protolude"; "pipes-random" = dontDistribute super."pipes-random"; "pipes-rt" = dontDistribute super."pipes-rt"; "pipes-s3" = dontDistribute super."pipes-s3"; @@ -6120,6 +6153,7 @@ self: super: { "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; "psqueues" = doDistribute super."psqueues_0_2_2_1"; + "pstemmer" = dontDistribute super."pstemmer"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20160522"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6224,6 +6258,7 @@ self: super: { "radium-formula-parser" = dontDistribute super."radium-formula-parser"; "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; + "raft" = dontDistribute super."raft"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; "rake" = dontDistribute super."rake"; @@ -6374,6 +6409,7 @@ self: super: { "relational-record-examples" = dontDistribute super."relational-record-examples"; "relative-date" = dontDistribute super."relative-date"; "relit" = dontDistribute super."relit"; + "reload" = dontDistribute super."reload"; "rematch-text" = dontDistribute super."rematch-text"; "remote" = dontDistribute super."remote"; "remote-debugger" = dontDistribute super."remote-debugger"; @@ -6670,6 +6706,8 @@ self: super: { "serv-wai" = dontDistribute super."serv-wai"; "servant-aeson-specs" = dontDistribute super."servant-aeson-specs"; "servant-auth-cookie" = dontDistribute super."servant-auth-cookie"; + "servant-auth-token" = dontDistribute super."servant-auth-token"; + "servant-auth-token-api" = dontDistribute super."servant-auth-token-api"; "servant-csharp" = dontDistribute super."servant-csharp"; "servant-ede" = dontDistribute super."servant-ede"; "servant-elm" = dontDistribute super."servant-elm"; @@ -6677,6 +6715,7 @@ self: super: { "servant-github" = dontDistribute super."servant-github"; "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; + "servant-matrix-param" = dontDistribute super."servant-matrix-param"; "servant-pandoc" = dontDistribute super."servant-pandoc"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; @@ -6808,6 +6847,7 @@ self: super: { "simseq" = dontDistribute super."simseq"; "simtreelo" = dontDistribute super."simtreelo"; "sindre" = dontDistribute super."sindre"; + "singleton-bool" = dontDistribute super."singleton-bool"; "singleton-nats" = dontDistribute super."singleton-nats"; "singletons" = doDistribute super."singletons_2_0_1"; "sink" = dontDistribute super."sink"; @@ -7357,6 +7397,7 @@ self: super: { "text-utf7" = dontDistribute super."text-utf7"; "text-xml-generic" = dontDistribute super."text-xml-generic"; "text-xml-qq" = dontDistribute super."text-xml-qq"; + "text-zipper" = doDistribute super."text-zipper_0_4"; "text-zipper-monad" = dontDistribute super."text-zipper-monad"; "text1" = dontDistribute super."text1"; "textPlot" = dontDistribute super."textPlot"; @@ -7490,6 +7531,7 @@ self: super: { "total-maps" = dontDistribute super."total-maps"; "touched" = dontDistribute super."touched"; "toysolver" = dontDistribute super."toysolver"; + "tpar" = dontDistribute super."tpar"; "tpdb" = dontDistribute super."tpdb"; "trace" = dontDistribute super."trace"; "trace-call" = dontDistribute super."trace-call"; @@ -7616,6 +7658,7 @@ self: super: { "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; "type-prelude" = dontDistribute super."type-prelude"; "type-settheory" = dontDistribute super."type-settheory"; + "type-spec" = dontDistribute super."type-spec"; "type-spine" = dontDistribute super."type-spine"; "type-structure" = dontDistribute super."type-structure"; "type-sub-th" = dontDistribute super."type-sub-th"; @@ -7630,7 +7673,6 @@ self: super: { "typelevel-tensor" = dontDistribute super."typelevel-tensor"; "typeof" = dontDistribute super."typeof"; "typeparams" = dontDistribute super."typeparams"; - "typerbole" = dontDistribute super."typerbole"; "typesafe-endian" = dontDistribute super."typesafe-endian"; "typescript-docs" = dontDistribute super."typescript-docs"; "typical" = dontDistribute super."typical"; @@ -7855,6 +7897,7 @@ self: super: { "waddle" = dontDistribute super."waddle"; "wai-accept-language" = dontDistribute super."wai-accept-language"; "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; + "wai-app-static" = doDistribute super."wai-app-static_3_1_5"; "wai-devel" = dontDistribute super."wai-devel"; "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; "wai-dispatch" = dontDistribute super."wai-dispatch"; @@ -7885,9 +7928,11 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; "wai-middleware-verbs" = doDistribute super."wai-middleware-verbs_0_2_0"; + "wai-predicates" = doDistribute super."wai-predicates_0_8_6"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; "wai-router" = dontDistribute super."wai-router"; + "wai-routing" = doDistribute super."wai-routing_0_12_3"; "wai-session-alt" = dontDistribute super."wai-session-alt"; "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; "wai-session-mysql" = dontDistribute super."wai-session-mysql"; @@ -7897,9 +7942,11 @@ self: super: { "wai-test" = dontDistribute super."wai-test"; "wai-thrift" = dontDistribute super."wai-thrift"; "wai-throttler" = dontDistribute super."wai-throttler"; + "wai-websockets" = doDistribute super."wai-websockets_3_0_0_9"; "wait-handle" = dontDistribute super."wait-handle"; "waitfree" = dontDistribute super."waitfree"; "warc" = dontDistribute super."warc"; + "warp" = doDistribute super."warp_3_2_7"; "warp-dynamic" = dontDistribute super."warp-dynamic"; "warp-static" = dontDistribute super."warp-static"; "warp-tls-uid" = dontDistribute super."warp-tls-uid"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dff47c509f9..a3c87a5ef9a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7101,15 +7101,17 @@ self: { }) {inherit (pkgs) fuse;}; "HGE2D" = callPackage - ({ mkDerivation, base, GLUT, OpenGL, safe, time }: + ({ mkDerivation, base, GLUT, hspec, OpenGL, QuickCheck, safe, time + }: mkDerivation { pname = "HGE2D"; - version = "0.1.9.0"; - sha256 = "59777250da5b74324c92fb7b2c9a306f2be670877eb32655e0d844690f9b09c4"; + version = "0.1.9.2"; + sha256 = "7b19fae05b9e60c03244f80abd46865ac7387f8fdb8ddadf24a199f44f507c65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLUT OpenGL safe time ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/I3ck/HGE2D"; description = "2D game engine written in Haskell"; license = stdenv.lib.licenses.mit; @@ -8466,7 +8468,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "HaRe" = callPackage + "HaRe_0_8_2_3" = callPackage ({ mkDerivation, array, base, Cabal, cabal-helper, containers , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit @@ -8508,6 +8510,52 @@ self: { homepage = "https://github.com/RefactoringTools/HaRe/wiki"; description = "the Haskell Refactorer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HaRe" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-helper, containers + , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod + , ghc-paths, ghc-prim, ghc-syb-utils, gitrev, hslogger, hspec + , HUnit, monad-control, monoid-extras, mtl, old-time + , optparse-applicative, optparse-simple, parsec, pretty, process + , QuickCheck, rosezipper, semigroups, silently + , Strafunski-StrategyLib, stringbuilder, syb, syz, time + , transformers, transformers-base + }: + mkDerivation { + pname = "HaRe"; + version = "0.8.3.0"; + sha256 = "11e302f5379fe88aa8740a886f321e3e14c29b0b39417ab0621f3a070c1edcd2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal cabal-helper containers directory filepath ghc + ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger + monad-control monoid-extras mtl old-time pretty rosezipper + semigroups Strafunski-StrategyLib syb syz time transformers + transformers-base + ]; + executableHaskellDepends = [ + array base Cabal cabal-helper containers directory filepath ghc + ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils gitrev + hslogger monad-control monoid-extras mtl old-time + optparse-applicative optparse-simple parsec pretty rosezipper + semigroups Strafunski-StrategyLib syb syz time transformers + transformers-base + ]; + testHaskellDepends = [ + base Cabal cabal-helper containers deepseq Diff directory filepath + ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils + hslogger hspec HUnit monad-control monoid-extras mtl old-time + process QuickCheck rosezipper semigroups silently + Strafunski-StrategyLib stringbuilder syb syz time transformers + transformers-base + ]; + doCheck = false; + homepage = "https://github.com/RefactoringTools/HaRe/wiki"; + description = "the Haskell Refactorer"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; @@ -19655,6 +19703,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "active_0_2_0_11" = callPackage + ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids + , semigroups, vector + }: + mkDerivation { + pname = "active"; + version = "0.2.0.11"; + sha256 = "0305aefae4d0cecb0854536b1d2f3c9dc8f88eadb344f3684070538b3a3e4e18"; + libraryHaskellDepends = [ + base lens linear semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base lens linear QuickCheck semigroupoids semigroups vector + ]; + jailbreak = true; + description = "Abstractions for animation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "activehs" = callPackage ({ mkDerivation, activehs-base, array, base, blaze-html, bytestring , cmdargs, containers, data-pprint, deepseq, dia-base @@ -20215,15 +20283,15 @@ self: { "aeson-injector" = callPackage ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens - , QuickCheck, quickcheck-text, swagger2, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers + , QuickCheck, quickcheck-text, servant-docs, swagger2, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers }: mkDerivation { pname = "aeson-injector"; - version = "1.0.2.0"; - sha256 = "7944a3e56660d83774adafa78a4f3e740af714b0dd6e32f98c87a668ca12bec1"; + version = "1.0.3.0"; + sha256 = "218676310c07f9286df1df9bd1c38bbbf599ab4a825c1980acb0f8555d54e2e5"; libraryHaskellDepends = [ - aeson base bifunctors deepseq lens swagger2 text + aeson base bifunctors deepseq lens servant-docs swagger2 text unordered-containers ]; testHaskellDepends = [ @@ -26243,10 +26311,9 @@ self: { ({ mkDerivation, attoparsec, base, text }: mkDerivation { pname = "attoparsec-csv"; - version = "0.1.0.1"; - sha256 = "1be03800c7f8fcfade041affd567716f4102984464e068f5ec2ddb834c7a017e"; + version = "0.1.1.0"; + sha256 = "f7f8436b8d5bc5f846c6cb25041768bdbb4fb6d9d8be66af481144a885787f39"; libraryHaskellDepends = [ attoparsec base text ]; - jailbreak = true; homepage = "https://github.com/robinbb/attoparsec-csv"; description = "A parser for CSV files that uses Attoparsec"; license = "unknown"; @@ -27027,6 +27094,7 @@ self: { resourcet tagged tasty tasty-hunit tasty-quickcheck text time transformers transformers-base ]; + doCheck = false; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -30785,8 +30853,8 @@ self: { }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.2.0"; - sha256 = "daed7af121b14dfbe493b15eb470323a17c1bf28ba330d73e8690e76f13dc8c2"; + version = "0.2.1"; + sha256 = "3085dd865c075555a8d67049840d0cd9ce66d5565d55aee48f54950354b9c72f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33770,6 +33838,7 @@ self: { QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/haskell/bytestring"; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; @@ -34576,36 +34645,6 @@ self: { }) {}; "cabal-helper" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory - , extra, filepath, ghc-prim, mtl, process, template-haskell - , temporary, transformers, unix, utf8-string - }: - mkDerivation { - pname = "cabal-helper"; - version = "0.7.1.0"; - sha256 = "7c78b875b5f246b8422b641923d2ffe593bf65ce9e99373e19ef8372df8db66f"; - revision = "2"; - editedCabalFile = "b84eff37825d78f316e9712e175937b54b35d7c67eed8741a3db160800fbd177"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process transformers - ]; - executableHaskellDepends = [ - base bytestring Cabal directory filepath ghc-prim process - template-haskell temporary transformers utf8-string - ]; - testHaskellDepends = [ - base bytestring Cabal directory extra filepath ghc-prim mtl process - template-haskell temporary transformers unix utf8-string - ]; - testToolDepends = [ cabal-install ]; - doCheck = false; - description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; - }) {}; - - "cabal-helper_0_7_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory , extra, filepath, ghc-prim, mtl, process, template-haskell , temporary, transformers, unix, utf8-string @@ -34631,7 +34670,6 @@ self: { doCheck = false; description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-info" = callPackage @@ -36411,6 +36449,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "case-insensitive-match" = callPackage + ({ mkDerivation, base, bytestring, mtl, QuickCheck, text }: + mkDerivation { + pname = "case-insensitive-match"; + version = "0.1.1.0"; + sha256 = "4f5003124b840d05d60e0256d18ae25aa4d5fd78d106c821f26687392adba437"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring text ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring mtl QuickCheck text ]; + homepage = "https://github.com/mikehat/case-insensitive-match"; + description = "A simplified, faster way to do case-insensitive matching"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cased" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -38662,7 +38716,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc" = callPackage + "clash-ghc_0_6_21" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra @@ -38687,10 +38741,38 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-ghc" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib + , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl + , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra + , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl + , process, text, time, transformers, unbound-generics, unix + , unordered-containers + }: + mkDerivation { + pname = "clash-ghc"; + version = "0.6.22"; + sha256 = "26fabe321e4f27974428672d69e39699368674978559242ea28699bd76d35e4d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-verilog clash-vhdl containers deepseq + directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise + hashable haskeline lens mtl process text time transformers + unbound-generics unix unordered-containers + ]; + jailbreak = true; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "clash-lib" = callPackage + "clash-lib_0_6_19" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process @@ -38711,9 +38793,33 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-prelude" = callPackage + "clash-lib" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process + , template-haskell, text, time, transformers, unbound-generics + , unordered-containers, uu-parsinglib, wl-pprint-text + }: + mkDerivation { + pname = "clash-lib"; + version = "0.6.20"; + sha256 = "93e5c409bf5bcc27a2623876c53a7123ed5bbb5c9b0839a6bca406b5823b8304"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clash-prelude concurrent-supply + containers deepseq directory errors fgl filepath ghc hashable + integer-gmp lens mtl pretty process template-haskell text time + transformers unbound-generics unordered-containers uu-parsinglib + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "clash-prelude_0_10_10" = callPackage ({ mkDerivation, array, base, data-default, doctest, ghc-prim , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens , QuickCheck, reflection, singletons, template-haskell @@ -38728,6 +38834,28 @@ self: { singletons template-haskell ]; testHaskellDepends = [ base doctest ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-prelude" = callPackage + ({ mkDerivation, array, base, data-default, deepseq, doctest + , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise + , integer-gmp, lens, QuickCheck, reflection, singletons + , template-haskell + }: + mkDerivation { + pname = "clash-prelude"; + version = "0.10.11"; + sha256 = "6b502cd0ceceee1f61d9150f29453b17246e128d5a6d5b21eeb301095351a627"; + libraryHaskellDepends = [ + array base data-default deepseq ghc-prim ghc-typelits-extra + ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection + singletons template-haskell + ]; + testHaskellDepends = [ base doctest ]; doCheck = false; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; @@ -38747,7 +38875,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "clash-systemverilog" = callPackage + "clash-systemverilog_0_6_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -38762,9 +38890,27 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-verilog" = callPackage + "clash-systemverilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.6.8"; + sha256 = "2d8847467c0c6e0d20125c36c806f6fbd7e39ccf38fbb50572e76f5399010a28"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "clash-verilog_0_6_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: @@ -38779,6 +38925,42 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "clash-verilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-verilog"; + version = "0.6.8"; + sha256 = "3f7ba6a32c6313c55e856038a13b214f51d9084a273209692323700ee2ee2ce3"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - Verilog backend"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "clash-vhdl_0_6_15" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.6.15"; + sha256 = "9472699b6d62804093a2dea8b49da573b750c326963ff9dc4cf1ef2bfde521a8"; + libraryHaskellDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - VHDL backend"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-vhdl" = callPackage @@ -38787,8 +38969,8 @@ self: { }: mkDerivation { pname = "clash-vhdl"; - version = "0.6.15"; - sha256 = "9472699b6d62804093a2dea8b49da573b750c326963ff9dc4cf1ef2bfde521a8"; + version = "0.6.16"; + sha256 = "42f4be26a545144c0e950c2a0b3d59516e93e73ed2c6d32d3c449e233d32b0c8"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -39582,8 +39764,8 @@ self: { }: mkDerivation { pname = "cloud-haskell"; - version = "0.2.0.0"; - sha256 = "0698fe456337b7ebe084d5e980d8e322392ca0dd4f336a9de67eefe1fec92286"; + version = "0.3.0.0"; + sha256 = "d7ca57607e3f802eea1c86efbcf8e7805281ec716bc5cfc5758ea0ddedab48e7"; libraryHaskellDepends = [ distributed-process distributed-process-async distributed-process-client-server distributed-process-execution @@ -39592,7 +39774,6 @@ self: { rank1dynamic ]; doHaddock = false; - jailbreak = true; homepage = "http://github.com/haskell-distributed/cloud-haskell"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -40512,12 +40693,14 @@ self: { }) {}; "colonnade" = callPackage - ({ mkDerivation, base, contravariant, vector }: + ({ mkDerivation, base, bytestring, contravariant, text, vector }: mkDerivation { pname = "colonnade"; - version = "0.3"; - sha256 = "eab23a4fc5a24b3ab1c40254a63ccfdacf19c59fdead79258ee58e2d42f111c7"; - libraryHaskellDepends = [ base contravariant vector ]; + version = "0.4"; + sha256 = "110c695a853da086472ce1126db36f15eac0f5d8b43b5451d8ff63200a921699"; + libraryHaskellDepends = [ + base bytestring contravariant text vector + ]; homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Generic types and functions for columnar encoding and decoding"; license = stdenv.lib.licenses.bsd3; @@ -42204,14 +42387,12 @@ self: { }) {}; "config-value" = callPackage - ({ mkDerivation, alex, array, base, happy, pretty, text - , transformers - }: + ({ mkDerivation, alex, array, base, happy, pretty, text }: mkDerivation { pname = "config-value"; - version = "0.4.0.2"; - sha256 = "214481f20acac05b7a67dad3ce11b0965b19429c4ddb95ed1f869caffaaefc57"; - libraryHaskellDepends = [ array base pretty text transformers ]; + version = "0.5"; + sha256 = "2a2d825c1f23516c64d5ca6b587951b80be44006c09832177e61cfc0743692fa"; + libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; homepage = "https://github.com/glguy/config-value"; description = "Simple, layout-based value language similar to YAML or JSON"; @@ -42224,6 +42405,8 @@ self: { pname = "config-value-getopt"; version = "0.1.0.0"; sha256 = "00b65bcf60b26f7004665f183d7114dfb6380230c2f50e093403ca8a74bfaccb"; + revision = "1"; + editedCabalFile = "bcabc9ce380b21989fc45664b654c2cf1474bd3dc4caa1a7961f8d1181fbd49b"; libraryHaskellDepends = [ base config-value text ]; homepage = "https://github.com/GaloisInc/config-value-getopt"; description = "Interface between config-value and System.GetOpt"; @@ -42518,6 +42701,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "constrained-dynamic" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit }: + mkDerivation { + pname = "constrained-dynamic"; + version = "0.1.0.0"; + sha256 = "20952857c40fcb730584000d2a98e6a89f9f457b86e5e035ae055b40919c8f49"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Dynamic typing with retained constraints"; + license = stdenv.lib.licenses.mit; + }) {}; + "constrained-normal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -43492,6 +43687,26 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "core-compiler" = callPackage + ({ mkDerivation, alex, array, base, containers, happy, text + , unordered-containers + }: + mkDerivation { + pname = "core-compiler"; + version = "0.1.0.0"; + sha256 = "06fe348263225cf8410f59b848e2f91ee1618735cde87ac0ec2989b76af8072e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers text unordered-containers + ]; + executableHaskellDepends = [ array base ]; + executableToolDepends = [ alex happy ]; + homepage = "https://github.com/aneksteind/Core#readme"; + description = "compile your own mini functional language with Core"; + license = stdenv.lib.licenses.mit; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -47367,6 +47582,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-files-gen" = callPackage + ({ mkDerivation, base, containers, data-default, directory + , filepath, hspec + }: + mkDerivation { + pname = "data-files-gen"; + version = "0.0.0.1"; + sha256 = "8da5e450dce9d20d31014d107c9359e00544bda02b13cc2f31b4277a6b5d23de"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default directory filepath + ]; + executableHaskellDepends = [ base containers data-default ]; + testHaskellDepends = [ base containers data-default hspec ]; + homepage = "https://github.com/JPMoresmau/data-files-gen#readme"; + description = "Generate data-files Cabal file field from existing files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-fin" = callPackage ({ mkDerivation, base, lazysmallcheck, prelude-safeenum, QuickCheck , reflection, smallcheck, tagged @@ -49200,12 +49435,12 @@ self: { ({ mkDerivation, base, doctest, mtl, QuickCheck }: mkDerivation { pname = "decimal-arithmetic"; - version = "0.2.0.0"; - sha256 = "a9092bfd2ee11e744dccfd7c9f4e90c24efafa98eaa285ebb8f2f0fa46fb257c"; + version = "0.4.0.0"; + sha256 = "b632462fcc18b8b6f4f0eb21b2b29c6075f7335dcad1ddb1a268264c513b4d0f"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/verement/decimal-arithmetic#readme"; - description = "An implementation of Mike Cowlishaw's General Decimal Arithmetic Specification"; + description = "An implementation of the General Decimal Arithmetic Specification"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52720,7 +52955,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "dlist" = callPackage + "dlist_0_7_1_2" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; @@ -52731,9 +52966,10 @@ self: { homepage = "https://github.com/spl/dlist"; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dlist_0_8_0_1" = callPackage + "dlist" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; @@ -52742,10 +52978,10 @@ self: { libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; jailbreak = true; + doCheck = false; homepage = "https://github.com/spl/dlist"; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dlist-instances" = callPackage @@ -53230,8 +53466,8 @@ self: { ({ mkDerivation, base, impure-containers, text }: mkDerivation { pname = "dot"; - version = "0.2.0"; - sha256 = "58d5e5d0848f3fa255d61a48a98e005d0c460088d6e5dc6b160ec4f0e50bb25d"; + version = "0.2.2"; + sha256 = "438175f3d74ef9770cba1a7148ddb7311e1ea53a19dc467cd8ee995ad73e9b48"; libraryHaskellDepends = [ base impure-containers text ]; homepage = "https://github.com/andrewthad/dot#readme"; description = "Data types and encoding for graphviz dot files"; @@ -54419,13 +54655,12 @@ self: { }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.8"; - sha256 = "b32c42edb14b0c0e4e112981ebd7169bbce9bc546c4275fc5fda865a3fe507d2"; + version = "0.1.0.9"; + sha256 = "179f607c961865739ad0b6ba07d3e324473b4845d6173c0959e45e008b4f4a5d"; libraryHaskellDepends = [ base cairo colour either GLFW-b GLUtil OpenGL pango pipes transformers ]; - jailbreak = true; homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -56345,8 +56580,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8"; - sha256 = "518a32d95a29cb1dff49afac6235287730dd675cf6e14b9ddc17e7be53ea4e78"; + version = "0.8.1"; + sha256 = "d96f985432a78693bfd26b4881ff3a139a15ad1f7abebacc771fed3eaa90adb9"; libraryHaskellDepends = [ array base binary bytestring containers extensible-exceptions ghc-prim HaXml mtl regex-compat @@ -56639,15 +56874,12 @@ self: { ({ mkDerivation, base, containers, deepseq, template-haskell }: mkDerivation { pname = "enummapset-th"; - version = "0.6.1.0"; - sha256 = "bd7ec9fd9063dcf9c8504fe509abdd15466261ef2ba9ec62d6e6abb51e8694f6"; - revision = "1"; - editedCabalFile = "2544cf675da1fd28debde06f5d2c9747da0d8b48aa66f2374886d38333f8dc17"; + version = "0.6.1.1"; + sha256 = "7cc2028dfb41b1450be788f4b600f602965c3f7f70428c586a7ba3c97556d52a"; libraryHaskellDepends = [ base containers deepseq template-haskell ]; - jailbreak = true; - homepage = "https://github.com/liyang/enummapset-th"; + homepage = "https://github.com/tsurucapital/enummapset-th"; description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -57564,23 +57796,21 @@ self: { }) {}; "euphoria" = callPackage - ({ mkDerivation, base, containers, data-default, deepseq, elerea - , enummapset-th, hashable, HUnit, test-framework - , test-framework-hunit, test-framework-th, transformers - , unordered-containers + ({ mkDerivation, base, containers, deepseq, elerea, enummapset-th + , hashable, HUnit, test-framework, test-framework-hunit + , test-framework-th, transformers, unordered-containers }: mkDerivation { pname = "euphoria"; - version = "0.6.0.1"; - sha256 = "a92641035be6dba46d44b9c24d227ba6a5c59e19eba862e91ac883216939b4ae"; + version = "0.8.0.0"; + sha256 = "30703f7bc6063fbce127b0b1631ca4236ec59adfc2d7de436c7c5daaeafe118a"; libraryHaskellDepends = [ - base containers data-default deepseq elerea enummapset-th hashable - HUnit transformers unordered-containers + base containers deepseq elerea enummapset-th hashable HUnit + transformers unordered-containers ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit test-framework-th ]; - jailbreak = true; homepage = "http://github.com/tsurucapital/euphoria"; description = "Dynamic network FRP with events and continuous values"; license = stdenv.lib.licenses.publicDomain; @@ -58020,6 +58250,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "execs" = callPackage + ({ mkDerivation, base, directory, process, text }: + mkDerivation { + pname = "execs"; + version = "0.1.0.0"; + sha256 = "024cb1f39efb7ab8e9bf2dbd9c4ef20872faf0dc4aa39c5f2070860cd455d313"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base directory process text ]; + jailbreak = true; + homepage = "https://github.com/wapxmas/execs#readme"; + description = "Tool to run stack exec prj-exe more easy"; + license = stdenv.lib.licenses.mit; + }) {}; + "executable-hash" = callPackage ({ mkDerivation, base, bytestring, cryptohash, directory , executable-path, file-embed, template-haskell @@ -60022,11 +60268,10 @@ self: { ({ mkDerivation, base, fftw }: mkDerivation { pname = "fftwRaw"; - version = "0.1.0.0"; - sha256 = "24cf427a14bc30d6d333ad71e1e5de25497564016a1d627655322bf2c4b173b6"; + version = "0.1.0.1"; + sha256 = "dfdb8165b63b335d7736f5e28ea5c8c4450569849a157a5485b98261674545cd"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ fftw ]; - jailbreak = true; homepage = "https://github.com/adamwalker/haskell-fftw-simple"; description = "Low level bindings to FFTW"; license = stdenv.lib.licenses.bsd3; @@ -60226,6 +60471,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-embed-poly" = callPackage + ({ mkDerivation, base, bytestring, directory, file-embed, filepath + , hspec, template-haskell + }: + mkDerivation { + pname = "file-embed-poly"; + version = "0.1.0"; + sha256 = "46c80ed8670818a2f92acc81fc11306e2f32cbe27496ed360093c57aa1f3a985"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ + base bytestring directory file-embed filepath hspec + ]; + homepage = "https://github.com/sasinestro/file-embed"; + description = "Use Template Haskell to embed file contents directly"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "file-location" = callPackage ({ mkDerivation, base, containers, HUnit, lifted-base, process , template-haskell, th-orphans, transformers @@ -62952,6 +63216,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "free-vector-spaces" = callPackage + ({ mkDerivation, base, lens, linear, MemoTrie, vector-space }: + mkDerivation { + pname = "free-vector-spaces"; + version = "0.1.0.0"; + sha256 = "9b8d239b900d47869d019fb67c36f369e9ca53a8e95cdad14d00486e7992dbbc"; + libraryHaskellDepends = [ base lens linear MemoTrie vector-space ]; + homepage = "https://github.com/leftaroundabout/free-vector-spaces"; + description = "Instantiate the classes from the vector-space package with types from linear"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "free-vl" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { @@ -65308,15 +65584,15 @@ self: { }: mkDerivation { pname = "geolite-csv"; - version = "0.1.0"; - sha256 = "c7c707f20c4f2f42f842bf18485a58555dc3dd62b8ef314cc54a10f003b2baa6"; + version = "0.2"; + sha256 = "17b66c7164a2f93eb489611dde877617bf0cc1e1e995d7f502e4c71440151208"; libraryHaskellDepends = [ base colonnade ip pipes siphon text ]; testHaskellDepends = [ base colonnade directory HUnit pipes pipes-bytestring pipes-text siphon test-framework test-framework-hunit text ]; homepage = "https://github.com/andrewthad/colonnade"; - description = "Initial project template from stack"; + description = "Geolite CSV Parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -65570,6 +65846,8 @@ self: { pname = "ghc-events"; version = "0.4.4.0"; sha256 = "ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d"; + revision = "1"; + editedCabalFile = "a52145a9a2f5e75daa15fd0ecc22262a93f1213351cb37b6df84ca0a828fdc65"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65581,7 +65859,6 @@ self: { testHaskellDepends = [ array base binary bytestring containers mtl ]; - jailbreak = true; doCheck = false; description = "Library and tool for parsing .eventlog files from GHC"; license = stdenv.lib.licenses.bsd3; @@ -65754,6 +66031,7 @@ self: { monad-journal mtl optparse-applicative parsec process process-streaming safe syb transformers ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/carlohamalainen/ghc-imported-from"; description = "Find the Haddock documentation for a symbol"; @@ -65791,7 +66069,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-mod" = callPackage + "ghc-mod_5_5_0_0" = callPackage ({ mkDerivation, base, binary, bytestring, cabal-helper, containers , deepseq, directory, djinn-ghc, doctest, extra, fclabels, filepath , ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec @@ -65822,6 +66100,45 @@ self: { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-mod" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper + , containers, deepseq, directory, djinn-ghc, doctest, extra + , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils + , haskell-src-exts, hlint, hspec, monad-control, monad-journal, mtl + , old-time, optparse-applicative, pipes, pretty, process, safe + , split, syb, template-haskell, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "ghc-mod"; + version = "5.6.0.0"; + sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base Cabal containers filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + base binary bytestring cabal-helper containers deepseq directory + djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths + ghc-syb-utils haskell-src-exts hlint monad-control monad-journal + mtl old-time optparse-applicative pipes pretty process safe split + syb template-haskell temporary text time transformers + transformers-base + ]; + executableHaskellDepends = [ + base binary deepseq directory fclabels filepath ghc monad-control + mtl old-time optparse-applicative pretty process split time + ]; + testHaskellDepends = [ base doctest hspec ]; + doCheck = false; + homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; + description = "Happy Haskell Programming"; + license = stdenv.lib.licenses.agpl3; }) {}; "ghc-mtl" = callPackage @@ -66134,10 +66451,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.1.0.0"; - sha256 = "b1680ec1b8c0d687f3212b17028e199cbcb74cfdeb7810cf032b84c37db96e57"; - revision = "6"; - editedCabalFile = "36bbf66eb11f1937d0c389922c9d515705a35ec86f6a4f9ca796de0602d66df4"; + version = "0.1.1.0"; + sha256 = "bcb005e8c4ae609a75ceef344abe5b2282d23f0dc409426bda9965e02d2d4f92"; libraryHaskellDepends = [ base equational-reasoning ghc ghc-tcplugins-extra presburger reflection @@ -66426,15 +66741,15 @@ self: { }: mkDerivation { pname = "ghcjs-hplay"; - version = "0.3.2"; - sha256 = "13909a7390cc963def4ae053950f0ef8346df85c9370c2ae5a650cb4f29793f6"; + version = "0.3.4"; + sha256 = "7a3b5d91883912b0f768129cde6a89ed71ab0d3a94749fcf8b9d9197959541f8"; libraryHaskellDepends = [ base containers ghcjs-perch mtl transformers transient transient-universe ]; homepage = "https://github.com/agocorona/ghcjs-hplay"; - description = "client-side Web EDSL for transient nodes running in the Web browser"; - license = stdenv.lib.licenses.bsd3; + description = "Client-side web EDSL for transient nodes running in the web browser"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -67551,8 +67866,8 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.3.0.1"; - sha256 = "09cf582109f33e6946a7bbac3d9c123a9323cb2af18df207d65413c74b770ce8"; + version = "0.3.2.1"; + sha256 = "e0a9fd77407463537078d69c99cc5a025476b8b2881658eff30346cae35c0118"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67566,30 +67881,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "gipeda_0_3_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava - , concurrent-output, containers, directory, extra, file-embed - , filepath, gitlib, gitlib-libgit2, scientific, shake, split - , tagged, text, transformers, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "gipeda"; - version = "0.3.1"; - sha256 = "965d79f58dcad40ae67d0b4a896710a5fd81ffab163e32501ed3f5aa4f93895d"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring cassava concurrent-output containers - directory extra file-embed filepath gitlib gitlib-libgit2 - scientific shake split tagged text transformers - unordered-containers vector yaml - ]; - homepage = "https://github.com/nomeata/gipeda"; - description = "Git Performance Dashboard"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "giphy-api" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , directory, hspec, http-api-data, http-client, http-client-tls @@ -68826,25 +69117,26 @@ self: { }) {}; "glirc" = callPackage - ({ mkDerivation, array, async, attoparsec, base, bytestring - , config-value, connection, containers, data-default-class + ({ mkDerivation, async, attoparsec, base, bytestring, Cabal + , config-value, connection, containers, data-default-class, deepseq , directory, filepath, hashable, lens, memory, network, profunctors , split, stm, text, text-icu, time, tls, transformers , unordered-containers, vector, vty, x509, x509-store, x509-system }: mkDerivation { pname = "glirc"; - version = "2.1"; - sha256 = "d0bb86a2d632255bce3d23b0e7e5cefd1432b9f36d986d05030460aee0e645e8"; + version = "2.2"; + sha256 = "b543a8c1193d8f436984bf4d68cd88f9df4305f144778605b15623b470c1cd07"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; executableHaskellDepends = [ - array async attoparsec base bytestring config-value connection - containers data-default-class directory filepath hashable lens - memory network profunctors split stm text text-icu time tls - transformers unordered-containers vector vty x509 x509-store - x509-system + async attoparsec base bytestring config-value connection containers + data-default-class deepseq directory filepath hashable lens memory + network profunctors split stm text text-icu time tls transformers + unordered-containers vector vty x509 x509-store x509-system ]; + homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; license = stdenv.lib.licenses.isc; }) {}; @@ -75492,22 +75784,23 @@ self: { }) {}; "hakyll-convert" = callPackage - ({ mkDerivation, base, binary, bytestring, cmdargs, directory, feed - , filepath, hakyll, old-locale, text, time, xml + ({ mkDerivation, base, binary, bytestring, cmdargs, containers + , data-default, directory, feed, filepath, hakyll, text, time, xml }: mkDerivation { pname = "hakyll-convert"; - version = "0.1.0.0"; - sha256 = "a3e7e0f9e59f9e704b2ee464b9e7f8a1a1cb432af1a247e167cedcad8c7071b7"; + version = "0.2.0.0"; + sha256 = "27feaacd5a6c6d9f633bfb0ffc731528f216bd295d4a801b2bcbd47af5ed985c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring feed hakyll old-locale text time xml + base binary bytestring containers data-default feed filepath hakyll + text time xml ]; executableHaskellDepends = [ - base bytestring cmdargs directory feed filepath hakyll text xml + base bytestring cmdargs directory feed filepath text time xml ]; - homepage = "http://github.com/kowey/hakyll-convert"; + homepage = "http://github.com/Minoru/hakyll-convert"; description = "Convert from other blog engines to Hakyll"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -75546,6 +75839,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "hakyll-ogmarkup" = callPackage + ({ mkDerivation, base, hakyll, ogmarkup }: + mkDerivation { + pname = "hakyll-ogmarkup"; + version = "1.0"; + sha256 = "eee4e2f63409f209f77903cc18c86a68529b46e4af7eaa2497af849a4588ce24"; + libraryHaskellDepends = [ base hakyll ogmarkup ]; + homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme"; + description = "Integrate ogmarkup document with Hakyll"; + license = stdenv.lib.licenses.mit; + }) {}; + "hakyll-sass" = callPackage ({ mkDerivation, base, data-default-class, filepath, hakyll, hsass }: @@ -75792,6 +76097,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "handa-data" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "handa-data"; + version = "0.2.9.9"; + sha256 = "b60feddecff35e6e2e39aece7db409408006628329693c1a869b2798fcc0aed1"; + libraryHaskellDepends = [ base ]; + homepage = "https://bitbucket.org/functionally/raft"; + description = "This package is deprecated. It formerly contained Haskell utilities for data structures and data manipulation."; + license = stdenv.lib.licenses.mit; + }) {}; + "handa-gdata" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring , case-insensitive, cmdargs, data-default, directory, filepath @@ -75952,25 +76269,24 @@ self: { }) {}; "hans" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cereal - , containers, fingertree, HTTP, monadLib, network, old-locale - , random, stm, time, unix + ({ mkDerivation, array, base, BoundedChan, bytestring, cereal + , containers, cryptonite, hashable, heaps, memory, monadLib + , psqueues, QuickCheck, random, tasty, tasty-ant-xml + , tasty-quickcheck, time, unix }: mkDerivation { pname = "hans"; - version = "2.6.0.0"; - sha256 = "2853847c2d8823e43904ddcd2fa4ad1e1b15178a18e703293459866601c057a5"; - isLibrary = true; - isExecutable = true; + version = "3.0.0.1"; + sha256 = "a5ff03477183088516c889b9a5447b2adf93e3f39131878ff9e832cdb2c0ee96"; libraryHaskellDepends = [ - base bytestring cereal containers fingertree monadLib random stm - time unix + array base BoundedChan bytestring cereal containers cryptonite + hashable heaps memory monadLib psqueues random time unix ]; - executableHaskellDepends = [ - base blaze-html blaze-markup bytestring cereal containers HTTP - monadLib network old-locale time + testHaskellDepends = [ + base bytestring cereal QuickCheck tasty tasty-ant-xml + tasty-quickcheck ]; - description = "IPv4 Network Stack"; + description = "Network Stack"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -78527,6 +78843,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-exts-simple" = callPackage + ({ mkDerivation, base, haskell-src-exts }: + mkDerivation { + pname = "haskell-src-exts-simple"; + version = "1.18.0.1"; + sha256 = "5d2193a64b6979e541a2897fffbd4c57c420b41d386b4fb24c817921f97a0715"; + libraryHaskellDepends = [ base haskell-src-exts ]; + jailbreak = true; + homepage = "https://github.com/int-e/haskell-src-exts-simple"; + description = "A simplified view on the haskell-src-exts AST"; + license = stdenv.lib.licenses.mit; + }) {}; + "haskell-src-meta" = callPackage ({ mkDerivation, base, haskell-src-exts, pretty, syb , template-haskell, th-orphans @@ -78587,15 +78916,15 @@ self: { }) {}; "haskell-tools-ast" = callPackage - ({ mkDerivation, base, ghc, references, structural-traversal + ({ mkDerivation, base, ghc, mtl, references, template-haskell , uniplate }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.1.2.1"; - sha256 = "cc2f8ef82cffd9746223bab33cd70ffdb64d1a6759f4ab656a7c11f7316213eb"; + version = "0.1.3.0"; + sha256 = "af93c177b3abd37fd5a5891417745d3ff2d0068877a720fd7b8a6b8ec1503919"; libraryHaskellDepends = [ - base ghc references structural-traversal uniplate + base ghc mtl references template-haskell uniplate ]; homepage = "https://github.com/nboldi/haskell-tools"; description = "Haskell AST for efficient tooling"; @@ -78605,16 +78934,16 @@ self: { "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc - , haskell-tools-ast, mtl, references, safe, split - , structural-traversal, template-haskell, uniplate + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , uniplate }: mkDerivation { pname = "haskell-tools-ast-fromghc"; - version = "0.1.2.0"; - sha256 = "1d7a09adb0daed1acffacf909ba5d0447cda1401bcf5a9664b33c0297249a8fb"; + version = "0.1.3.0"; + sha256 = "4e58dabaf0ebaa645cdee231db480f7e83d7399808f91fdacd5b1bc6ca60e6c9"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references - safe split structural-traversal template-haskell uniplate + safe split template-haskell uniplate ]; homepage = "https://github.com/nboldi/haskell-tools"; description = "Creating the Haskell-Tools AST from GHC's representations"; @@ -78624,15 +78953,15 @@ self: { "haskell-tools-ast-gen" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast - , haskell-tools-ast-trf, mtl, references, structural-traversal + , haskell-tools-ast-trf, mtl, references }: mkDerivation { pname = "haskell-tools-ast-gen"; - version = "0.1.2.0"; - sha256 = "c4de8717be3a8365ac870421c9bb327c4ab2255b0c6d4e0ba220450aeee4d431"; + version = "0.1.3.0"; + sha256 = "e46579666308e844f9df962ec8dadcf0051fec170283eafa3dc087331d3862e5"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl - references structural-traversal + references ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Facilities for generating new parts of the Haskell-Tools AST"; @@ -78642,15 +78971,15 @@ self: { "haskell-tools-ast-trf" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, MissingH - , mtl, references, structural-traversal, uniplate + , mtl, references, uniplate }: mkDerivation { pname = "haskell-tools-ast-trf"; - version = "0.1.2.0"; - sha256 = "16df4de302b9304009d345bba2110f0a9ea6becc01cfc09f29c9329a3d859a72"; + version = "0.1.3.0"; + sha256 = "7b9de75660f093456d6f58cc6e4831db4aa5caa66deb3b4d084bed1dffa2b843"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast MissingH mtl references - structural-traversal uniplate + uniplate ]; homepage = "https://github.com/nboldi/haskell-tools"; description = "Conversions on Haskell-Tools AST to prepare for refactorings"; @@ -78661,15 +78990,14 @@ self: { "haskell-tools-prettyprint" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast , haskell-tools-ast-trf, mtl, references, split - , structural-traversal }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.1.2.0"; - sha256 = "0e4a34d210ad5d45c146ba071d5dcf3b11e7090db79778268eba4405544b1431"; + version = "0.1.3.0"; + sha256 = "0163779686402c6592dc969d4caeb680b4e6a2957149281e1240ff16695041ac"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl - references split structural-traversal + references split ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Pretty printing of Haskell-Tools AST"; @@ -78682,19 +79010,17 @@ self: { , ghc-paths, haskell-tools-ast, haskell-tools-ast-fromghc , haskell-tools-ast-gen, haskell-tools-ast-trf , haskell-tools-prettyprint, mtl, references, split - , structural-traversal, template-haskell, time, transformers - , uniplate + , template-haskell, time, transformers, uniplate }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.1.2.0"; - sha256 = "e038d377d2ae4837793e0b9ae5fd9406a5918da8ba3c88e7d6f8244ef28ccc39"; + version = "0.1.3.0"; + sha256 = "a8a527a9a9b036f7dd7b761817c5844ac6750e3959bc46377ca5f26808e326a4"; libraryHaskellDepends = [ base containers directory either filepath ghc ghc-paths haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen haskell-tools-ast-trf haskell-tools-prettyprint mtl references - split structural-traversal template-haskell time transformers - uniplate + split template-haskell time transformers uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; @@ -79515,6 +79841,7 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; + doCheck = false; homepage = "http://github.com/haskoin/haskoin"; description = "Implementation of the core Bitcoin protocol features"; license = stdenv.lib.licenses.publicDomain; @@ -83143,8 +83470,8 @@ self: { ({ mkDerivation, base, geos_c, MissingH, mtl, transformers }: mkDerivation { pname = "hgeos"; - version = "0.1.4.0"; - sha256 = "2c2c0524c599ac0770be7c094932a4b6bcaf0521e7ecc024f0e6da9aa7f4bc66"; + version = "0.1.5.1"; + sha256 = "7a9160fd2f575e84c6b18de2e2721497a392b161412516fc61622885d5fdce5d"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ geos_c ]; testHaskellDepends = [ base MissingH mtl transformers ]; @@ -83213,6 +83540,19 @@ self: { broken = true; }) {HTam = null;}; + "hgmp" = callPackage + ({ mkDerivation, base, ghc-prim, integer-gmp, QuickCheck }: + mkDerivation { + pname = "hgmp"; + version = "0.1.0.0"; + sha256 = "dc72eae07df9c94c1cc404cb823a0cde3a19dc7e640eef35b1b05f1218831fbc"; + libraryHaskellDepends = [ base ghc-prim integer-gmp ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://code.mathr.co.uk/hgmp"; + description = "Haskell interface to GMP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hgom" = callPackage ({ mkDerivation, base, containers, directory, filepath, mtl, parsec , wl-pprint @@ -84511,8 +84851,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.0.0.0"; - sha256 = "f2d1ad345ff76e3bc3d738ebc3179bdec64a97ff66f7ade29aaf416c13f38787"; + version = "1.1.0.0"; + sha256 = "63c5ca58ae62475bf2dbaa9ab87fda7f758676dca7a2b13790ee832cd027b5b8"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hjsonpointer http-client http-types pcre-heavy profunctors QuickCheck scientific @@ -85562,8 +85902,8 @@ self: { ({ mkDerivation, base, integer-gmp, mpfr }: mkDerivation { pname = "hmpfr"; - version = "0.4.0.2"; - sha256 = "c6f0bfdc5ea4f19892e40d67169808445bdeff50dcdc0d2b40f621d1e1013f90"; + version = "0.4.1"; + sha256 = "76019426328c9c9d8538a893bb865d510434fb94bd77f0ca47a17d0962d15b98"; libraryHaskellDepends = [ base integer-gmp ]; librarySystemDepends = [ mpfr ]; homepage = "https://github.com/michalkonecny/hmpfr"; @@ -92446,7 +92786,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "http-reverse-proxy" = callPackage + "http-reverse-proxy_0_4_3" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, containers , data-default-class, hspec, http-client, http-conduit, http-types @@ -92471,6 +92811,34 @@ self: { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-reverse-proxy" = callPackage + ({ mkDerivation, async, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, containers + , data-default-class, hspec, http-client, http-conduit, http-types + , lifted-base, monad-control, network, resourcet, streaming-commons + , text, transformers, wai, wai-logger, warp, word8 + }: + mkDerivation { + pname = "http-reverse-proxy"; + version = "0.4.3.1"; + sha256 = "579285aa58836631f8393f733b524a8c74591ed0318632bed97d4eaa090783eb"; + libraryHaskellDepends = [ + async base blaze-builder bytestring case-insensitive conduit + conduit-extra containers data-default-class http-client http-types + lifted-base monad-control network resourcet streaming-commons text + transformers wai wai-logger word8 + ]; + testHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra hspec + http-conduit http-types lifted-base network resourcet + streaming-commons transformers wai warp + ]; + homepage = "https://github.com/fpco/http-reverse-proxy"; + description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; + license = stdenv.lib.licenses.bsd3; }) {}; "http-server" = callPackage @@ -93245,8 +93613,8 @@ self: { }: mkDerivation { pname = "hw-bits"; - version = "0.0.0.7"; - sha256 = "16e58787b6a39fb6602926480be7eb5486f2e652668e0fb70b0ec1467b755926"; + version = "0.0.0.10"; + sha256 = "c02e7398bbac3e1e92060b6bfb4245a5c6252a213ed3a2b918836b99515468ea"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; @@ -93262,29 +93630,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "hw-bits_0_0_0_8" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap - , parsec, QuickCheck, resourcet, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.0.0.8"; - sha256 = "039ab7bb84f1cbb1b9ad72db2955c529622a64f267cd41d3948f165df08266cb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; - executableHaskellDepends = [ - base criterion mmap resourcet vector - ]; - testHaskellDepends = [ - base bytestring hspec hw-prim QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-bits#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-conduit" = callPackage ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec , hw-bits, resourcet, word8 @@ -93455,8 +93800,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.0.3.4"; - sha256 = "086f811f8b420aa385519f483db7bb35e0a74527f9648c1a7af2b8d5d1711d56"; + version = "0.0.3.5"; + sha256 = "dd6f4b25ad1180c2706323451e2f2663f977353678945319ccc59b61f008db10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring random vector ]; @@ -93494,8 +93839,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.0.0.5"; - sha256 = "89adedf5e37497430bec4546f096fb1ba8a324156e95535c9d450ee9a59892b0"; + version = "0.1.0.1"; + sha256 = "57a11f88cfe37be4d18ce5f9497a139bd2e7eb2b9e25b8413c602da2f0f41d5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hw-bits hw-prim vector ]; @@ -95111,6 +95456,7 @@ self: { base containers directory filepath haskeline process time transformers ]; + doCheck = false; homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; @@ -95175,12 +95521,15 @@ self: { }) {}; "ifcxt" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck + , template-haskell + }: mkDerivation { pname = "ifcxt"; - version = "0.1.0.0"; - sha256 = "7c09ff72dc72b288bb2020970adabc87ef1e5913175a745dd1573faf3422169d"; + version = "0.1.1"; + sha256 = "cc01adb330a6bbe0574d1e437ac98d79c274b44225a89599e43c3aad66555d55"; libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; jailbreak = true; homepage = "http://github.com/mikeizbicki/ifcxt"; description = "put if statements within type constraints"; @@ -96068,18 +96417,18 @@ self: { "impure-containers" = callPackage ({ mkDerivation, base, containers, ghc-prim, hashable, HUnit , primitive, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector + , test-framework-quickcheck2, transformers, vector }: mkDerivation { pname = "impure-containers"; - version = "0.3"; - sha256 = "fb0e9e0664ff60da9126b416ed6407b85d0d1cff2d9a311f8186c312d864fcb5"; + version = "0.4.0"; + sha256 = "6e311d28492f515a786a35652f6b52d822821e3c3f2a5513e23551eab04b933b"; libraryHaskellDepends = [ base containers ghc-prim hashable primitive vector ]; testHaskellDepends = [ base containers HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector + test-framework-hunit test-framework-quickcheck2 transformers vector ]; homepage = "https://github.com/andrewthad/impure-containers#readme"; description = "Mutable containers in haskell"; @@ -96970,12 +97319,9 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "instant-generics"; - version = "0.5"; - sha256 = "79d7cccead455f00637a182e0639cd7b8e6ef67e054d53098064772981dd8a9c"; - revision = "2"; - editedCabalFile = "c4a76fc7f7aebe8c003c9a80a127f627724d9444bd983bcacb2613d993295017"; + version = "0.6"; + sha256 = "b15e0566c0b060341e11ddd6bae9550c9a73c1b75c0e9acd6dc9092f4ce7ef15"; libraryHaskellDepends = [ base containers syb template-haskell ]; - jailbreak = true; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; license = stdenv.lib.licenses.bsd3; @@ -97415,8 +97761,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.6.1"; - sha256 = "da202b4ce7d57dd675695fedfbf5bbc2a203d160e72c5fae8994a7bb7eca254c"; + version = "0.6.2"; + sha256 = "dce6907980d4b3e9eace2e4e5f5192459992a365d12d2c22860ff1afe2ffb5c7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97749,8 +98095,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "0.8.4"; - sha256 = "8c0d0de5b927310848f3c17702637ed2ea15bffab5a82b6df61d5df88b74c1b6"; + version = "0.8.6"; + sha256 = "e8e53531f7165234845a58f2a6b893dbf0bbb75ac3f08870005f9c3fd67c4d6b"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -98472,17 +98818,20 @@ self: { "isobmff-builder" = callPackage ({ mkDerivation, base, binary, bytestring, data-default, hspec - , lens, singletons, text, time, type-list, vector-sized + , singletons, tagged, text, time, type-list, type-spec + , vector-sized }: mkDerivation { pname = "isobmff-builder"; - version = "0.10.0.0"; - sha256 = "6a246c26e4ef173fafc190e6fe79cffc44c9513855d5e2d0f4710315ece1ac2d"; + version = "0.10.5.0"; + sha256 = "b7dfa97397a823beb2d327fd97ed57cc9cec6c615659eaaa238c86b9bd4c2bf1"; libraryHaskellDepends = [ - base bytestring data-default lens singletons text time type-list - vector-sized + base bytestring data-default singletons tagged text time type-list + type-spec vector-sized + ]; + testHaskellDepends = [ + base binary bytestring hspec text type-spec ]; - testHaskellDepends = [ base binary bytestring hspec text ]; homepage = "https://github.com/sheyll/isobmff-builder#readme"; description = "A (bytestring-) builder for the ISO-14496-12 base media file format"; license = stdenv.lib.licenses.bsd3; @@ -100309,8 +100658,8 @@ self: { }: mkDerivation { pname = "json-rpc-generic"; - version = "0.2.0.1"; - sha256 = "92cc61f7d04c8d8d867d9b7da97c592d933c34e0da570a457cd39c4611bacd0d"; + version = "0.2.1.1"; + sha256 = "5ba74a92cad226738161db4f5c7f216c4a6bb743665dc4341901e57f30c4cffd"; libraryHaskellDepends = [ aeson base bytestring containers dlist scientific text transformers unordered-containers vector @@ -101104,6 +101453,35 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "kawaii" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, hakyll + , hakyll-serve, hspec, lens, lifted-base, monad-control + , monad-logger, mtl, optparse-applicative, QuickCheck, safe + , streaming-commons, text, wai, wai-app-static, wai-extra, warp + , warp-tls + }: + mkDerivation { + pname = "kawaii"; + version = "0.0.1.0"; + sha256 = "93901fdb028401d96461ff75fad794933bedc090f7cab7947d878ec36fe90228"; + libraryHaskellDepends = [ + base bytestring containers data-default hakyll lens lifted-base + monad-control monad-logger mtl optparse-applicative safe + streaming-commons text wai wai-app-static wai-extra warp warp-tls + ]; + testHaskellDepends = [ + base bytestring containers data-default hakyll hakyll-serve hspec + lens lifted-base monad-control monad-logger mtl + optparse-applicative QuickCheck safe streaming-commons text wai + wai-app-static wai-extra warp warp-tls + ]; + jailbreak = true; + homepage = "https://phabricator.chromabits.com/diffusion/KWAI/"; + description = "Utilities for serving static sites and blogs with Wai/Warp"; + license = stdenv.lib.licenses.asl20; + broken = true; + }) {hakyll-serve = null;}; + "kawhi" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-client , http-conduit, http-types, mtl, safe, scientific, smallcheck @@ -101988,6 +102366,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "knead" = callPackage + ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record + , storable-tuple, utility-ht + }: + mkDerivation { + pname = "knead"; + version = "0.2"; + sha256 = "3a4b110042f0a6080ef36597fca2498daad8800bb054856aaa480885d6670803"; + libraryHaskellDepends = [ + base llvm-extra llvm-tf storable-record storable-tuple utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/knead/"; + description = "Repa array processing using LLVM JIT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "knead-arithmetic" = callPackage + ({ mkDerivation, base, knead, llvm-extra, llvm-tf, utility-ht }: + mkDerivation { + pname = "knead-arithmetic"; + version = "0.0"; + sha256 = "64ffb6727d9848a04f7287a4ee7954f9150af18b8bd1ac4b475ae15c540e7f3e"; + libraryHaskellDepends = [ + base knead llvm-extra llvm-tf utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/knead-arithmetic/"; + description = "Linear algebra and interpolation using LLVM JIT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "knob" = callPackage ({ mkDerivation, base, bytestring, transformers }: mkDerivation { @@ -103988,8 +104396,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, wl-pprint }: mkDerivation { pname = "language-webidl"; - version = "0.1.3.1"; - sha256 = "4e04013c57078e72217a60dcaf2e1e29e6ac2d219e5fd3113ac8771a771c9127"; + version = "0.1.4.0"; + sha256 = "6420bab2e66d34bcf491e71c75a67753e35e5f1015747b3a256105f74915fd1a"; libraryHaskellDepends = [ base parsec wl-pprint ]; testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; @@ -107606,8 +108014,8 @@ self: { ({ mkDerivation, base, llvm }: mkDerivation { pname = "llvm-ffi"; - version = "3.0.0"; - sha256 = "9b012f897d95f852e69221b87225d0b16ecfe06685007d65bef581c98f250b1e"; + version = "3.5.0"; + sha256 = "ff292c630a7a9460ffad569afeb932d1471f15cbc54ceadf6b4ed5294c4aacef"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ llvm ]; homepage = "http://haskell.org/haskellwiki/LLVM"; @@ -107766,18 +108174,18 @@ self: { }) {}; "llvm-tf" = callPackage - ({ mkDerivation, base, containers, llvm-ffi, non-empty, process - , storable-record, tfp, transformers, utility-ht + ({ mkDerivation, base, containers, fixed-length, llvm-ffi + , non-empty, process, storable-record, tfp, transformers + , utility-ht }: mkDerivation { pname = "llvm-tf"; - version = "3.0.3.1"; - sha256 = "096c1de602ca2ae1d09e0a8ffa3bd3746aaa9619d078db2109fcb8b29f417d2e"; + version = "3.0.3.1.9"; + sha256 = "e35b74bdb1770647520e1dab28e692d0b3bfd83588010dc2fb426e3a5a897e44"; libraryHaskellDepends = [ - base containers llvm-ffi non-empty process storable-record tfp - transformers utility-ht + base containers fixed-length llvm-ffi non-empty process + storable-record tfp transformers utility-ht ]; - jailbreak = true; description = "Bindings to the LLVM compiler toolkit using type families"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -109216,7 +109624,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {objc = null;}; - "luminance" = callPackage + "luminance_0_11_0_2" = callPackage ({ mkDerivation, base, containers, contravariant, dlist, gl, linear , mtl, resourcet, semigroups, transformers, vector, void }: @@ -109232,6 +109640,25 @@ self: { homepage = "https://github.com/phaazon/luminance"; description = "Type-safe, type-level and stateless graphics framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "luminance" = callPackage + ({ mkDerivation, base, containers, contravariant, dlist, gl, linear + , mtl, resourcet, semigroups, transformers, vector, void + }: + mkDerivation { + pname = "luminance"; + version = "0.11.0.3"; + sha256 = "94d7d9c62727cc3eceddf2f4653cba5bcbf9858855effec6687d60d3848a9547"; + libraryHaskellDepends = [ + base containers contravariant dlist gl linear mtl resourcet + semigroups transformers vector void + ]; + jailbreak = true; + homepage = "https://github.com/phaazon/luminance"; + description = "Type-safe, type-level and stateless graphics framework"; + license = stdenv.lib.licenses.bsd3; }) {}; "luminance-samples" = callPackage @@ -112494,7 +112921,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-mtl" = callPackage + "microlens-mtl_0_1_9_0" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -112508,6 +112935,23 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "microlens support for Reader/Writer/State from mtl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-mtl" = callPackage + ({ mkDerivation, base, microlens, mtl, transformers + , transformers-compat + }: + mkDerivation { + pname = "microlens-mtl"; + version = "0.1.10.0"; + sha256 = "b1dec4f000f324ae3e1915f683577bd53af218a68d07b0acf437def74e14b39d"; + libraryHaskellDepends = [ + base microlens mtl transformers transformers-compat + ]; + homepage = "http://github.com/aelve/microlens"; + description = "microlens support for Reader/Writer/State from mtl"; + license = stdenv.lib.licenses.bsd3; }) {}; "microlens-platform_0_3_3_0" = callPackage @@ -112535,8 +112979,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.3.4.0"; - sha256 = "ef6bb97b8c58344b5ab6eed7d47dd4cadbdb6052089f28d44e27bd37eada149d"; + version = "0.3.5.0"; + sha256 = "7c51fe542759951daf7eb79c5e5644c214da89a0057797845da3971423cdc9aa"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -112561,14 +113005,17 @@ self: { }) {}; "micrologger" = callPackage - ({ mkDerivation, base, text, text-format, time, transformers }: + ({ mkDerivation, aeson, base, containers, hspec, text, text-format + , time, transformers + }: mkDerivation { pname = "micrologger"; - version = "0.2.0.1"; - sha256 = "4778a90b7953ddde7391304c8f87b9cbe3f3657fb6284a5890a42681db7ef469"; + version = "0.3.0.0"; + sha256 = "9c23cb35299beab63e47255f04de67d436ce12ea0f793386a4d588a9d0b5a0e1"; libraryHaskellDepends = [ - base text text-format time transformers + aeson base containers text text-format time transformers ]; + testHaskellDepends = [ aeson base hspec text ]; jailbreak = true; homepage = "https://github.com/savannidgerinel/micrologger#readme"; description = "A super simple logging module. Only for use for very simple projects."; @@ -114229,6 +114676,7 @@ self: { transformers transformers-base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; + doCheck = false; homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme"; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; @@ -115372,8 +115820,8 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.2.0.0"; - sha256 = "328fad49563d9793e786107361216bf346e8ea9922158dd48258dbcd5c4bb48d"; + version = "0.3.0.0"; + sha256 = "b9e2a70f92831aac6ac2216d79c319893514fce182439c40e5e33daf65499c55"; libraryHaskellDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; @@ -116748,14 +117196,13 @@ self: { }: mkDerivation { pname = "murmur3"; - version = "1.0.2"; - sha256 = "8bc485e0f30d7f67611f70e56a5908a6b1b05273fe95eedaaf65e544a1f9c0cc"; + version = "1.0.3"; + sha256 = "102c81e0e6ae604f51bccced6d2d493f4de0b65e856cd0492a17f9f8e4d51f2a"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base base16-bytestring bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/plaprade/murmur3"; description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; license = stdenv.lib.licenses.publicDomain; @@ -117481,6 +117928,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mystem" = callPackage + ({ mkDerivation, attoparsec, base, data-default, directory, process + , text + }: + mkDerivation { + pname = "mystem"; + version = "0.1.0.0"; + sha256 = "3d42ce765daee82a3a4d60270ce8ef85c95f71f0374a2562f91a6d5a2251645d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base data-default directory process text + ]; + executableHaskellDepends = [ base text ]; + jailbreak = true; + homepage = "https://github.com/wapxmas/mystem#readme"; + description = "Bindings for Mystem morphological analyzer executabe"; + license = stdenv.lib.licenses.mit; + }) {}; + "mywatch" = callPackage ({ mkDerivation, aeson, base, bytestring, ConfigFile , data-default-class, docopt, fast-logger, http-types @@ -118787,7 +119254,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "network" = callPackage + "network_2_6_2_1" = callPackage ({ mkDerivation, base, bytestring, HUnit, test-framework , test-framework-hunit, unix }: @@ -118803,24 +119270,25 @@ self: { homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "network_2_6_3_0" = callPackage + "network" = callPackage ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework , test-framework-hunit, unix }: mkDerivation { pname = "network"; - version = "2.6.3.0"; - sha256 = "854aab832f3f84a33a6d417f9692232208ec1d9604cded252018f52fd091945d"; + version = "2.6.3.1"; + sha256 = "57045f5e2bedc095670182130a6d1134fcc65d097824ac5b03933876067d82e6"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit test-framework test-framework-hunit ]; + doCheck = false; homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-address" = callPackage @@ -119146,6 +119614,7 @@ self: { version = "0.2"; sha256 = "22edd54234b97336910dd35d2e3d083aae15411cf30c8a5407e85faccf1cef05"; libraryHaskellDepends = [ base bytestring hans parsec ]; + jailbreak = true; description = "HaNS to Network shims for easier HaNS integration"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -120314,6 +120783,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty-sequence" = callPackage + ({ mkDerivation, base, containers, semigroups }: + mkDerivation { + pname = "non-empty-sequence"; + version = "0.2.0.2"; + sha256 = "d9a3604c0c140197731895af56413edbf1cf6866f9c0636ece9d8314366dd1e1"; + libraryHaskellDepends = [ base containers semigroups ]; + homepage = "http://www.github.com/massysett/non-empty-sequence"; + description = "Non-empty sequence"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "non-negative" = callPackage ({ mkDerivation, base, QuickCheck, utility-ht }: mkDerivation { @@ -121484,6 +121965,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ogmarkup" = callPackage + ({ mkDerivation, base, blaze-html, hspec, mtl, parsec, shakespeare + , text, yesod + }: + mkDerivation { + pname = "ogmarkup"; + version = "2.1"; + sha256 = "1ba3c05aa8723ec24951b71db70ea06a676d092c9570ddda2a5af4e6e77881eb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec ]; + executableHaskellDepends = [ + base blaze-html parsec shakespeare text yesod + ]; + testHaskellDepends = [ base hspec parsec shakespeare text ]; + homepage = "http://github.com/ogma-project/ogmarkup"; + description = "A lightweight markup language for story writers"; + license = stdenv.lib.licenses.mit; + }) {}; + "ohloh-hs" = callPackage ({ mkDerivation, base, cmdargs, data-lens, hxt, hxt-curl , pretty-show, QuickCheck, test-framework @@ -122695,7 +123196,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "operational" = callPackage + "operational_0_2_3_2" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { pname = "operational"; @@ -122708,6 +123209,22 @@ self: { homepage = "http://haskell.org/haskellwiki/Operational"; description = "Implementation of difficult monads made easy with operational semantics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "operational" = callPackage + ({ mkDerivation, base, mtl, random }: + mkDerivation { + pname = "operational"; + version = "0.2.3.3"; + sha256 = "25489ee5475e5dd8bc5fb415a0189ef6f7e84253f4e392ff5f40b3c3ff1e406c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ]; + executableHaskellDepends = [ random ]; + homepage = "http://wiki.haskell.org/Operational"; + description = "Implementation of difficult monads made easy with operational semantics"; + license = stdenv.lib.licenses.bsd3; }) {}; "operational-alacarte" = callPackage @@ -122925,6 +123442,7 @@ self: { testHaskellDepends = [ base chell chell-quickcheck containers monads-tf transformers ]; + doCheck = false; homepage = "https://john-millikin.com/software/haskell-options/"; description = "A powerful and easy-to-use command-line option parser"; license = stdenv.lib.licenses.mit; @@ -124660,6 +125178,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parsec-pratt" = callPackage + ({ mkDerivation, base, containers, mtl, parsec, pretty }: + mkDerivation { + pname = "parsec-pratt"; + version = "0.1.1"; + sha256 = "8c6030d4d53830e68bbc8cbf8897c5220b6558c8a373ce616c3139e2d3837916"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers parsec ]; + executableHaskellDepends = [ base containers mtl parsec pretty ]; + homepage = "http://github.com/jh3141/parsec-pratt/"; + description = "Pratt Parser combinator for Parsec"; + license = stdenv.lib.licenses.mit; + }) {}; + "parsec-tagsoup" = callPackage ({ mkDerivation, base, parsec, tagsoup }: mkDerivation { @@ -127381,10 +127914,8 @@ self: { }: mkDerivation { pname = "pia-forward"; - version = "0.1.0.1"; - sha256 = "59b49b7506a597802e6798d2cd4e892ace4ad69e08021bde37ddadb962743e0b"; - revision = "1"; - editedCabalFile = "7ace7bfcb4b05c4099a28ec12b7e12682669ddfe6d4e5f68c4d74c05914b7582"; + version = "0.1.0.2"; + sha256 = "6189410d115b163237006b15fda448256c313d03c8e94c9422f6bc05415fb3f2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128364,6 +128895,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pipes-protolude" = callPackage + ({ mkDerivation, async, base, deepseq, exceptions, foldl, free, mtl + , pipes, pipes-concurrency, pipes-extras, pipes-group, pipes-parse + , pipes-safe, pipes-text, text-show, transformers + }: + mkDerivation { + pname = "pipes-protolude"; + version = "0.1.0.0"; + sha256 = "e4ac3b48483efe76378cfbc1c6401f44de735f3431a5900d36e3b920c27f4979"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base deepseq exceptions foldl free mtl pipes + pipes-concurrency pipes-extras pipes-group pipes-parse pipes-safe + pipes-text text-show transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + jailbreak = true; + homepage = "https://github.com/mckeankylej/pipes-protolude#readme"; + description = "Alternate Prelude for the pipes ecosystem"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-random" = callPackage ({ mkDerivation, base, mwc-random, pipes, vector }: mkDerivation { @@ -129773,8 +130328,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.5.1"; - sha256 = "4bcfeb21bd86d912dbfc8c1574f76ee3b099fda2e35302a7f6fd4dca4f33a475"; + version = "0.5.2"; + sha256 = "c47f4b2991dc7c6de04bc6f2cc9adebe5fecca6008a446a7747345cb40e626da"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -132890,6 +133445,7 @@ self: { base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck tasty-th temporary ]; + jailbreak = true; homepage = "https://github.com/msakai/pseudo-boolean"; description = "Reading/Writing OPB/WBO files used in pseudo boolean competition"; license = stdenv.lib.licenses.bsd3; @@ -132968,6 +133524,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pstemmer" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "pstemmer"; + version = "0.1.0.0"; + sha256 = "413930ab93d41b60b0b992b286f350f4c30b184abab990ef70da3d4714a69599"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + executableHaskellDepends = [ base text ]; + homepage = "https://github.com/wapxmas/pstemmer#readme"; + description = "A Haskell Implementation of the Porter Stemmer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, cmdargs, ConfigFile, containers , groom, hedis, hslogger, mtl, network, pipes, pipes-bytestring @@ -133519,12 +134090,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "purescript_0_9_2" = callPackage + "purescript_0_9_3" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring , clock, containers, directory, dlist, edit-distance, file-embed , filepath, fsnotify, Glob, haskeline, hspec, hspec-discover - , http-types, HUnit, language-javascript, lifted-base + , http-client, http-types, HUnit, language-javascript, lifted-base , monad-control, monad-logger, mtl, network, optparse-applicative , parallel, parsec, pattern-arrows, pipes, pipes-http, process , protolude, regex-tdfa, safe, semigroups, silently, sourcemap @@ -133534,21 +134105,19 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.9.2"; - sha256 = "08a09bb101a900bf5ec3954cddfbfac11e81550d1ec92221559922f0e5b1acb3"; - revision = "1"; - editedCabalFile = "15708813a8ed4626208a5e44f6e7d9132ed7c82f0dc8b478388520ccc8e90e3c"; + version = "0.9.3"; + sha256 = "0e4628232508a37568103d3ffcce68355258af388bba1b0bb3847c1fb33b91e5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-better-errors ansi-terminal base base-compat bower-json boxes bytestring clock containers directory dlist edit-distance - filepath fsnotify Glob haskeline http-types language-javascript - lifted-base monad-control monad-logger mtl parallel parsec - pattern-arrows pipes pipes-http process protolude regex-tdfa safe - semigroups sourcemap spdx split stm syb text time transformers - transformers-base transformers-compat unordered-containers - utf8-string vector + filepath fsnotify Glob haskeline http-client http-types + language-javascript lifted-base monad-control monad-logger mtl + parallel parsec pattern-arrows pipes pipes-http process protolude + regex-tdfa safe semigroups sourcemap spdx split stm syb text time + transformers transformers-base transformers-compat + unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat boxes @@ -133563,7 +134132,6 @@ self: { HUnit mtl optparse-applicative parsec process protolude silently stm text time transformers transformers-compat utf8-string vector ]; - jailbreak = true; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.mit; @@ -134127,29 +134695,31 @@ self: { qtc_opengl = null; qtc_script = null; qtc_tools = null;}; "qtah-cpp-qt5" = callPackage - ({ mkDerivation, base, qtah-generator }: + ({ mkDerivation, base, qtah-generator, qtbase }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.1.0"; - sha256 = "3fb79a7dbccdf84dfbde714be8f2a18cd57fdacd17463b2c72d392f8985107a8"; + version = "0.1.1"; + sha256 = "474d1add4e58ab817679d1d6d51508737c3f45d272836efbbf883bf600149cce"; libraryHaskellDepends = [ base qtah-generator ]; + librarySystemDepends = [ qtbase ]; homepage = "http://khumba.net/projects/qtah"; description = "Qt bindings for Haskell - C++ library"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs.qt5) qtbase;}; "qtah-examples" = callPackage - ({ mkDerivation, base, binary, bytestring, hoppy-runtime, qtah-qt5 + ({ mkDerivation, base, binary, bytestring, filepath, hoppy-runtime + , qtah-qt5 }: mkDerivation { pname = "qtah-examples"; - version = "0.1.0"; - sha256 = "12c9a78193e5e2986e734487c94e95be5fc638204b051839a257fb60c2cddd2a"; + version = "0.1.1"; + sha256 = "2af216f46beaf1c491b5fee0cd25876561ecd3af98bad87e45e3f4210e6bf55f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base binary bytestring hoppy-runtime qtah-qt5 + base binary bytestring filepath hoppy-runtime qtah-qt5 ]; jailbreak = true; homepage = "http://khumba.net/projects/qtah"; @@ -134182,7 +134752,7 @@ self: { "qtah-qt5" = callPackage ({ mkDerivation, base, binary, bytestring, hoppy-runtime, HUnit - , qtah, qtah-cpp-qt5, qtah-generator + , qtah, qtah-cpp-qt5, qtah-generator, qtbase }: mkDerivation { pname = "qtah-qt5"; @@ -134192,6 +134762,7 @@ self: { base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; librarySystemDepends = [ qtah ]; + libraryToolDepends = [ qtbase ]; testHaskellDepends = [ base hoppy-runtime HUnit ]; testSystemDepends = [ qtah ]; jailbreak = true; @@ -134199,7 +134770,7 @@ self: { description = "Qt bindings for Haskell"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {qtah = null;}; + }) {qtah = null; inherit (pkgs.qt5) qtbase;}; "quadratic-irrational" = callPackage ({ mkDerivation, arithmoi, base, containers, directory, doctest @@ -135181,6 +135752,24 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {rados = null;}; + "raft" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , containers, data-default, ghc-prim, mtl, scientific, split, text + , time, tostring, zlib + }: + mkDerivation { + pname = "raft"; + version = "0.3.2.2"; + sha256 = "1a22a4de6376889553263fc04f76e3fdfa7f2932db6df3512edd71d8955c7096"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring containers data-default + ghc-prim mtl scientific split text time tostring zlib + ]; + homepage = "https://bitbucket.org/functionally/raft"; + description = "Miscellaneous Haskell utilities for data structures and data manipulation"; + license = stdenv.lib.licenses.mit; + }) {}; + "rail-compiler-editor" = callPackage ({ mkDerivation, base, cairo, containers, gtk, HUnit, llvm-general , llvm-general-pure, mtl, process, transformers @@ -136122,8 +136711,8 @@ self: { }: mkDerivation { pname = "react-flux"; - version = "1.1.1"; - sha256 = "d249c417b28028bda6c3f2a479c91d622a9e69356749e0175be9f00631434dc1"; + version = "1.2.1"; + sha256 = "5d2b4decb013edd5e90c1bc109d13cb8f49f3e1dd8a657249df52c8639819e34"; libraryHaskellDepends = [ aeson base bytestring deepseq mtl template-haskell text time unordered-containers @@ -136820,8 +137409,8 @@ self: { }: mkDerivation { pname = "reddit"; - version = "0.2.0.0"; - sha256 = "1969dea9612d12611b73f209466e6567e46a2706b59f2f243234d47bf2749ec0"; + version = "0.2.1.0"; + sha256 = "49e5ad14a04e0ab7bed9c4a02b3b03c42f20319a51df76c41d8386502fd7e420"; libraryHaskellDepends = [ aeson api-builder base bytestring data-default-class free http-client http-client-tls http-types network text time @@ -136831,7 +137420,6 @@ self: { aeson api-builder base bytestring Cabal hspec http-client http-client-tls text time transformers ]; - jailbreak = true; homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; license = stdenv.lib.licenses.bsd2; @@ -138413,6 +139001,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reload" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers + , data-default, directory, filepath, ghcid, hspec, hspec-wai + , hspec-wai-json, http-types, mime-types, process, scotty, text + , transformers, unordered-containers, wai, wai-extra + , wai-handler-launch, wai-middleware-static, wai-websockets, warp + , websockets + }: + mkDerivation { + pname = "reload"; + version = "0.0.0.1"; + sha256 = "4515ad09d61062a04aa34f610bbc4d6176c5468081ca30ea971a3fec36160f50"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring Cabal containers data-default directory + filepath ghcid http-types mime-types process scotty text + transformers wai wai-extra wai-handler-launch wai-middleware-static + wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson async base bytestring Cabal containers data-default directory + filepath ghcid hspec hspec-wai hspec-wai-json http-types mime-types + process scotty text transformers unordered-containers wai wai-extra + wai-handler-launch wai-middleware-static wai-websockets warp + websockets + ]; + homepage = "https://github.com/jpmoresmau/dbIDE/reload#readme"; + description = "A web based Haskell IDE"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rematch" = callPackage ({ mkDerivation, base, hspec, HUnit }: mkDerivation { @@ -141249,12 +141870,11 @@ self: { ({ mkDerivation, base, c2hs, rtl-sdr }: mkDerivation { pname = "rtlsdr"; - version = "0.1.0.4"; - sha256 = "ffad3e6ba6d38e6995fd5b90fbeadbebc8c4f2363346bf3cca1dbc2435461524"; + version = "0.1.0.5"; + sha256 = "2d19640003dd8dddb77591b97bba4cf32d52306d4a98a1c4a2733d1253d62321"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ rtl-sdr ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; @@ -142382,8 +143002,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "1.0.1"; - sha256 = "e1f369043af7d306ec485778a0f1629103d96513eb19a30c944bee0207a90ae9"; + version = "1.1.0"; + sha256 = "9eb577cf6529958cc551629f6ee0306e495b3a7e657de8a4e15ca7c344519060"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143686,8 +144306,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.6"; - sha256 = "bf6344447783ec530ef27c8e2c55aff57e4581696d156d1d8781f54577b33135"; + version = "0.1.0.8"; + sha256 = "bdad09c6df50719aa70760568914a6ccdeb7e183fc11e85888963a35db326f78"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random @@ -143699,7 +144319,6 @@ self: { base primitive QuickCheck storable-complex test-framework test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/adamwalker/sdr"; description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; @@ -144852,8 +145471,8 @@ self: { }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.2"; - sha256 = "3d965c6da5ee92762325dc28fb4e51138f0e9efef4251c87ae90de182b878c0f"; + version = "0.4"; + sha256 = "7a409bb60daedd077575f5c8f8d300660131c2d5dfed2c4c7b0808d1bf9cb56a"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec QuickCheck random servant @@ -144866,7 +145485,7 @@ self: { jailbreak = true; homepage = "https://github.com/plow-technologies/servant-aeson-specs#readme"; description = "generic tests for aeson serialization in servant"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -144901,6 +145520,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-token" = callPackage + ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl + , persistent, persistent-postgresql, persistent-template + , pwstore-fast, servant-auth-token-api, servant-server, text, time + , transformers, uuid + }: + mkDerivation { + pname = "servant-auth-token"; + version = "0.1.0.0"; + sha256 = "8e024143fc82d5564b4408c5e4fae964261002e52aa7b0a7a67e1154d114dccc"; + libraryHaskellDepends = [ + aeson-injector base bytestring containers mtl persistent + persistent-postgresql persistent-template pwstore-fast + servant-auth-token-api servant-server text time transformers uuid + ]; + jailbreak = true; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "Servant based API and server for token based authorisation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-auth-token-api" = callPackage + ({ mkDerivation, aeson, aeson-injector, base, lens, servant + , servant-docs, servant-swagger, swagger2, text + }: + mkDerivation { + pname = "servant-auth-token-api"; + version = "0.1.2.0"; + sha256 = "3f63d151599a7f52a8d097ec9bc1bed5303246a8ab46562add9fc32a74836335"; + libraryHaskellDepends = [ + aeson aeson-injector base lens servant servant-docs servant-swagger + swagger2 text + ]; + homepage = "https://github.com/ncrashed/servant-auth-token-api#readme"; + description = "Servant based API for token based authorisation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-blaze" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { @@ -145301,6 +145958,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-matrix-param" = callPackage + ({ mkDerivation, base, doctest, hspec, servant, servant-aeson-specs + }: + mkDerivation { + pname = "servant-matrix-param"; + version = "0.1.0.1"; + sha256 = "eedf69940d621282b42eb3f06474851a4903fdaa29c399f3747426c8474ebeb9"; + libraryHaskellDepends = [ base servant ]; + testHaskellDepends = [ + base doctest hspec servant servant-aeson-specs + ]; + jailbreak = true; + description = "Matrix parameter combinator for servant"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-mock" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server @@ -145476,19 +146149,18 @@ self: { "servant-router" = callPackage ({ mkDerivation, base, blaze-html, bytestring, http-api-data - , http-types, mtl, network-uri, servant, servant-blaze - , servant-server, text, warp + , http-types, network-uri, servant, servant-blaze, servant-server + , text, warp }: mkDerivation { pname = "servant-router"; - version = "0.8.1"; - sha256 = "fe94b7f998f96f29ca148dd89c5367ddacf6c925692660162a0f2c5e9696cbec"; + version = "0.9.0"; + sha256 = "5db685c2a05b222dc862c564877a8b5a802bf12cdd91f8b452825aef3de5653c"; libraryHaskellDepends = [ - base bytestring http-api-data http-types mtl network-uri servant - text + base bytestring http-api-data http-types network-uri servant text ]; testHaskellDepends = [ - base blaze-html mtl servant servant-blaze servant-server warp + base blaze-html servant servant-blaze servant-server warp ]; homepage = "https://github.com/ElvishJerricco/servant-router"; description = "Servant router for non-server applications"; @@ -146662,8 +147334,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.10"; - sha256 = "b5544f1a9e246a45357c37507b2228ebb12a8828907e9280fcade23761b0f6f8"; + version = "2.0.11"; + sha256 = "8ea8a21ee989427378844e80b8955e89f4660df3a743df874f11f1cdec0650aa"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -148363,6 +149035,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {inherit (pkgs.xorg) libXft;}; + "singleton-bool" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleton-bool"; + version = "0.1.1.0"; + sha256 = "c196a542ff65f3357219f8c8b294b31e84b0f1a5341c426160bb2909f1523d95"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/phadej/singleton-bool#readme"; + description = "Type level booleans"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { @@ -148455,8 +149139,8 @@ self: { }: mkDerivation { pname = "siphon"; - version = "0.1"; - sha256 = "9035f961ddc57cf6f552b38a943aa9d57368dbfa7c5e5928150b3eae9140f4a6"; + version = "0.2"; + sha256 = "e55afce422fa4724636f7383624239a817f580cfedae68714df10ab0ff6ecc2d"; libraryHaskellDepends = [ attoparsec base bytestring colonnade contravariant pipes text vector @@ -148563,6 +149247,7 @@ self: { base constraints deepseq equational-reasoning hashable monomorphic singletons template-haskell type-natural ]; + jailbreak = true; homepage = "https://github.com/konn/sized-vector"; description = "Size-parameterized vector types and functions"; license = stdenv.lib.licenses.bsd3; @@ -152819,8 +153504,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "0.1.2"; - sha256 = "67b8e3cfd8e1d31aa3e3c518292ccaf84841bbdd08aefcf533b3b4d77686d680"; + version = "0.1.4"; + sha256 = "43638fcebb20101edbb4b0e7919eae44f2021754fcb7aa6b145df5f91db203dd"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -152835,32 +153520,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stache_0_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.1.3"; - sha256 = "2ffd7f2c215ebf9ccf528c6bb82bb87e9aebf443656b4f056627410f8839d819"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - jailbreak = true; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stack" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base , base-compat, base16-bytestring, base64-bytestring, binary @@ -155777,6 +156436,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylish-haskell_0_6_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative + , strict, syb, test-framework, test-framework-hunit, yaml + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.6.2.0"; + sha256 = "2f4fcef31803e5f671fc65c20c480ebc664d7efb28e757ba4ca27f58811b18ec"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts mtl syb yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts mtl optparse-applicative strict syb yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts HUnit mtl syb test-framework test-framework-hunit + yaml + ]; + jailbreak = true; + homepage = "https://github.com/jaspervdj/stylish-haskell"; + description = "Haskell code prettifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -158194,17 +158884,17 @@ self: { }) {}; "tagsoup-megaparsec" = callPackage - ({ mkDerivation, base, hspec, megaparsec, raw-strings-qq, tagsoup + ({ mkDerivation, base, containers, hspec, megaparsec + , raw-strings-qq, tagsoup }: mkDerivation { pname = "tagsoup-megaparsec"; - version = "0.1.0.0"; - sha256 = "6e77efecb8188cc938194e94784b4944c76cc54443ba9c271033ec592b1bae5c"; - libraryHaskellDepends = [ base megaparsec tagsoup ]; + version = "0.2.0.0"; + sha256 = "c4fc2300deb6bfd2f4b2aff925206794a7698b829b1ce46402db05be061550a3"; + libraryHaskellDepends = [ base containers megaparsec tagsoup ]; testHaskellDepends = [ base hspec megaparsec raw-strings-qq tagsoup ]; - jailbreak = true; homepage = "https://github.com/kseo/tagsoup-megaparsec#readme"; description = "A Tag token parser and Tag specific parsing combinators"; license = stdenv.lib.licenses.bsd3; @@ -160956,7 +161646,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "text-zipper" = callPackage + "text-zipper_0_4" = callPackage ({ mkDerivation, base, text, vector }: mkDerivation { pname = "text-zipper"; @@ -160965,14 +161655,26 @@ self: { libraryHaskellDepends = [ base text vector ]; description = "A text editor zipper library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "text-zipper" = callPackage + ({ mkDerivation, base, deepseq, text, vector }: + mkDerivation { + pname = "text-zipper"; + version = "0.5"; + sha256 = "e27d2671da0686e14171213f7ed83ba3f0319dedbeb3a2390e6b98cda56c4b9a"; + libraryHaskellDepends = [ base deepseq text vector ]; + description = "A text editor zipper library"; + license = stdenv.lib.licenses.bsd3; }) {}; "text-zipper-monad" = callPackage ({ mkDerivation, base, hspec, mtl, text-zipper }: mkDerivation { pname = "text-zipper-monad"; - version = "0.1.0.0"; - sha256 = "39d3c7bd5b79226e477bb9fd3be1cbcadb2674969525ff2e441642e5de42756b"; + version = "0.2.0.0"; + sha256 = "8629d0897046167fa96c9a9ba7292a827845e943e19e45a9b77373474b389b35"; libraryHaskellDepends = [ base mtl text-zipper ]; testHaskellDepends = [ base hspec text-zipper ]; homepage = "https://github.com/kseo/text-zipper-monad#readme"; @@ -161588,6 +162290,28 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "th-utilities_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hspec, primitive, syb, template-haskell, text, th-orphans, vector + }: + mkDerivation { + pname = "th-utilities"; + version = "0.2.0.1"; + sha256 = "65c64cee69c0d9bf8d0d5d4590aaea7dcf4177f97818526cbb3fac20901671d6"; + libraryHaskellDepends = [ + base bytestring containers directory filepath primitive syb + template-haskell text th-orphans + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec primitive syb + template-haskell text th-orphans vector + ]; + homepage = "https://github.com/fpco/th-utilities#readme"; + description = "Collection of useful functions for use with Template Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "themoviedb" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, either , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit @@ -161647,8 +162371,8 @@ self: { }: mkDerivation { pname = "thentos-cookie-session"; - version = "0.9.0"; - sha256 = "b1550fa69251a85c29f0396b6fdac937a21fe151151162e8834233284239ec77"; + version = "0.9.1"; + sha256 = "e4f72fc67472d3ae5eb44faf8167b2ee1a20dd7b2a6fe13d93fee1530fb7f0b7"; libraryHaskellDepends = [ aeson base bytestring cookie cryptonite digestive-functors lens memory mtl resourcet sandi servant servant-server @@ -163769,6 +164493,37 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "tpar" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary + , bytestring, containers, distributed-process, errors, exceptions + , friendly-time, ghc-prim, heaps, network + , network-transport-inmemory, network-transport-tcp + , optparse-applicative, parsers, pipes, pipes-bytestring + , pipes-concurrency, pipes-safe, process, QuickCheck, stm, time + , transformers, trifecta + }: + mkDerivation { + pname = "tpar"; + version = "0.1.0.0"; + sha256 = "9f6b47bafecd5fa8f042e1c6682a2b7d80d66d7d274cbdf2900390955869a154"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-wl-pprint async base binary bytestring containers + distributed-process errors exceptions friendly-time ghc-prim heaps + network network-transport-tcp optparse-applicative parsers pipes + pipes-bytestring pipes-concurrency pipes-safe process stm time + transformers trifecta + ]; + testHaskellDepends = [ + base binary containers distributed-process exceptions + network-transport-inmemory pipes QuickCheck stm transformers + ]; + homepage = "http://github.com/bgamari/tpar/"; + description = "simple, parallel job scheduling"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tpdb" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text @@ -164180,8 +164935,8 @@ self: { ({ mkDerivation, base, containers, mtl, stm, time, transformers }: mkDerivation { pname = "transient"; - version = "0.4.1"; - sha256 = "e862734582b0d9a70cbfcdbcb786f7945b7158c3ae7ba3c23882debc6126e4c0"; + version = "0.4.2"; + sha256 = "f84b40d51daff310cfb1563fb6e813d1b047a14a1157d67375efdc05da694bda"; libraryHaskellDepends = [ base containers mtl stm time transformers ]; @@ -164192,27 +164947,6 @@ self: { }) {}; "transient-universe" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, filepath, hashable, HTTP, mtl, network, network-info - , network-uri, process, random, stm, TCache, text, time - , transformers, transient, vector, websockets - }: - mkDerivation { - pname = "transient-universe"; - version = "0.3.1.2"; - sha256 = "cee59c9fd920435ac47913002bccea58348e4923ac557ca7727a86699799e133"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP mtl network network-info network-uri process random - stm TCache text time transformers transient vector websockets - ]; - homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Remote execution and map-reduce: distributed computing for Transient"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" ]; - }) {}; - - "transient-universe_0_3_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, filepath, hashable, HTTP, iproute, mtl, network , network-info, network-uri, process, random, stm, TCache, text @@ -164220,8 +164954,8 @@ self: { }: mkDerivation { pname = "transient-universe"; - version = "0.3.2"; - sha256 = "2c5871cc7d15b666c78651501d006cb6a9759ea547a97cb9ee70ced6e88c3297"; + version = "0.3.2.3"; + sha256 = "ea861a538231bfa6a495f22b764ce80cfa8e65512419c9ab16c811b708625b2f"; libraryHaskellDepends = [ base bytestring case-insensitive containers directory filepath hashable HTTP iproute mtl network network-info network-uri process @@ -164231,7 +164965,7 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "translatable-intset" = callPackage @@ -166124,8 +166858,8 @@ self: { }: mkDerivation { pname = "type-natural"; - version = "0.4.1.1"; - sha256 = "aebf48c5ecee80effa51d564783cb26be918b3e9ece9feffd4854ad7f3a15ea1"; + version = "0.6.0.0"; + sha256 = "6b09df942a2613f540534b3dfe014ccd649afb3e3923f3d140a0ba69dee0bc05"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger monomorphic singletons template-haskell @@ -166208,6 +166942,19 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "type-spec" = callPackage + ({ mkDerivation, base, pretty, show-type }: + mkDerivation { + pname = "type-spec"; + version = "0.2.0.0"; + sha256 = "8203f98c53d9d533da9e20e6e3c74ed5d144fad2ee21f58d8b3addd78cd172fa"; + libraryHaskellDepends = [ base pretty show-type ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/sheyll/type-spec#readme"; + description = "Type Level Specification by Example"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "type-spine" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -166482,33 +167229,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "typerbole" = callPackage - ({ mkDerivation, base, bifunctors, checkers, containers - , data-ordlist, either, fgl, generic-random, hspec, lens - , megaparsec, mtl, QuickCheck, safe, semigroups, syb - , template-haskell, th-lift - }: - mkDerivation { - pname = "typerbole"; - version = "0.0.0.5"; - sha256 = "69c659f118017ef1bb99267d64b5c330115a589801481f3ee25c41067e0781a6"; - revision = "1"; - editedCabalFile = "62f89e02f7752d24111a37f753a4024f84828a4af7dc7de3af25d70d5b17981b"; - libraryHaskellDepends = [ - base bifunctors containers data-ordlist either fgl generic-random - lens megaparsec mtl QuickCheck safe semigroups syb template-haskell - th-lift - ]; - testHaskellDepends = [ - base bifunctors checkers containers either hspec QuickCheck - semigroups syb - ]; - jailbreak = true; - homepage = "https://github.com/Lokidottir/typerbole"; - description = "A typesystems library with exaggerated claims"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "types-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -166695,8 +167415,8 @@ self: { ({ mkDerivation, aeson, base, hspec, text, webapi }: mkDerivation { pname = "uber"; - version = "0.1.0.0"; - sha256 = "ab7ecef408cc04b51c1253d5c19274f8e92e974d114b434e48cc7814ecc0da30"; + version = "0.1.1.0"; + sha256 = "756ab823573ef431b0b538ded572ffa3861880bf517d467a21fd0b4a3adb95a7"; libraryHaskellDepends = [ aeson base text webapi ]; testHaskellDepends = [ base hspec text ]; homepage = "https://github.com/byteally/webapi-uber.git"; @@ -167190,8 +167910,8 @@ self: { }: mkDerivation { pname = "uni-htk"; - version = "2.2.1.2"; - sha256 = "d357582ef386f97ff87f6e299632c2b58a6fad7d5b5016b724fc35f3a578abfd"; + version = "2.2.1.3"; + sha256 = "c93fb0b1e291eddafa61f1632e67a467d0337e26039be5a6a745d0f80e0b5044"; libraryHaskellDepends = [ base containers directory uni-events uni-posixutil uni-reactor uni-util @@ -168181,6 +168901,7 @@ self: { attoparsec interspersed QuickCheck quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/unsequential"; description = "An extension removing the sequentiality from monads"; license = stdenv.lib.licenses.mit; @@ -171250,7 +171971,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-app-static" = callPackage + "wai-app-static_3_1_5" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, containers, cryptonite, directory, file-embed , filepath, hspec, http-date, http-types, memory, mime-types @@ -171282,6 +172003,41 @@ self: { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-app-static" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup + , bytestring, containers, cryptonite, directory, file-embed + , filepath, hspec, http-date, http-types, memory, mime-types + , mockery, network, old-locale, optparse-applicative + , template-haskell, temporary, text, time, transformers + , unix-compat, unordered-containers, wai, wai-extra, warp, zlib + }: + mkDerivation { + pname = "wai-app-static"; + version = "3.1.6"; + sha256 = "a7096d9ebb371e75953dc3e2895d90761f3b2ded6d01382530544810fdd94214"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder blaze-html blaze-markup bytestring containers + cryptonite directory file-embed filepath http-date http-types + memory mime-types old-locale optparse-applicative template-haskell + text time transformers unix-compat unordered-containers wai + wai-extra warp zlib + ]; + executableHaskellDepends = [ + base bytestring containers directory mime-types text + ]; + testHaskellDepends = [ + base bytestring filepath hspec http-date http-types mime-types + mockery network old-locale temporary text time transformers + unix-compat wai wai-extra zlib + ]; + homepage = "http://www.yesodweb.com/book/web-application-interface"; + description = "WAI application for static serving"; + license = stdenv.lib.licenses.mit; }) {}; "wai-conduit" = callPackage @@ -172197,7 +172953,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-predicates" = callPackage + "wai-predicates_0_8_6" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, cookie, http-types , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers @@ -172220,6 +172976,30 @@ self: { homepage = "https://gitlab.com/twittner/wai-predicates/"; description = "WAI request predicates"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-predicates" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , bytestring-conversion, case-insensitive, cookie, http-types + , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers + , vault, vector, wai + }: + mkDerivation { + pname = "wai-predicates"; + version = "0.9.0"; + sha256 = "1802d3aa8cec1ce0049cc115166504a83e6866e279d0345e1a72986f1d4e1b50"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-conversion case-insensitive + cookie http-types singletons transformers vault vector wai + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive http-types tasty + tasty-hunit tasty-quickcheck wai + ]; + homepage = "https://gitlab.com/twittner/wai-predicates/"; + description = "WAI request predicates"; + license = "unknown"; }) {}; "wai-request-spec" = callPackage @@ -172310,7 +173090,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "wai-routing" = callPackage + "wai-routing_0_12_3" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, containers, cookie , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers @@ -172333,6 +173113,31 @@ self: { homepage = "https://gitlab.com/twittner/wai-routing/"; description = "Declarative routing for WAI"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-routing" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , bytestring-conversion, case-insensitive, containers, cookie + , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers + , wai, wai-predicates, wai-route + }: + mkDerivation { + pname = "wai-routing"; + version = "0.13.0"; + sha256 = "f4841b028e20f49e3617d13247c04f457c850421321a92e7ab4e372ee85cde8f"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-conversion case-insensitive + cookie http-types transformers wai wai-predicates wai-route + ]; + testHaskellDepends = [ + base blaze-builder bytestring bytestring-conversion + case-insensitive containers http-types tasty tasty-hunit + tasty-quickcheck wai wai-predicates + ]; + homepage = "https://gitlab.com/twittner/wai-routing/"; + description = "Declarative routing for WAI"; + license = stdenv.lib.licenses.mpl20; }) {}; "wai-session" = callPackage @@ -172565,7 +173370,7 @@ self: { license = "unknown"; }) {}; - "wai-websockets" = callPackage + "wai-websockets_3_0_0_9" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , file-embed, http-types, network, text, transformers, wai , wai-app-static, warp, websockets @@ -172588,6 +173393,32 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provide a bridge between WAI and the websockets package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-websockets" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , file-embed, http-types, network, text, transformers, wai + , wai-app-static, warp, websockets + }: + mkDerivation { + pname = "wai-websockets"; + version = "3.0.1"; + sha256 = "6416ec322e4a93486342f73df6f47dd6a54c660739fdb09ca97df8bedeba4c1a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive http-types network + transformers wai websockets + ]; + executableHaskellDepends = [ + base blaze-builder bytestring case-insensitive file-embed + http-types network text transformers wai wai-app-static warp + websockets + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provide a bridge between WAI and the websockets package"; + license = stdenv.lib.licenses.mit; }) {}; "wait-handle" = callPackage @@ -172663,7 +173494,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "warp" = callPackage + "warp_3_2_7" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date @@ -172693,6 +173524,39 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "warp" = callPackage + ({ mkDerivation, array, async, auto-update, base, blaze-builder + , bytestring, bytestring-builder, case-insensitive, containers + , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date + , http-types, http2, HUnit, iproute, lifted-base, network, process + , QuickCheck, silently, simple-sendfile, stm, streaming-commons + , text, time, transformers, unix, unix-compat, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.2.8"; + sha256 = "09de2d19cf0d1af8afe9f96e916aa7dafda82ddab3258fdec31963db81c2cf3c"; + libraryHaskellDepends = [ + array async auto-update base blaze-builder bytestring + bytestring-builder case-insensitive containers ghc-prim hashable + http-date http-types http2 iproute network simple-sendfile stm + streaming-commons text unix unix-compat vault wai word8 + ]; + testHaskellDepends = [ + array async auto-update base blaze-builder bytestring + bytestring-builder case-insensitive containers directory doctest + ghc-prim hashable hspec HTTP http-date http-types http2 HUnit + iproute lifted-base network process QuickCheck silently + simple-sendfile stm streaming-commons text time transformers unix + unix-compat vault wai word8 + ]; + doCheck = false; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; }) {}; "warp-dynamic" = callPackage @@ -173250,19 +174114,20 @@ self: { "webapi" = callPackage ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring , bytestring-lexing, bytestring-trie, case-insensitive, containers - , cookie, exceptions, hspec, hspec-wai, http-client + , cookie, directory, exceptions, hspec, hspec-wai, http-client , http-client-tls, http-media, http-types, network-uri, QuickCheck , resourcet, text, time, transformers, vector, wai, wai-extra, warp }: mkDerivation { pname = "webapi"; - version = "0.2.2.0"; - sha256 = "b908d6b1a03750fa6ef45a2ac445eb9d52afb2fd3de73898081d80a791d843eb"; + version = "0.3"; + sha256 = "da79c7547b1b0325b3d965d19bc0009fe91433b6fffdbf3a40aa33d2c8aedd4b"; libraryHaskellDepends = [ aeson base binary blaze-builder bytestring bytestring-lexing - bytestring-trie case-insensitive containers cookie exceptions - http-client http-client-tls http-media http-types network-uri - QuickCheck resourcet text time transformers vector wai wai-extra + bytestring-trie case-insensitive containers cookie directory + exceptions http-client http-client-tls http-media http-types + network-uri QuickCheck resourcet text time transformers vector wai + wai-extra ]; testHaskellDepends = [ aeson base bytestring case-insensitive hspec hspec-wai http-media From ea7e705cd905e01bc65f2a7ccc6e700bd1bcd4e0 Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Thu, 4 Aug 2016 15:25:23 +0200 Subject: [PATCH 088/168] varnish: fix localstatedir for varnish* tools (#17508) The varnish tools (varnishstat, varnishlog, ...) tried to load the VSM file from a spurious var directory in the Nix store. Fix the default so the tools "just work" when also keeping services.varnish.stateDir at the default. Notes: - The tools use $localstatedir/$HOSTNAME so I've adapted the default for stateDir as well to contain hostName. - Added postStop action to remove the localstatedir. There is no point in keeping it around when varnish does not run, as it regenerates it on startup anyway. Fixes #7495 --- nixos/modules/services/web-servers/varnish/default.nix | 5 ++++- pkgs/servers/varnish/default.nix | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index 364f6c68fac..61df43ec235 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -28,7 +28,7 @@ with lib; }; stateDir = mkOption { - default = "/var/spool/varnish"; + default = "/var/spool/varnish/${config.networking.hostName}"; description = " Directory holding all state for Varnish to run. "; @@ -46,6 +46,9 @@ with lib; mkdir -p ${cfg.stateDir} chown -R varnish:varnish ${cfg.stateDir} ''; + postStop = '' + rm -rf ${cfg.stateDir} + ''; path = [ pkgs.gcc ]; serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish"; serviceConfig.Type = "forking"; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 358afb3dfb3..fb333176801 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python pythonPackages.docutils]; + buildFlags = "localstatedir=/var/spool"; + meta = { description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; From 4ee36f3112119b3a1fb63b52ca07c5ce99ca3f90 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 09:07:08 -0500 Subject: [PATCH 089/168] kde5.plasma: 5.7.2 -> 5.7.3 --- maintainers/scripts/generate-kde-plasma.sh | 2 +- pkgs/desktops/kde-5/plasma/srcs.nix | 320 ++++++++++----------- 2 files changed, 161 insertions(+), 161 deletions(-) diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh index 2e2373be36d..24760e7ac08 100755 --- a/maintainers/scripts/generate-kde-plasma.sh +++ b/maintainers/scripts/generate-kde-plasma.sh @@ -1,5 +1,5 @@ #!/bin/sh ./maintainers/scripts/fetch-kde-qt.sh \ - http://download.kde.org/stable/plasma/5.7.2/ -A '*.tar.xz' \ + http://download.kde.org/stable/plasma/5.7.3/ -A '*.tar.xz' \ >pkgs/desktops/kde-5/plasma/srcs.nix diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 15048dc9da2..2e401796cf4 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/bluedevil-5.7.2.tar.xz"; - sha256 = "0lw7yf38vdxl5q8fyqp7xnhppv0r6ayr7wd3m73f1w7fqpkjd9v6"; - name = "bluedevil-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/bluedevil-5.7.3.tar.xz"; + sha256 = "0485lm4d18qv1w0qgb46g318xbb3cd6d5j42j0s95snrg7rlp717"; + name = "bluedevil-5.7.3.tar.xz"; }; }; breeze = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/breeze-5.7.2.tar.xz"; - sha256 = "150lpy6jd2asbx8s5mznyagja31q5xwhhqqisrlnxapln2qj6xay"; - name = "breeze-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/breeze-5.7.3.tar.xz"; + sha256 = "1wyj13sw4xrpb155p00wpn2hvvkpjrpf14b15sk3dpbhlzc8m77p"; + name = "breeze-5.7.3.tar.xz"; }; }; breeze-grub = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/breeze-grub-5.7.2.tar.xz"; - sha256 = "1qhgqb3wa8mciddwa0v4kw3vs17annib0qy2jpy5qdfjc4yblq5q"; - name = "breeze-grub-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/breeze-grub-5.7.3.tar.xz"; + sha256 = "0xlxpg1z67mjn3mf698b2jrls7fyb19i3carmr56c0f45r628lpf"; + name = "breeze-grub-5.7.3.tar.xz"; }; }; breeze-gtk = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/breeze-gtk-5.7.2.tar.xz"; - sha256 = "08jfvxfmzbnk4jjzljlp9wr37b7rmxcwnmi866x5v01x9iqfbcgw"; - name = "breeze-gtk-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/breeze-gtk-5.7.3.tar.xz"; + sha256 = "0bw9hj0ca99kfvfw621l19wm9x81p8pyc19yrlhbr527mhw65i65"; + name = "breeze-gtk-5.7.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/breeze-plymouth-5.7.2.tar.xz"; - sha256 = "16dwqiq26xxpff0fni7aiq919k7jfmi35sj8xvvafb30wm4y3jix"; - name = "breeze-plymouth-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/breeze-plymouth-5.7.3.tar.xz"; + sha256 = "0hiscvdqrnig594w9b0b69wzbqgcrc56p9r0z52pj2zw4df5m3za"; + name = "breeze-plymouth-5.7.3.tar.xz"; }; }; discover = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/discover-5.7.2.tar.xz"; - sha256 = "0kp3d7d21zxc8ag6f075r8mvfqd5mmk258aix5pyqc1njzb6rgg0"; - name = "discover-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/discover-5.7.3.tar.xz"; + sha256 = "1ylq2mfzqjibfx7g6xd1b83sg9a8s60jjnxzgf808kxqzrb7b6bg"; + name = "discover-5.7.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kactivitymanagerd-5.7.2.tar.xz"; - sha256 = "0asp3jzl1vaqxs0nvkfxx5d8hnnsvcygbjgc4i63l7fjs64a789r"; - name = "kactivitymanagerd-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kactivitymanagerd-5.7.3.tar.xz"; + sha256 = "0ajm5d15qglb7k8js7626mcxi19g0vsgvs7y3ggqngvklpnpgqr0"; + name = "kactivitymanagerd-5.7.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kde-cli-tools-5.7.2.tar.xz"; - sha256 = "0y2pwshsiqgcxvj3yc6vyyhg8fkb5ddslnf1f86r92sy66gbjw0s"; - name = "kde-cli-tools-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kde-cli-tools-5.7.3.tar.xz"; + sha256 = "1pg6zabll61q8krw3h5i8z0bj6zxm7g21dza5jgvb0vbirr4zgz6"; + name = "kde-cli-tools-5.7.3.tar.xz"; }; }; kdecoration = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kdecoration-5.7.2.tar.xz"; - sha256 = "1wpb1kivy570ggrd7ip8n3zllyslzk6qlqc02i8g4rbavw0fxscx"; - name = "kdecoration-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kdecoration-5.7.3.tar.xz"; + sha256 = "1k20x7ndp8rv8ihphkz68g4m7r73gvswcnxi1ahipqnw5mnywl9c"; + name = "kdecoration-5.7.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kde-gtk-config-5.7.2.tar.xz"; - sha256 = "08giv5w4055rd70nb28lwapdcfnywx2whgzpc1gdvsbgl6ap742n"; - name = "kde-gtk-config-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kde-gtk-config-5.7.3.tar.xz"; + sha256 = "0ynpk4p4yx2wy0jm1bk9v8rk27w5fb1ra1d2w6gfz33ijp7iah92"; + name = "kde-gtk-config-5.7.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kdeplasma-addons-5.7.2.tar.xz"; - sha256 = "1qlr3fgp7gqyjyncn1qjajhbvb45sdbp9aqhz6ccnv3smwm74mp7"; - name = "kdeplasma-addons-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kdeplasma-addons-5.7.3.tar.xz"; + sha256 = "0jdc2avjjy0p4rib7k7wd3ns02pyi57dyfqgja606gbipdvw1fwn"; + name = "kdeplasma-addons-5.7.3.tar.xz"; }; }; kgamma5 = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kgamma5-5.7.2.tar.xz"; - sha256 = "0jkk0lz4qaxsmgii3i698anpp0a9q0nakpb5h0kxffx5j01s5s25"; - name = "kgamma5-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kgamma5-5.7.3.tar.xz"; + sha256 = "1zzig2iw5wjhvym35vbljqa4ma7jyprqvqxbcw3aqj1hp5z9g35k"; + name = "kgamma5-5.7.3.tar.xz"; }; }; khotkeys = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/khotkeys-5.7.2.tar.xz"; - sha256 = "02v0q8j65fbc39krc2gcs42yyx3g056w156zg6d59j6srwci5ksm"; - name = "khotkeys-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/khotkeys-5.7.3.tar.xz"; + sha256 = "1xq70j2wfxxbhzn3darjx75120j641v8rd20wjcn5bmr1xlr5fb7"; + name = "khotkeys-5.7.3.tar.xz"; }; }; kinfocenter = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kinfocenter-5.7.2.tar.xz"; - sha256 = "1xpyi05y9qxv51j8gazk0qlhy2yscz8lgzgh3lw7lp21jv1frxg4"; - name = "kinfocenter-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kinfocenter-5.7.3.tar.xz"; + sha256 = "1s66400kh49wzfsgahdya6w1j2a4f5w47lllpy2i6w1xl3pag219"; + name = "kinfocenter-5.7.3.tar.xz"; }; }; kmenuedit = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kmenuedit-5.7.2.tar.xz"; - sha256 = "0bavsxh3lsnk5h70l81317vqgmms5r0lr7ph2vdlcfrb708xp0xp"; - name = "kmenuedit-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kmenuedit-5.7.3.tar.xz"; + sha256 = "0j0qk1p9j25kk8jysx41jnh52yflb2xf2xg64p7x72i6ci8axyaa"; + name = "kmenuedit-5.7.3.tar.xz"; }; }; kscreen = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kscreen-5.7.2.tar.xz"; - sha256 = "1d23i6mw1di01386icdq5p64a3gmq6n6cg73v6wfw3vvgl0lls6w"; - name = "kscreen-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kscreen-5.7.3.tar.xz"; + sha256 = "1z48sycq6i618ypba78hm5vh8m3c9c0k44jl4lrxvx524axhg11w"; + name = "kscreen-5.7.3.tar.xz"; }; }; kscreenlocker = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kscreenlocker-5.7.2.tar.xz"; - sha256 = "1c4afc7s5b2q5yc53xpp8q2k0w8lxmvg8rrqb6qnrqz1xrxil3ld"; - name = "kscreenlocker-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kscreenlocker-5.7.3.tar.xz"; + sha256 = "1xnzca0mli25mmg0x4pqa1gfhvw4f3m7cqn1ml92z7fnh8rbqw5k"; + name = "kscreenlocker-5.7.3.tar.xz"; }; }; ksshaskpass = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/ksshaskpass-5.7.2.tar.xz"; - sha256 = "07annxlr46h7x6dq5vfs6rzgm11x8bv1n1icgji2wabdj3zsy2pa"; - name = "ksshaskpass-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/ksshaskpass-5.7.3.tar.xz"; + sha256 = "1ihhavb87xzgb649lxc2z9hcxrc37pgx52f13hbswbzl1086nfqh"; + name = "ksshaskpass-5.7.3.tar.xz"; }; }; ksysguard = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/ksysguard-5.7.2.tar.xz"; - sha256 = "08y9vsdzsq18hgfrk52hk3hmv23x6xv4j73dji97g38z26slvbp6"; - name = "ksysguard-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/ksysguard-5.7.3.tar.xz"; + sha256 = "1rkhjjxcp6d0ybpnyjkadx3hyv2r9c1xgby4x042ac0kycvkxdiz"; + name = "ksysguard-5.7.3.tar.xz"; }; }; kwallet-pam = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kwallet-pam-5.7.2.tar.xz"; - sha256 = "1701abpwp90vsi5v4n675848gnp17psiagd5hv9yypc2a7g82sf2"; - name = "kwallet-pam-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kwallet-pam-5.7.3.tar.xz"; + sha256 = "1nfphzlcwx0l6wa4kl7akwmf8wb1pr1acyaxchivj463wbnbygy4"; + name = "kwallet-pam-5.7.3.tar.xz"; }; }; kwayland-integration = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kwayland-integration-5.7.2.tar.xz"; - sha256 = "0jd9cv8ivn71h90xjr53nanx02z95ylsn5pkwx03wjvx4bdwwvpv"; - name = "kwayland-integration-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kwayland-integration-5.7.3.tar.xz"; + sha256 = "1wlimrd33fa3wkvw5kdg3y73s6x33rd2i70prb4svr15bb82pfin"; + name = "kwayland-integration-5.7.3.tar.xz"; }; }; kwin = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kwin-5.7.2.tar.xz"; - sha256 = "00f9chy1qg24r6rqpqfhc4jjx6j1nw18gxzpd1m16shkqf5il15h"; - name = "kwin-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kwin-5.7.3.tar.xz"; + sha256 = "0rh4mjv9cspv21y5a81cfdi3p3mvybmwvcbyx68svpzpfj6mvpca"; + name = "kwin-5.7.3.tar.xz"; }; }; kwrited = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kwrited-5.7.2.tar.xz"; - sha256 = "06j18395pkyiph9mzvmfjjdm623ggijgkalggsz4a7kllk1v964q"; - name = "kwrited-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kwrited-5.7.3.tar.xz"; + sha256 = "1qx67gv75n9m777g4a6hj75nsbv7wqqb2bb7fm7bm5110lv1j3gl"; + name = "kwrited-5.7.3.tar.xz"; }; }; libkscreen = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/libkscreen-5.7.2.tar.xz"; - sha256 = "0ympads0iylpsv0idmbgwc8gzc3xskqcgv1bn4mbpfrp360ibmia"; - name = "libkscreen-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/libkscreen-5.7.3.tar.xz"; + sha256 = "1zmzhqb2fb6mxilqfyxhgnflqwcf0cx006h3psx3mf634qqh1ixi"; + name = "libkscreen-5.7.3.tar.xz"; }; }; libksysguard = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/libksysguard-5.7.2.tar.xz"; - sha256 = "0qk14ca9hfbm4ba840yjrar1kqh3dsl2hywqf45lrv42r47k19ak"; - name = "libksysguard-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/libksysguard-5.7.3.tar.xz"; + sha256 = "1gcrwlksvv1br03j11v2bhgikkwwhh0ynv2z3g9lbyvbjg8jmwya"; + name = "libksysguard-5.7.3.tar.xz"; }; }; milou = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/milou-5.7.2.tar.xz"; - sha256 = "13w9fn1icxaxslk04a3gb41yb6hw705xj0xkmv5wy198m8f9m84a"; - name = "milou-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/milou-5.7.3.tar.xz"; + sha256 = "172qvnkniqbhxdzm1inl6adjxfy13a9hnimqfwdgf1f7ss5dmsp7"; + name = "milou-5.7.3.tar.xz"; }; }; oxygen = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/oxygen-5.7.2.tar.xz"; - sha256 = "0156v7b9capc1j5kv099fy00dzcqiygvmvs9nsy6m3ly7v9av428"; - name = "oxygen-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/oxygen-5.7.3.tar.xz"; + sha256 = "0y3jf5y21dzpyv9vz44qb7kqr1afmad9yvq45kwpjwlnabz75y3r"; + name = "oxygen-5.7.3.tar.xz"; }; }; plasma-desktop = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-desktop-5.7.2.tar.xz"; - sha256 = "0kkw4h1vn32qdpzd16334s2m38wcckc06bx1bs99jj6hpmgh6597"; - name = "plasma-desktop-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-desktop-5.7.3.tar.xz"; + sha256 = "1plfrfzczzz2x2pp8f3vkphds9hfp28qmcyaf2c63snjcply0vjg"; + name = "plasma-desktop-5.7.3.tar.xz"; }; }; plasma-integration = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-integration-5.7.2.tar.xz"; - sha256 = "1j8a0c0dxdl7kyj6hm1r5lq7ykg9xhn51s90gyhr6rqs0hla7n6g"; - name = "plasma-integration-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-integration-5.7.3.tar.xz"; + sha256 = "1wlwmjf4m6f4bps8vbk8f1ixjmd3krm5h1mc27mls35r783kh3hl"; + name = "plasma-integration-5.7.3.tar.xz"; }; }; plasma-mediacenter = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-mediacenter-5.7.2.tar.xz"; - sha256 = "1vgb7mlqqlh338p0mqfc613qcdz1c3kwgg9m7yb5fk8kzh9v1fwn"; - name = "plasma-mediacenter-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-mediacenter-5.7.3.tar.xz"; + sha256 = "0p5pip14y2rfv9gsk40jqbv2hg2m7wg8cvycbc774gi19zr19ajr"; + name = "plasma-mediacenter-5.7.3.tar.xz"; }; }; plasma-nm = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-nm-5.7.2.tar.xz"; - sha256 = "1aqf2jzljzc1wwswxq9gn74p0169sqq9yrm7ngz1ns11b0q8m1bm"; - name = "plasma-nm-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-nm-5.7.3.tar.xz"; + sha256 = "0xap1mjj1lg9nvys1ld9d4bvx5vi3qi2gc4gvdh7h4i1phyzfqwz"; + name = "plasma-nm-5.7.3.tar.xz"; }; }; plasma-pa = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-pa-5.7.2.tar.xz"; - sha256 = "0w201rrxjds5i1hc6mn4mpqn6kvpz175r0id9rxqfdzyrqcgknpv"; - name = "plasma-pa-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-pa-5.7.3.tar.xz"; + sha256 = "11dwm848ylm7fx2fgmjxsknqd5vq0832h8d3ak0f0a2gbrqpvgis"; + name = "plasma-pa-5.7.3.tar.xz"; }; }; plasma-sdk = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-sdk-5.7.2.tar.xz"; - sha256 = "0zsbrlmv5kgaa53a906ky071vj38i58kz0wqrr2dy2b47pnx77pl"; - name = "plasma-sdk-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-sdk-5.7.3.tar.xz"; + sha256 = "1xi4gyrcwll8m0ilmqrpaa8anx7bravz25f7j613zmr7c59372cb"; + name = "plasma-sdk-5.7.3.tar.xz"; }; }; plasma-workspace = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-5.7.2.tar.xz"; - sha256 = "1k03g6scbgrsrk1dmfaw6s5sahlck81rka7kpzx60rdas6vfw60y"; - name = "plasma-workspace-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-workspace-5.7.3.tar.xz"; + sha256 = "0hlh7qvll48hnpmjkhf53fxx91yx8sdhsyc9y77mfzwavd72354q"; + name = "plasma-workspace-5.7.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-wallpapers-5.7.2.tar.xz"; - sha256 = "1wzhrix2nafzlszanh05fbcs746c391wp27i24fvh3rhpg5j57zx"; - name = "plasma-workspace-wallpapers-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-workspace-wallpapers-5.7.3.tar.xz"; + sha256 = "0452k2ic16cf385l057chh2a3wh4hjxxlpnlapfyxsmxhz29ymgz"; + name = "plasma-workspace-wallpapers-5.7.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.7.2"; + version = "1-5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/polkit-kde-agent-1-5.7.2.tar.xz"; - sha256 = "0kx021xjgsp1gpv2s9kigxf1srabkly2l61hf5wpj0hml79dwrc5"; - name = "polkit-kde-agent-1-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/polkit-kde-agent-1-5.7.3.tar.xz"; + sha256 = "1j1724dffrpv06xzmgqvm4xbdscflkcx31bshwh2mizcxknb2bbq"; + name = "polkit-kde-agent-1-5.7.3.tar.xz"; }; }; powerdevil = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/powerdevil-5.7.2.tar.xz"; - sha256 = "132k18dqm487f8v2irxlxhs1ljvcyyig9lkb36isajsw7k6949vb"; - name = "powerdevil-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/powerdevil-5.7.3.tar.xz"; + sha256 = "1npbdwhic2bkdzxggkvyl1bqpfb7ihcpa8rds3c6bf6smbkhwiqi"; + name = "powerdevil-5.7.3.tar.xz"; }; }; sddm-kcm = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/sddm-kcm-5.7.2.tar.xz"; - sha256 = "19bxbpz80pr66gd9mycwfcw8sagkpzbffm98bzikpdjcll6a6ysh"; - name = "sddm-kcm-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/sddm-kcm-5.7.3.tar.xz"; + sha256 = "1s80j6hjjz8n079k8867xbb1q20n7mxrcjlfm44m2p0qz8nv4kjk"; + name = "sddm-kcm-5.7.3.tar.xz"; }; }; systemsettings = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/systemsettings-5.7.2.tar.xz"; - sha256 = "0f2q0mfhmn0nf4mx76hp3lxciwiivsqq3ayv15s1hzxpi24vsini"; - name = "systemsettings-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/systemsettings-5.7.3.tar.xz"; + sha256 = "0776vqnwvpf1x52lz8wpl3y43r5zq6l3wviw0fpbj4fcg8jmryr3"; + name = "systemsettings-5.7.3.tar.xz"; }; }; user-manager = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/user-manager-5.7.2.tar.xz"; - sha256 = "0faf4wnbkcx6wlg92cd8mskp1xhqm0crj886y22ycjiaqhbnc43p"; - name = "user-manager-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/user-manager-5.7.3.tar.xz"; + sha256 = "172gl6p6ai0gi2m10b0rpcg69xqf4127cf6gbvv0r22cprhxw1cb"; + name = "user-manager-5.7.3.tar.xz"; }; }; } From 44f3ad9ebb8d237ef14126e7eac81697cc87d954 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 09:07:17 -0500 Subject: [PATCH 090/168] kde5.kinfocenter: display Wayland and OpenGL info --- pkgs/desktops/kde-5/plasma/kinfocenter.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/kde-5/plasma/kinfocenter.nix index dd9bdbd31bd..939e4fa62a9 100644 --- a/pkgs/desktops/kde-5/plasma/kinfocenter.nix +++ b/pkgs/desktops/kde-5/plasma/kinfocenter.nix @@ -1,16 +1,17 @@ -{ plasmaPackage, ecm, kdoctools, kcmutils -, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons -, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage -, kservice, kwidgetsaddons, kxmlgui, libraw1394 -, pciutils, solid +{ + plasmaPackage, + ecm, kdoctools, + kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, + kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, + kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid }: plasmaPackage { name = "kinfocenter"; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig - kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice - kwidgetsaddons kxmlgui libraw1394 pciutils solid + kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons + kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice + kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid ]; } From fe8f0dbd53fb2497a44be21a177188d5c52e36e7 Mon Sep 17 00:00:00 2001 From: Eric Merritt Date: Tue, 31 May 2016 09:29:54 -0700 Subject: [PATCH 091/168] nixos-container: fix allow alternative nixos paths This should be completely backwards compatible. It allows the '-f' part of the nix-env command to be configured. This greatly eases using nixos-container as part of development where several nixpkgs repositories might be tested at the same time. --- .../nixos-container/nixos-container.pl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index a4b6f11654e..6d28c2a4d61 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -18,13 +18,13 @@ umask 0022; sub showHelp { print < [--system-path ] [--config ] [--ensure-unique-name] [--auto-start] + nixos-container create [--nixos-path ] [--system-path ] [--config ] [--ensure-unique-name] [--auto-start] nixos-container destroy nixos-container start nixos-container stop nixos-container kill [--signal ] nixos-container status - nixos-container update [--config ] + nixos-container update [--config ] [--nixos-path ] nixos-container login nixos-container root-login nixos-container run -- args... @@ -35,6 +35,7 @@ EOF } my $systemPath; +my $nixosPath; my $ensureUniqueName = 0; my $autoStart = 0; my $extraConfig; @@ -45,8 +46,9 @@ GetOptions( "ensure-unique-name" => \$ensureUniqueName, "auto-start" => \$autoStart, "system-path=s" => \$systemPath, - "config=s" => \$extraConfig, "signal=s" => \$signal + "nixos-path=s" => \$nixosPath, + "config=s" => \$extraConfig ) or exit 1; my $action = $ARGV[0] or die "$0: no action specified\n"; @@ -158,11 +160,12 @@ if ($action eq "create") { } else { mkpath("$root/etc/nixos", 0, 0755); + my $nixenvF = $nixosPath // ""; my $nixosConfigFile = "$root/etc/nixos/configuration.nix"; writeNixOSConfig $nixosConfigFile; system("nix-env", "-p", "$profileDir/system", - "-I", "nixos-config=$nixosConfigFile", "-f", "", + "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF", "--set", "-A", "system") == 0 or die "$0: failed to build initial container configuration\n"; } @@ -272,8 +275,9 @@ elsif ($action eq "update") { # configuration.nix. writeNixOSConfig $nixosConfigFile if (defined $extraConfig && $extraConfig ne ""); + my $nixenvF = $nixosPath // ""; system("nix-env", "-p", "$profileDir/system", - "-I", "nixos-config=$nixosConfigFile", "-f", "", + "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF", "--set", "-A", "system") == 0 or die "$0: failed to build container configuration\n"; From a2feaf6d79ad286925f51c08772f2d6f4d3db71b Mon Sep 17 00:00:00 2001 From: Eric Merritt Date: Fri, 24 Jun 2016 07:02:26 -0700 Subject: [PATCH 092/168] nixos-container: feature add 'config-file' option This adds a config file option to nixos-container.pl that makes it quite a bit easier to use. --- .../nixos-container/nixos-container.pl | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 6d28c2a4d61..ec2e05c387a 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -6,6 +6,7 @@ use File::Path; use File::Slurp; use Fcntl ':flock'; use Getopt::Long qw(:config gnu_getopt); +use Cwd 'abs_path'; my $nsenter = "@utillinux@/bin/nsenter"; my $su = "@su@"; @@ -18,13 +19,13 @@ umask 0022; sub showHelp { print < [--nixos-path ] [--system-path ] [--config ] [--ensure-unique-name] [--auto-start] + nixos-container create [--nixos-path ] [--system-path ] [--config-file ] [--config ] [--ensure-unique-name] [--auto-start] nixos-container destroy nixos-container start nixos-container stop nixos-container kill [--signal ] nixos-container status - nixos-container update [--config ] [--nixos-path ] + nixos-container update [--config ] [--config-file ] nixos-container login nixos-container root-login nixos-container run -- args... @@ -40,6 +41,7 @@ my $ensureUniqueName = 0; my $autoStart = 0; my $extraConfig; my $signal; +my $configFile; GetOptions( "help" => sub { showHelp() }, @@ -48,11 +50,16 @@ GetOptions( "system-path=s" => \$systemPath, "signal=s" => \$signal "nixos-path=s" => \$nixosPath, - "config=s" => \$extraConfig + "config=s" => \$extraConfig, + "config-file=s" => \$configFile ) or exit 1; my $action = $ARGV[0] or die "$0: no action specified\n"; +if (defined $configFile and defined $extraConfig) { + die "--config and --config-file are mutually incompatible. " . + "Please define on or the other, but not both"; +} # Execute the selected action. @@ -73,6 +80,17 @@ $containerName =~ /^[a-zA-Z0-9\-]+$/ or die "$0: invalid container name\n"; sub writeNixOSConfig { my ($nixosConfigFile) = @_; + my $localExtraConfig = ""; + + + + if ($extraConfig) { + $localExtraConfig = $extraConfig + } elsif ($configFile) { + my $resolvedFile = abs_path($configFile); + $localExtraConfig = "imports = [ $resolvedFile ];" + } + my $nixosConfig = <"; system("nix-env", "-p", "$profileDir/system", - "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF", + "-I", "nixos-config=$nixosConfigFile", "-f", "", "--set", "-A", "system") == 0 or die "$0: failed to build container configuration\n"; From 81179317523a50b924ee1aed77e4ad189336b2e2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 09:13:53 -0500 Subject: [PATCH 093/168] kde5.kscreenlocker: reformat --- pkgs/desktops/kde-5/plasma/kscreenlocker.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix index 8fb5d9e708b..3c5d7b37472 100644 --- a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix +++ b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix @@ -1,13 +1,15 @@ -{ plasmaPackage, ecm, kcmutils, kcrash, kdeclarative -, kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland -, libXcursor, pam, plasma-framework, qtdeclarative, wayland +{ + plasmaPackage, + ecm, kdoctools, + kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, + kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland }: plasmaPackage { name = "kscreenlocker"; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support - kglobalaccel kidletime kwayland libXcursor pam wayland + kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland + libXcursor pam plasma-framework qtdeclarative wayland ]; } From 29c3fea7b0c05cdc12d845799c4dae203471c7f4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 09:45:54 -0500 Subject: [PATCH 094/168] kde5.breeze-qt5: add kwayland input --- pkgs/desktops/kde-5/plasma/breeze-qt5.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix index a909e5067f4..ea2776a13c5 100644 --- a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix +++ b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix @@ -1,21 +1,17 @@ -{ plasmaPackage, ecm, frameworkintegration -, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons -, ki18n, kwindowsystem, makeQtWrapper, plasma-framework, qtx11extras +{ + plasmaPackage, + ecm, + frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, + kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras }: plasmaPackage { name = "breeze-qt5"; sname = "breeze"; - nativeBuildInputs = [ - ecm - makeQtWrapper - ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ - frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras - kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons + frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration + kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; - postInstall = '' - wrapQtProgram "$out/bin/breeze-settings5" - ''; } From 0184f0e47cf765bb1990ed98f5d9044f1089c1a0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 09:46:35 -0500 Subject: [PATCH 095/168] kwin: add xwayland input --- .../0001-qdiriterator-follow-symlinks.patch | 25 ------------- pkgs/desktops/kde-5/plasma/kwin/default.nix | 35 +++++++++++-------- .../kde-5/plasma/kwin/follow-symlinks.patch | 13 +++++++ pkgs/desktops/kde-5/plasma/kwin/series | 2 ++ .../desktops/kde-5/plasma/kwin/xwayland.patch | 13 +++++++ 5 files changed, 48 insertions(+), 40 deletions(-) delete mode 100644 pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch create mode 100644 pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch create mode 100644 pkgs/desktops/kde-5/plasma/kwin/series create mode 100644 pkgs/desktops/kde-5/plasma/kwin/xwayland.patch diff --git a/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 7a70fec0d2d..00000000000 --- a/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 07:05:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - clients/aurorae/src/aurorae.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp -index 781c960..ad5f420 100644 ---- a/plugins/kdecorations/aurorae/src/aurorae.cpp -+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp -@@ -211,7 +211,7 @@ void Helper::init() - // so let's try to locate our plugin: - QString pluginPath; - for (const QString &path : m_engine->importPathList()) { -- QDirIterator it(path, QDirIterator::Subdirectories); -+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - QFileInfo fileInfo = it.fileInfo(); --- -2.5.2 - diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/kde-5/plasma/kwin/default.nix index d121ba84dd0..7af947bcfe8 100644 --- a/pkgs/desktops/kde-5/plasma/kwin/default.nix +++ b/pkgs/desktops/kde-5/plasma/kwin/default.nix @@ -1,11 +1,12 @@ -{ plasmaPackage, ecm, kdoctools, epoxy -, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets -, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel -, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications -, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem -, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative -, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor -, makeQtWrapper +{ + plasmaPackage, lib, copyPathsToStore, + ecm, kdoctools, + breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig, + kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, + ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, + kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, + kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative, + qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, xwayland }: plasmaPackage { @@ -15,13 +16,17 @@ plasmaPackage { kdoctools ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem - plasma-framework qtdeclarative qtmultimedia qtx11extras epoxy kcompletion - kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes - kidletime kinit knewstuff knotifications kpackage kservice kwayland - kwidgetsaddons kxmlgui libinput libICE libSM qtscript udev wayland - xcb-util-cursor + breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets + kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes + kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice + kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM + plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras udev + wayland xcb-util-cursor ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + postPatch = '' + substituteInPlace main_wayland.cpp \ + --subst-var-by xwayland ${lib.getBin xwayland}/bin/Xwayland + ''; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; } diff --git a/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch new file mode 100644 index 00000000000..60b8f5ef541 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch @@ -0,0 +1,13 @@ +Index: kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp +=================================================================== +--- kwin-5.7.3.orig/plugins/kdecorations/aurorae/src/aurorae.cpp ++++ kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp +@@ -211,7 +211,7 @@ void Helper::init() + // so let's try to locate our plugin: + QString pluginPath; + for (const QString &path : m_engine->importPathList()) { +- QDirIterator it(path, QDirIterator::Subdirectories); ++ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + QFileInfo fileInfo = it.fileInfo(); diff --git a/pkgs/desktops/kde-5/plasma/kwin/series b/pkgs/desktops/kde-5/plasma/kwin/series new file mode 100644 index 00000000000..9dbc88f4997 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/kwin/series @@ -0,0 +1,2 @@ +follow-symlinks.patch +xwayland.patch diff --git a/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch b/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch new file mode 100644 index 00000000000..5fde01d08bf --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch @@ -0,0 +1,13 @@ +Index: kwin-5.7.3/main_wayland.cpp +=================================================================== +--- kwin-5.7.3.orig/main_wayland.cpp ++++ kwin-5.7.3/main_wayland.cpp +@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe + + m_xwaylandProcess = new Process(kwinApp()); + m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); +- m_xwaylandProcess->setProgram(QStringLiteral("Xwayland")); ++ m_xwaylandProcess->setProgram(QStringLiteral("@xwayland@")); + QProcessEnvironment env = m_environment; + env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); + m_xwaylandProcess->setProcessEnvironment(env); From bed8eb86c611207c877d9ed7e42788e502da81d2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 10:00:12 -0500 Subject: [PATCH 096/168] kde5.breeze-plymouth: init at 5.7.3 --- .../kde-5/plasma/breeze-plymouth/default.nix | 16 ++++++++++++++++ .../breeze-plymouth/install-paths.patch | 19 +++++++++++++++++++ .../kde-5/plasma/breeze-plymouth/series | 1 + pkgs/desktops/kde-5/plasma/default.nix | 1 + 4 files changed, 37 insertions(+) create mode 100644 pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix create mode 100644 pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch create mode 100644 pkgs/desktops/kde-5/plasma/breeze-plymouth/series diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix b/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix new file mode 100644 index 00000000000..0de1ca1f680 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix @@ -0,0 +1,16 @@ +{ + plasmaPackage, lib, copyPathsToStore, + ecm, + plymouth +}: + +plasmaPackage { + name = "breeze-plymouth"; + nativeBuildInputs = [ ecm ]; + buildInputs = [ plymouth ]; + outputs = [ "out" ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + postPatch = '' + substituteInPlace cmake/FindPlymouth.cmake --subst-var out + ''; +} diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch b/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch new file mode 100644 index 00000000000..5d5856d122d --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch @@ -0,0 +1,19 @@ +Index: breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake +=================================================================== +--- breeze-plymouth-5.7.3.orig/cmake/FindPlymouth.cmake ++++ breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake +@@ -24,12 +24,8 @@ + include(FindPkgConfig) + + pkg_check_modules(Plymouth ply-boot-client ply-splash-core) +-exec_program(${PKG_CONFIG_EXECUTABLE} +- ARGS ply-splash-core --variable=pluginsdir +- OUTPUT_VARIABLE Plymouth_PLUGINSDIR) +-exec_program(${PKG_CONFIG_EXECUTABLE} +- ARGS ply-splash-core --variable=themesdir +- OUTPUT_VARIABLE Plymouth_THEMESDIR) ++set(Plymouth_PLUGINSDIR "@out@/lib/plymouth") ++set(Plymouth_THEMESDIR "@out@/share/plymouth/themes") + + find_package_handle_standard_args(Plymouth + FOUND_VAR diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/series b/pkgs/desktops/kde-5/plasma/breeze-plymouth/series new file mode 100644 index 00000000000..8920e7ca518 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/series @@ -0,0 +1 @@ +install-paths.patch diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 7aff229b4c1..5a8d148b1b0 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -52,6 +52,7 @@ let name = "breeze-${version}"; paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; }; + breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; kde-gtk-config = callPackage ./kde-gtk-config {}; From c291485b7485db0882bdfbf2cdcb3118102b28c3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 10:15:32 -0500 Subject: [PATCH 097/168] kde5.breeze-grub: init at 5.7.3 --- pkgs/desktops/kde-5/plasma/breeze-grub.nix | 16 ++++++++++++++++ pkgs/desktops/kde-5/plasma/default.nix | 1 + 2 files changed, 17 insertions(+) create mode 100644 pkgs/desktops/kde-5/plasma/breeze-grub.nix diff --git a/pkgs/desktops/kde-5/plasma/breeze-grub.nix b/pkgs/desktops/kde-5/plasma/breeze-grub.nix new file mode 100644 index 00000000000..da0fb6f73ad --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-grub.nix @@ -0,0 +1,16 @@ +{ + plasmaPackage +}: + +plasmaPackage { + name = "breeze-grub"; + outputs = [ "out" ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/grub/themes" + mv breeze "$out/grub/themes" + + runHook postInstall + ''; +} diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 5a8d148b1b0..853faa7040b 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -52,6 +52,7 @@ let name = "breeze-${version}"; paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; }; + breeze-grub = callPackage ./breeze-grub.nix {}; breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; From 037d9c6cab17a5dc28ed01c6b96c74e55cee57bc Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 24 Jul 2016 14:45:24 +0100 Subject: [PATCH 098/168] nixos-install: add options --closure, --no-channel-copy, --no-root-passwd, and --no-bootloader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #17236 nix-build -A tests.installer.simple '' succeeds ✓ --- nixos/doc/manual/man-nixos-install.xml | 33 +++++++++++++++++-- .../modules/installer/tools/nixos-install.sh | 33 +++++++++++++++---- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 7ad1be1ec10..15c603256ca 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -25,6 +25,19 @@ root + + + closure + + + + + + + + + + @@ -71,12 +84,13 @@ the following steps: /mnt/etc/nixos/configuration.nix. It installs the GRUB boot loader on the device - specified in the option , + specified in the option + (unless is specified), and generates a GRUB configuration file that boots into the NixOS configuration just installed. - It prompts you for a password for the root - account. + It prompts you for a password for the root account + (unless is specified). @@ -103,6 +117,19 @@ it. + + + + If this option is provided, nixos-install will install the specified closure + rather than attempt to build one from /mnt/etc/nixos/configuration.nix. + + The closure must be an appropriately configured NixOS system, with boot loader and partition + configuration that fits the target host. Such a closure is typically obtained with a command such as + nix-build -I nixos-config=./configuration.nix '<nixos>' -A system --no-out-link + + + + diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 7962be13787..ae9f3a89295 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -24,6 +24,7 @@ fi # Parse the command line for the -I flag extraBuildFlags=() chrootCommand=(/run/current-system/sw/bin/bash) +bootLoader=1 while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -40,6 +41,18 @@ while [ "$#" -gt 0 ]; do --root) mountPoint="$1"; shift 1 ;; + --closure) + closure="$1"; shift 1 + ;; + --no-channel-copy) + noChannelCopy=1 + ;; + --no-root-passwd) + noRootPasswd=1 + ;; + --no-bootloader) + bootLoader=0 + ;; --show-trace) extraBuildFlags+=("$i") ;; @@ -111,7 +124,7 @@ if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix fi -if ! test -e "$mountPoint/$NIXOS_CONFIG"; then +if [ ! -e "$mountPoint/$NIXOS_CONFIG" ] && [ -z "$closure" ]; then echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist" exit 1 fi @@ -200,16 +213,22 @@ for i in /nix/var/nix/manifests/*.nixmanifest; do done -# Get the absolute path to the NixOS/Nixpkgs sources. -nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))" +if [ -z "$closure" ]; then + # Get the absolute path to the NixOS/Nixpkgs sources. + nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))" + nixEnvAction="-f --set -A system" +else + nixpkgs="" + nixEnvAction="--set $closure" +fi # Build the specified Nix expression in the target store and install # it into the system configuration profile. echo "building the system configuration..." NIX_PATH="nixpkgs=/tmp/root/$nixpkgs:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \ chroot $mountPoint @nix@/bin/nix-env \ - "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '' --set -A system + "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system $nixEnvAction # Copy the NixOS/Nixpkgs sources to the target as the initial contents @@ -218,7 +237,7 @@ mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root srcs=$(nix-env "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "") -if test -n "$srcs"; then +if [ -z "$noChannelCopy" ] && [ -n "$srcs" ]; then echo "copying NixOS/Nixpkgs sources..." chroot $mountPoint @nix@/bin/nix-env \ "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet @@ -244,7 +263,7 @@ touch $mountPoint/etc/NIXOS # a menu default pointing at the kernel/initrd/etc of the new # configuration. echo "finalising the installation..." -NIXOS_INSTALL_GRUB=1 chroot $mountPoint \ +NIXOS_INSTALL_GRUB="$bootLoader" chroot $mountPoint \ /nix/var/nix/profiles/system/bin/switch-to-configuration boot @@ -253,7 +272,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate # Ask the user to set a root password. -if [ "$(chroot $mountPoint /run/current-system/sw/bin/sh -l -c "nix-instantiate --eval '' -A config.users.mutableUsers")" = true ] && [ -t 0 ] ; then +if [ -z "$noRootPasswd" ] && [ "$(chroot $mountPoint /run/current-system/sw/bin/sh -l -c "nix-instantiate --eval '' -A config.users.mutableUsers")" = true ] && [ -t 0 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi From 2627b09b827388538885fe402c60f19062901a91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Aug 2016 17:38:13 +0200 Subject: [PATCH 099/168] haskell-applicative-quoters: fix build with GHC 8.x --- .../development/haskell-modules/configuration-ghc-8.0.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 1c4951a6c19..73a23220750 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -70,4 +70,10 @@ self: super: { sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a"; }); + # https://github.com/bmillwood/applicative-quoters/issues/6 + applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; + sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; + }); + } From 5b008e30b44923e8eff5dbe470b000de58f07021 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Aug 2016 10:40:36 -0500 Subject: [PATCH 100/168] kdeWrapper: avoid excessive file collisions --- .../libraries/kde-frameworks/kde-env.nix | 13 +++++++++++-- .../libraries/kde-frameworks/kde-wrapper.nix | 8 ++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix index c77ff49bfea..a48ba32be22 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-env.nix @@ -5,7 +5,7 @@ drv: pkgs: stdenv.mkDerivation { name = "kde-env-${drv.name}"; nativeBuildInputs = [ lndir ]; - propagatedUserEnvPkgs = builtins.map lib.getBin ([drv] ++ pkgs); + envPkgs = builtins.map lib.getBin ([drv] ++ pkgs); unpackPhase = "true"; configurePhase = "runHook preConfigure; runHook postConfigure"; buildPhase = "true"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { runHook preInstall propagated="" - for i in $propagatedUserEnvPkgs; do + for i in $envPkgs; do findInputs $i propagated propagated-user-env-packages done @@ -26,6 +26,15 @@ stdenv.mkDerivation { done done + for p in $propagated; do + for s in applications dbus-1 desktop-directories icons mime polkit-1; do + if [ -d "$p/share/$s" ]; then + propagatedUserEnvPkgs+=" $p" + break + fi + done + done + runHook postInstall ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index 95f9cdcecb7..d340a5edbf7 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -37,11 +37,7 @@ stdenv.mkDerivation { fi done - for s in applications dbus-1 desktop-directories icons mime polkit-1; do - if [ -d "$env/share/$s" ]; then - mkdir -p "$out/share" - ln -s "$env/share/$s" "$out/share/$s" - fi - done + mkdir -p "$out/nix-support" + ln -s "$env/nix-support/propagated-user-env-packages" "$out/nix-support/" ''; } From aded8e40c1f10b69616f2567eb4b2682bb7948b2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 31 Jul 2016 23:10:44 +0800 Subject: [PATCH 101/168] startkde: default to breeze instead of plastik on a fresh login --- pkgs/desktops/kde-5/plasma/startkde/startkde.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index 18cf08081c4..c0d5f6dbf59 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -71,11 +71,14 @@ fi configDir=$(qtpaths --writable-path GenericConfigLocation) mkdir -p "$configDir" +THEME=org.kde.breeze #This is basically setting defaults so we can use them with kstartupconfig5 +#We cannot set the equivilant of THEME here as it will generate an +#invalid variable name (with dots) cat >$configDir/startupconfigkeys < Date: Thu, 4 Aug 2016 11:08:32 -0500 Subject: [PATCH 102/168] elm: Constrain aeson-pretty to <0.8 (#17511) https://github.com/elm-lang/elm-compiler/pull/1431 --- pkgs/development/compilers/elm/packages/elm-compiler.nix | 6 +++--- pkgs/development/compilers/elm/packages/elm-package.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix index dc2a0a12138..f6a92b64f6d 100644 --- a/pkgs/development/compilers/elm/packages/elm-compiler.nix +++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix @@ -1,4 +1,4 @@ -{ mkDerivation, aeson, aeson-pretty, ansi-terminal, ansi-wl-pprint +{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-terminal, ansi-wl-pprint , base, binary, bytestring, containers, directory, edit-distance , fetchgit, filemanip, filepath, HUnit, indents , language-ecmascript, language-glsl, mtl, parsec, pretty, process @@ -16,7 +16,7 @@ mkDerivation { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary + aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary bytestring containers directory edit-distance filepath indents language-ecmascript language-glsl mtl parsec pretty process text union-find @@ -25,7 +25,7 @@ mkDerivation { aeson base binary directory filepath process text ]; testHaskellDepends = [ - aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary + aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary bytestring containers directory edit-distance filemanip filepath HUnit indents language-ecmascript language-glsl mtl parsec pretty process QuickCheck test-framework test-framework-hunit diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix index ef2d4e9c8e7..faf46e859c9 100644 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ b/pkgs/development/compilers/elm/packages/elm-package.nix @@ -1,4 +1,4 @@ -{ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary +{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary , bytestring, containers, directory, edit-distance, elm-compiler , fetchgit, filepath, HTTP, http-client, http-client-tls , http-types, mtl, network, optparse-applicative, parallel-io @@ -16,13 +16,13 @@ mkDerivation { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty ansi-wl-pprint base binary bytestring containers + aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers directory edit-distance elm-compiler filepath HTTP http-client http-client-tls http-types mtl network parallel-io text time unordered-containers vector zip-archive ]; executableHaskellDepends = [ - aeson aeson-pretty ansi-wl-pprint base binary bytestring containers + aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers directory edit-distance elm-compiler filepath HTTP http-client http-client-tls http-types mtl network optparse-applicative parallel-io pretty text time unordered-containers vector From fbea275286fd55db5655012d6a5fe68c297508ff Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 4 Aug 2016 17:25:49 +0100 Subject: [PATCH 103/168] haskellPackages.ghc-mod: remove override as 5.6.0.0 is ghc8 compatible cc @peti --- .../haskell-modules/configuration-ghc-8.0.x.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 73a23220750..b09680574b0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -54,16 +54,6 @@ self: super: { broken = true; # needs template-haskell >=2.9 && <2.11 }) {}; - # ghc-mod has a ghc-8 branch that has not yet been merged - ghc-mod = super."ghc-mod".overrideDerivation (attrs: rec { - src = pkgs.fetchFromGitHub { - owner = "DanielG"; - repo = "ghc-mod"; - rev = "f2c7b01e372dd8c516b1ccbe5a1025cc7814347c"; - sha256 = "1i45196qrzlhgbisnvkzni4n54saky0i1kyla162xcb5cg3kf2ji"; - }; - }); - # https://github.com/ygale/timezone-series/issues/2 timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch { url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; From b78a70ccc8e0eb697cf1d87f808db19ae60646c1 Mon Sep 17 00:00:00 2001 From: Dinnanid Date: Wed, 3 Aug 2016 17:24:16 -0800 Subject: [PATCH 104/168] eclipse-sdk: 4.5.1 -> 4.5.2 --- pkgs/applications/editors/eclipse/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index afb3eab625d..fe40c7959ab 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -311,6 +311,21 @@ rec { }; }; eclipse_sdk_451 = eclipse-sdk-451; # backward compatibility, added 2016-01-30 + + eclipse-sdk-452 = buildEclipse { + name = "eclipse-sdk-4.5.2"; + description = "Eclipse Mars Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz; + sha256 = "87f82b0c13c245ee20928557dbc4435657d1e029f72d9135683c8d585c69ba8d"; + }; + "i686-linux" = fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk.tar.gz; + sha256 = "78f7e537b34333401fc782fbd1260087c586ff93b17b88da5b177642f3aa5a02"; + }; + }; + }; eclipse-platform = eclipse-platform-46; From 672447f1ada85a38f1b1f7d909d72977658abcb4 Mon Sep 17 00:00:00 2001 From: Dinnanid Date: Wed, 3 Aug 2016 17:25:29 -0800 Subject: [PATCH 105/168] eclipse-sdk: 4.5.2 -> 4.6 --- pkgs/applications/editors/eclipse/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index fe40c7959ab..95be75dbe51 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -326,6 +326,21 @@ rec { }; }; }; + + eclipse-sdk-46 = buildEclipse { + name = "eclipse-sdk-4.6"; + description = "Eclipse Neon Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk-x86_64.tar.gz; + sha256 = "4d7a39ce4e04ba1f5179f6a72926eb86ed506d97842a3bf4247814491c508e0a"; + }; + "i686-linux" = fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/eclipse-SDK-4.6-linux-gtk.tar.gz; + sha256 = "d9e1d390cac504a17a65d4a22ebb8da6a592bcc54491912cbc29577990d77014"; + }; + }; + }; eclipse-platform = eclipse-platform-46; From b3beab9f03a0bbf09d04151bdb497bde260810d1 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 3 Aug 2016 23:21:50 +0200 Subject: [PATCH 106/168] webkitgtk: 2.10.4 -> 2.10.9 --- .../libraries/webkitgtk/{default.nix => 2.10.nix} | 10 ++-------- pkgs/top-level/all-packages.nix | 10 ++++++---- 2 files changed, 8 insertions(+), 12 deletions(-) rename pkgs/development/libraries/webkitgtk/{default.nix => 2.10.nix} (86%) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/2.10.nix similarity index 86% rename from pkgs/development/libraries/webkitgtk/default.nix rename to pkgs/development/libraries/webkitgtk/2.10.nix index cf22eb3aadd..a76a19ad41d 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/2.10.nix @@ -13,7 +13,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.10.4"; + version = "2.10.9"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,17 +28,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v"; + sha256 = "0sg935wpkgyd5ypd5fj25vd7ri8s6sbrmssb53xbgcc02xs8vcdv"; }; patches = [ ./finding-harfbuzz-icu.patch - (fetchpatch { - name = "glibc-isnan.patch"; - url = "http://trac.webkit.org/changeset/194518/trunk/Source/JavaScriptCore" - + "/runtime/Options.cpp?format=diff&new=194518"; - sha256 = "0pzdv1zmlym751n9d310cx3yp752yzsc49cysbvgnrib4dh68nbm"; - }) ] ++ optional stdenv.isDarwin ./adding-libintl.patch; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 747a53ddcc0..fe4c30fc15f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9643,10 +9643,7 @@ in wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = callPackage ../development/libraries/webkitgtk { - harfbuzz = harfbuzz-icu; - gst-plugins-base = gst_all_1.gst-plugins-base; - }; + webkitgtk = webkitgtk212x; webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu; @@ -9659,6 +9656,11 @@ in gst-plugins-base = gst_all_1.gst-plugins-base; }; + webkitgtk210x = callPackage ../development/libraries/webkitgtk/2.10.nix { + harfbuzz = harfbuzz-icu; + gst-plugins-base = gst_all_1.gst-plugins-base; + }; + webkitgtk2 = webkitgtk24x.override { withGtk2 = true; enableIntrospection = false; From 33557acb36ffb60317775ab7fdb3451a47b69d62 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 4 Aug 2016 20:26:05 +0100 Subject: [PATCH 107/168] chromium: add ability to control which sandbox is used First step towards addressing #17460 In order to be able to run the SUID sandbox, which is good for security and required to run Chromium with any kind of reasonable sandboxing when using grsecurity kernels, we want to be able to control where the sandbox comes from in the Chromium wrapper. This commit patches the appropriate bit of source and adds the same old sandbox to the wrapper (so it should be a no-op) --- pkgs/applications/networking/browsers/chromium/common.nix | 6 ++++++ pkgs/applications/networking/browsers/chromium/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 997551f3fae..46734e3ab07 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -134,6 +134,12 @@ let ]; postPatch = '' + # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX + substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ + --replace \ + 'std::string sandbox_binary(GetSandboxBinaryPath().value());' \ + 'std::string sandbox_binary(GetDevelSandboxPath());' + sed -i -r \ -e 's/-f(stack-protector)(-all)?/-fno-\1/' \ -e 's|/bin/echo|echo|' \ diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 51493fb4655..a7447db7c22 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -74,6 +74,7 @@ in stdenv.mkDerivation { ln -s "${chromium.browser}/share" "$out/share" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ + --set CHROME_DEVEL_SANDBOX "${chromium.browser}/libexec/chromium/chrome-sandbox" \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ln -s "$out/bin/chromium" "$out/bin/chromium-browser" From 0eb827918de5676ea18ef5598cade15232728fc8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 3 Aug 2016 01:27:01 +0300 Subject: [PATCH 108/168] xorg.libpciaccess: Not supported on Darwin http://hydra.nixos.org/build/38160825/nixlog/1/raw --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 975cb2b69ab..c6f28bcb645 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -244,6 +244,10 @@ in outputs = [ "dev" "out" ]; # mainly to avoid propagation }; + libpciaccess = attrs: attrs // { + meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; }; + }; + setxkbmap = attrs: attrs // { postInstall = '' From 2ea72fa9c811622bdbf93e866cd68db756d45986 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 4 Aug 2016 23:12:39 +0300 Subject: [PATCH 109/168] nixos/luksroot: Reference correct output of openssl --- nixos/modules/system/boot/luksroot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 8dad09c8920..f2755b49f88 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -443,7 +443,7 @@ in copy_bin_and_libs pbkdf2-sha512 mkdir -p $out/etc/ssl - cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl + cp -pdv ${pkgs.openssl.out}/etc/ssl/openssl.cnf $out/etc/ssl cat > $out/bin/openssl-wrap < Date: Thu, 4 Aug 2016 00:05:31 +0200 Subject: [PATCH 110/168] gcc49: 4.9.3 -> 4.9.4 Bugfix release of the 4.9 branch. See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00001.html for announcement --- pkgs/development/compilers/gcc/4.9/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 475349ed4ba..2030f931c51 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -56,7 +56,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "4.9.3"; +let version = "4.9.4"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -213,7 +213,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3"; + sha256 = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; }; inherit patches; From 6cf7e8d2ed89fae0d96f9f7e06b0ae213260371a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 5 Aug 2016 03:48:29 +0200 Subject: [PATCH 111/168] libreswan: 3.17 -> 3.18 (security) Fixes CVE-2016-5391, see https://libreswan.org/security/CVE-2016-5391/CVE-2016-5391.txt --- pkgs/tools/networking/libreswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index a2204f9664a..213051bdf8d 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -6,7 +6,7 @@ let optional = stdenv.lib.optional; - version = "3.17"; + version = "3.18"; name = "libreswan-${version}"; binPath = stdenv.lib.makeBinPath [ bash iproute iptables procps coreutils gnused gawk nss.tools which python @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.libreswan.org/${name}.tar.gz"; - sha256 = "00qd1n6f5w4xr06yanfpnbnn7y7rq2m878ifa3hh13bdgzsqdhi8"; + sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig"; }; nativeBuildInputs = [ makeWrapper ]; From a3f6ca6d17f3e87ebd1f4510d1aee8325e6361ab Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 5 Aug 2016 04:02:45 +0200 Subject: [PATCH 112/168] collectd: 5.5.1 -> 5.5.2 (security) Fixes CVE-2016-6254. --- pkgs/tools/system/collectd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 7c889d89303..c428fb07fac 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -32,12 +32,12 @@ , net_snmp ? null }: stdenv.mkDerivation rec { - version = "5.5.1"; + version = "5.5.2"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "0gxwq3jl20wgvb7qawivshpkm4i3kvghpnfcn5yrlhphw4kdbigr"; + sha256 = "03w2pawbshl2wrl4cmyw8alsi0pvamb6ibxni96mjzhqc903lzq1"; }; buildInputs = [ From 2d6b7aa54548c6b655a6d81e37ed7b0e4efc67ce Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 5 Aug 2016 03:39:17 +0200 Subject: [PATCH 113/168] linux: enable some useful networking options All options are enabled by default on Debian and some other distributions, so these should be safe. --- pkgs/os-specific/linux/kernel/common-config.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 37e3859cd05..aebf3376e8b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -112,11 +112,21 @@ with stdenv.lib; IPV6_PRIVACY y ''} NETFILTER_ADVANCED y + IP_ROUTE_VERBOSE y + IP_MROUTE_MULTIPLE_TABLES y IP_VS_PROTO_TCP y IP_VS_PROTO_UDP y IP_VS_PROTO_ESP y IP_VS_PROTO_AH y IP_DCCP_CCID3 n # experimental + IPV6_ROUTER_PREF y + IPV6_ROUTE_INFO y + IPV6_OPTIMISTIC_DAD y + IPV6_MULTIPLE_TABLES y + IPV6_SUBTREES y + IPV6_MROUTE y + IPV6_MROUTE_MULTIPLE_TABLES y + IPV6_PIMSM_V2 y CLS_U32_PERF y CLS_U32_MARK y ${optionalString (stdenv.system == "x86_64-linux") '' @@ -126,6 +136,10 @@ with stdenv.lib; NET_CLS_BPF m NET_ACT_BPF m ''} + L2TP_V3 y + L2TP_IP m + L2TP_ETH m + BRIDGE_VLAN_FILTERING y # Wireless networking. CFG80211_WEXT? y # Without it, ipw2200 drivers don't build From 4b62054f4c2e4ee09f141305bd09940ad78b1d34 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 5 Aug 2016 11:00:53 +0800 Subject: [PATCH 114/168] curl: 7.50.0 -> 7.50.1 (#17486) --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index eaf427d61a3..5e7010def54 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.50.0"; + name = "curl-7.50.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "16psxjcl25i7v5x71193nkq2anm5mj8pfziq5iwxnj3znwnzx3b0"; + sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw"; }; outputs = [ "dev" "out" "bin" "man" "docdev" ]; From 5e3eb476f5c3243e1a6f136cf10a0c2b13a88f38 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 5 Aug 2016 03:33:05 -0400 Subject: [PATCH 115/168] neovim: remove unused glib dependency (#17499) As far as I can tell, neovim has never required glib to build. The neovim libtermkey does include a demo-glib.c example, but that is optional. --- pkgs/applications/editors/neovim/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 15bd695aafc..a01dd7a8d84 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey +{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey , libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig , unibilium, makeWrapper, vimUtils, xsel @@ -72,7 +72,6 @@ let enableParallelBuilding = true; buildInputs = [ - glib libtermkey libuv libmsgpack From d46d0c4bb1b04c01bb67294f7de67ed7fe6c3207 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Thu, 4 Aug 2016 22:05:16 +0200 Subject: [PATCH 116/168] gtksourceviewmm: init at 3.18.0 --- .../3.20/core/gtksourceviewmm/default.nix | 16 ++++++++++++++++ .../gnome-3/3.20/core/gtksourceviewmm/src.nix | 11 +++++++++++ pkgs/desktops/gnome-3/3.20/default.nix | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix create mode 100644 pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix new file mode 100644 index 00000000000..d0453ba8ebb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = "https://developer.gnome.org/gtksourceviewmm/"; + description = "C++ wrapper for gtksourceview"; + license = licenses.lgpl2; + maintainers = [ maintainers.juliendehos ]; + }; +} + diff --git a/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix new file mode 100644 index 00000000000..21fecfdc48a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.20/core/gtksourceviewmm/src.nix @@ -0,0 +1,11 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gtksourceviewmm-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gtksourceviewmm/3.18/gtksourceviewmm-3.18.0.tar.xz; + sha256 = "51081ae3d37975dae33d3f6a40621d85cb68f4b36ae3835eec1513482aacfb39"; + }; +} + diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index 6e7b16e7733..babbed37cc0 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -173,6 +173,8 @@ let gtksourceview = callPackage ./core/gtksourceview { }; + gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; + gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; From 9c6fccf29aa5b3fe451432c42752e462a9a48ec9 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 5 Aug 2016 10:52:30 +0200 Subject: [PATCH 117/168] Revert "curl: 7.50.0 -> 7.50.1" (#17525) --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5e7010def54..eaf427d61a3 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.50.1"; + name = "curl-7.50.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw"; + sha256 = "16psxjcl25i7v5x71193nkq2anm5mj8pfziq5iwxnj3znwnzx3b0"; }; outputs = [ "dev" "out" "bin" "man" "docdev" ]; From 382303310754e85a61eecbee4e3470abcce441ec Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 5 Aug 2016 11:03:51 +0200 Subject: [PATCH 118/168] Revert "curl: 7.47.1 -> 7.50.0" (#17528) --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index eaf427d61a3..f2e6117966f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.50.0"; + name = "curl-7.47.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "16psxjcl25i7v5x71193nkq2anm5mj8pfziq5iwxnj3znwnzx3b0"; + sha256 = "13z9gba3q2ybp50z0gdkzhwcx9m0i7qkvm278yz4pql2jfml7inx"; }; outputs = [ "dev" "out" "bin" "man" "docdev" ]; From d6528a1b7fad8bdcd5f9ff8cc11565e6c4a1747a Mon Sep 17 00:00:00 2001 From: obadz Date: Fri, 5 Aug 2016 10:55:48 +0100 Subject: [PATCH 119/168] chromium: fixup commit 33557ac Helps with #17460 @cleverca22 saw calls to SetuidSandboxHost::GetSandboxBinaryPath so we patch this function instead. cc @joachifm --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 46734e3ab07..2c70978a496 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -137,8 +137,8 @@ let # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ --replace \ - 'std::string sandbox_binary(GetSandboxBinaryPath().value());' \ - 'std::string sandbox_binary(GetDevelSandboxPath());' + 'return sandbox_binary;' \ + 'return base::FilePath(GetDevelSandboxPath());' sed -i -r \ -e 's/-f(stack-protector)(-all)?/-fno-\1/' \ From 1664279f0e710fcc331b9d0b5102d4561e8ef22c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 5 Aug 2016 11:53:57 +0200 Subject: [PATCH 120/168] Add nix-repl as release blocker This would have blocked the channel in recent curl bump. --- pkgs/top-level/release.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ba99fd5a037..4ae5951ceff 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -49,6 +49,10 @@ let jobs.python3.x86_64-linux jobs.python3.i686-linux jobs.python3.x86_64-darwin + # Many developers use nix-repl + jobs.nix-repl.x86_64-linux + jobs.nix-repl.i686-linux + jobs.nix-repl.x86_64-darwin # Needed by travis-ci to test PRs jobs.nox.i686-linux jobs.nox.x86_64-linux From 76c2988e3382855b25d26d0c4c23629214857a72 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Fri, 5 Aug 2016 11:36:15 +0300 Subject: [PATCH 121/168] wavpack: 4.75.0 -> 4.80.0 --- .../development/libraries/wavpack/default.nix | 18 ++----------- .../libraries/wavpack/wavpack_clang.patch | 25 ------------------- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/libraries/wavpack/wavpack_clang.patch diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 3bdb1392bd9..efe64581893 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -2,29 +2,15 @@ stdenv.mkDerivation rec { name = "wavpack-${version}"; - version = "4.75.0"; + version = "4.80.0"; enableParallelBuilding = true; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; - patches = [ - # backported from - # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5 - ./wavpack_clang.patch - ]; - - preConfigure = '' - sed -i '2iexec_prefix=@exec_prefix@' wavpack.pc.in - ''; - - # --disable-asm is required for clang - # https://github.com/dbry/WavPack/issues/3 - configureFlags = lib.optionalString stdenv.cc.isClang "--disable-asm"; - src = fetchurl { url = "http://www.wavpack.com/${name}.tar.bz2"; - sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6"; + sha256 = "1sbbwvqixg87h02avg0d5r64mpjz8cmhcc6j3s9wmlbvbykjw63r"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wavpack/wavpack_clang.patch b/pkgs/development/libraries/wavpack/wavpack_clang.patch deleted file mode 100644 index dfbe4718143..00000000000 --- a/pkgs/development/libraries/wavpack/wavpack_clang.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru -x '*~' wavpack-4.75.0_orig/src/wavpack_local.h wavpack-4.75.0/src/wavpack_local.h ---- wavpack-4.75.0_orig/src/wavpack_local.h 2015-05-21 06:50:26.000000000 +0900 -+++ wavpack-4.75.0/src/wavpack_local.h 2015-09-14 21:48:09.000000000 +0900 -@@ -650,9 +650,9 @@ - void scan_word (WavpackStream *wps, int32_t *samples, uint32_t num_samples, int dir); - void update_error_limit (WavpackStream *wps); - --const uint32_t bitset [32]; --const uint32_t bitmask [32]; --const char nbits_table [256]; -+extern const uint32_t bitset [32]; -+extern const uint32_t bitmask [32]; -+extern const char nbits_table [256]; - - int log2s (int32_t value); - int32_t exp2s (int log); -@@ -734,7 +734,7 @@ - /////////////////////////////////// common utilities //////////////////////////////////// - // module: common_utils.c - --const uint32_t sample_rates [16]; -+extern const uint32_t sample_rates [16]; - uint32_t WavpackGetLibraryVersion (void); - const char *WavpackGetLibraryVersionString (void); - uint32_t WavpackGetSampleRate (WavpackContext *wpc); From e5db1995a625096ce817312ccd2df69fabb09098 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 3 Aug 2016 18:35:06 +0200 Subject: [PATCH 122/168] ocamlPackages.containers: 0.16 -> 0.18 --- pkgs/development/ocaml-modules/containers/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 4a3ed5723dd..fbbf0fc7414 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result }: +{ stdenv, fetchFromGitHub, ocaml, findlib, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result +, qcheck }: let @@ -6,7 +7,7 @@ let let v = stdenv.lib.getVersion ocaml; in "${p}/lib/ocaml/${v}/site-lib"; - version = "0.16"; + version = "0.18"; in @@ -17,10 +18,10 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "1mc33b4nvn9k3r4k56amxr804bg5ndhxv92cmjzg5pf4qh220c2h"; + sha256 = "169j8vqg8h70wbldjg610jqikfk23ggw8zypmpzv3piym5p1dfiw"; }; - buildInputs = [ ocaml findlib cppo gen sequence qtest ounit ocaml_oasis ]; + buildInputs = [ ocaml findlib cppo gen sequence qtest ounit ocaml_oasis qcheck ]; propagatedBuildInputs = [ result ]; From 43fd03a6df962a8f7985b786fa5e15411f584061 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 5 Aug 2016 09:53:48 -0400 Subject: [PATCH 123/168] oh-my-zsh: 2016-07-15 -> 2016-08-01 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 5bb3b1de7ed..ac72de119b3 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "oh-my-zsh-git-${version}"; - version = "2016-07-15"; + version = "2016-08-01"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "96a2092e377139fbcd95d7b7ac703b740daa22f6"; - sha256 = "0v3hzpfj98mfz0y06qch2hf14iz0vpb9pfysw8hc4mnp0jzh5vz1"; + rev = "f5537241a4fe7f48a5f7f49fff52db9f0247a5cd"; + sha256 = "0g8wqq3m2qvacxwz6k2zir8vg80fbxccwxpcfs1ypcwp3689fjhk"; }; phases = "installPhase"; From 9470b287439f7c3e28d2fc77daf245fec0d29af7 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 5 Aug 2016 23:06:38 +0800 Subject: [PATCH 124/168] wraith: 1.4.6 -> 1.4.7 --- .../networking/irc/wraith/configure.patch | 58 +++++++++++++++++++ .../networking/irc/wraith/default.nix | 13 +++-- 2 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/networking/irc/wraith/configure.patch diff --git a/pkgs/applications/networking/irc/wraith/configure.patch b/pkgs/applications/networking/irc/wraith/configure.patch new file mode 100644 index 00000000000..e5fa2feb201 --- /dev/null +++ b/pkgs/applications/networking/irc/wraith/configure.patch @@ -0,0 +1,58 @@ +--- a/configure ++++ b/configure +@@ -6029,53 +6029,8 @@ + #AC_CHECK_HEADERS(zlib.h) + #EGG_CHECK_ZLIB + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5 +-$as_echo_n "checking for path to OpenSSL... " >&6; } +- +- +-# Check whether --with-openssl was given. +-if test "${with_openssl+set}" = set; then : +- withval=$with_openssl; with_openssl_path=$withval +-else +- with_openssl_path=auto +-fi +- +- +- +-cf_openssl_basedir="" +-if test "$with_openssl_path" != "auto"; then +- cf_openssl_basedir="`echo ${with_openssl_path} | sed 's/\/$//'`" +-else +- for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/local/openssl; do +- if test -f "${dirs}/include/openssl/opensslv.h" && test -f "${dirs}/lib/libssl.so"; then +- cf_openssl_basedir="${dirs}" +- break +- fi +- done +- unset dirs +-fi +-if test ! -z "$cf_openssl_basedir"; then +- if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" && test -f "${cf_openssl_basedir}/lib/libssl.so"; then +- SSL_INCLUDES="-I${cf_openssl_basedir}/include" +- SSL_LIBS="-L${cf_openssl_basedir}/lib" +- else +- cf_openssl_basedir="" +- fi +-else +- if test -f "/usr/include/openssl/opensslv.h" ; then +- cf_openssl_basedir="/usr" +- fi +-fi +- +-if test ! -z "$cf_openssl_basedir"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5 +-$as_echo "$cf_openssl_basedir" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +-$as_echo "not found" >&6; } +- as_fn_error 1 "OpenSSL is required." "$LINENO" 5 +-fi +-unset cf_openssl_basedir ++SSL_INCLUDES="-I@openssl.dev@/include" ++SSL_LIBS="-L@openssl.out@/lib" + + save_CXX="$CXX" + CXX="$CXX $SSL_INCLUDES" diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index 4484178a6d5..16346bcf720 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -5,18 +5,19 @@ with stdenv.lib; mkDerivation rec { name = "wraith-${version}"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz"; - sha256 = "0vb2hbjmwh040f5yhxvwcfxvgxa0q9zdy9vvddydn8zn782d7wl8"; + sha256 = "0h6liac5y7im0jfm2sj18mibvib7d1l727fjs82irsjj1v9kif3j"; }; buildInputs = [ openssl ]; - patches = [ ./dlopen.patch ]; + patches = [ ./configure.patch ./dlopen.patch ]; postPatch = '' - substituteInPlace src/libssl.cc --subst-var-by openssl ${openssl} - substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl} + substituteInPlace configure --subst-var-by openssl.dev ${openssl.dev} \ + --subst-var-by openssl.out ${openssl.out} + substituteInPlace src/libssl.cc --subst-var-by openssl ${openssl.out} + substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl.out} ''; - configureFlags = "--with-openssl=${openssl.dev}"; installPhase = '' mkdir -p $out/bin cp -a wraith $out/bin/wraith From 5e6ac5fcf30be007ab38c1b5588a24d8ed048db6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 5 Aug 2016 18:29:02 +0200 Subject: [PATCH 125/168] nixos/x11: output sections for modesetting driver See #17487. --- nixos/modules/services/x11/xserver.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index e7df2e6b469..51f55322ca6 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -14,6 +14,9 @@ let # Map video driver names to driver packages. FIXME: move into card-specific modules. knownVideoDrivers = { virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; + + # modesetting does not have a xf86videomodesetting package as it is included in xorgserver + modesetting = {}; }; fontsForXServer = @@ -435,15 +438,14 @@ in services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ]; - # FIXME: somehow check for unknown driver names. - services.xserver.drivers = flip concatMap cfg.videoDrivers (name: + services.xserver.drivers = flip map cfg.videoDrivers (name: let driver = attrByPath [name] (if xorg ? ${"xf86video" + name} then { modules = [xorg.${"xf86video" + name}]; } - else null) + else throw "Unknown video driver: ${name}") knownVideoDrivers; - in optional (driver != null) ({ inherit name; driverName = name; } // driver)); + in { inherit name; modules = []; driverName = name; } // driver); assertions = [ { assertion = config.security.polkit.enable; From 7281740c2ec9d093d3ff8917de2a49c63850cb16 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 5 Aug 2016 00:14:12 +0200 Subject: [PATCH 126/168] linux: enable DRM_GMA600 and DRM_GMA3600 Adds basic support for Intel GMA3600/3650 (Intel Cedar Trail) platforms and support for GMA600 (Intel Moorestown/Oaktrail) platforms with LVDS ports via the gma500_gfx module. Resolves #14727 Closes #17519 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index aebf3376e8b..8c8ddb03d6f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -179,6 +179,8 @@ with stdenv.lib; # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE y VGA_SWITCHEROO y # Hybrid graphics support + DRM_GMA600 y + DRM_GMA3600 y # Sound. SND_DYNAMIC_MINORS y From 22088b4b25119083d8adfc055073f563b9cd8115 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 6 Aug 2016 07:22:33 +0200 Subject: [PATCH 127/168] nixos/x11: make nvidia driver work again The nvidia driver module directly sets the services.xserver.drivers option, while still having nvidia/nvidiaBeta/... etc. in the videoDrivers option. --- nixos/modules/services/x11/xserver.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 51f55322ca6..b03f70385b1 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -438,14 +438,15 @@ in services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ]; - services.xserver.drivers = flip map cfg.videoDrivers (name: + # FIXME: somehow check for unknown driver names. + services.xserver.drivers = flip concatMap cfg.videoDrivers (name: let driver = attrByPath [name] (if xorg ? ${"xf86video" + name} then { modules = [xorg.${"xf86video" + name}]; } - else throw "Unknown video driver: ${name}") + else null) knownVideoDrivers; - in { inherit name; modules = []; driverName = name; } // driver); + in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); assertions = [ { assertion = config.security.polkit.enable; From 356509ad45f4fac705e1c6028735d1a89c847fef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Aug 2016 08:36:59 +0200 Subject: [PATCH 128/168] pythonPackages.notebook: 4.2.1 -> 4.2.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e70212bc13..1509dacfaad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14321,12 +14321,12 @@ in modules // { }; notebook = buildPythonPackage rec { - version = "4.2.1"; + version = "4.2.2"; name = "notebook-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "15z1j821iywjcjf6d8r338jm09l9qwk8z9gjplag56dvv8jfb7d4"; + sha256 = "418ba230c9b2e7e739940cae9fb4625e10a63f038e9c95cf1a9b7a244256ba38"; }; LC_ALL = "en_US.UTF-8"; From b4c8ea9536b6e4888a32b4f222c28e72d858989b Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Thu, 4 Aug 2016 19:00:06 -0400 Subject: [PATCH 129/168] dejavu-fonts: 2.35 -> 2.37 Release 2.36 adds and fixes a number of glyphes, and adds the Tex Gyre DejaVu Math font, a companion font to DejaVu Serif for typesetting mathematics. Release 2.37 fixes an issue with condensed typefaces. The sources are now fetched from GitHub, since the development was moved from SourceForge to GitHub. --- pkgs/data/fonts/dejavu-fonts/default.nix | 36 ++++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 3c38be90ded..27513467c76 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -1,6 +1,6 @@ -{fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}: +{fetchurl, fetchFromGitHub, stdenv, fontforge, perl, fontconfig, FontTTF}: -let version = "2.35" ; in +let version = "2.37" ; in stdenv.mkDerivation rec { name = "dejavu-fonts-${version}"; @@ -8,17 +8,19 @@ stdenv.mkDerivation rec { buildInputs = [fontforge perl FontTTF]; unicodeData = fetchurl { - url = http://www.unicode.org/Public/6.1.0/ucd/UnicodeData.txt ; - sha256 = "1bd6zkzvxfnifrn5nh171ywk7q56sgk8gdvdn43z9i53hljjcrih"; + url = http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt ; + sha256 = "13zfannnr6sa6s27ggvcvzmh133ndi38pfyxsssvjmw2s8ac9pv8"; }; blocks = fetchurl { - url = http://www.unicode.org/Public/6.1.0/ucd/Blocks.txt; - sha256 = "0w0vkb09nrlc6mrhqyl9npszdi828afgvhvlb1vs5smjv3h8y3dz"; + url = http://www.unicode.org/Public/9.0.0/ucd/Blocks.txt; + sha256 = "04xyws1prlcnqsryq56sm25dlfvr3464lbjjh9fyaclhi3a2f8b1"; }; - src = fetchurl { - url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2"; - sha256 = "1xdbi4llrq1qbkd73352ibrfqcbz93dww8hab216qz5szd95yvv4"; + src = fetchFromGitHub { + owner = "dejavu-fonts"; + repo = "dejavu-fonts"; + rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk"; }; buildFlags = "full-ttf"; @@ -41,6 +43,22 @@ stdenv.mkDerivation rec { ''; meta = { + description = "A typeface family based on the Bitstream Vera fonts"; + longDescription = '' + The DejaVu fonts are TrueType fonts based on the BitStream Vera fonts, + providing more styles and with greater coverage of Unicode. + + This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and + the TeX Gyre DejaVu Math font. + ''; + homepage = http://dejavu-fonts.org/wiki/Main_Page; + + # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. + # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + # DejaVu changes are in public domain + # See http://dejavu-fonts.org/wiki/License for details + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; }; } From 41b8c6d5a9523598d33e81e0ce7a70d02d748bb3 Mon Sep 17 00:00:00 2001 From: cmfwyp Date: Fri, 5 Aug 2016 17:27:50 -0400 Subject: [PATCH 130/168] dejavu-fonts: simplify build process Unicode data and fc-lang are only necessary to generate the status files and coverage information, which are not used, or indeed even generated with full-ttf. --- pkgs/data/fonts/dejavu-fonts/default.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 27513467c76..f49f5c9bb00 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -1,21 +1,11 @@ -{fetchurl, fetchFromGitHub, stdenv, fontforge, perl, fontconfig, FontTTF}: +{fetchFromGitHub, stdenv, fontforge, perl, FontTTF}: let version = "2.37" ; in stdenv.mkDerivation rec { name = "dejavu-fonts-${version}"; - #fontconfig is needed only for fc-lang (?) buildInputs = [fontforge perl FontTTF]; - unicodeData = fetchurl { - url = http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt ; - sha256 = "13zfannnr6sa6s27ggvcvzmh133ndi38pfyxsssvjmw2s8ac9pv8"; - }; - blocks = fetchurl { - url = http://www.unicode.org/Public/9.0.0/ucd/Blocks.txt; - sha256 = "04xyws1prlcnqsryq56sm25dlfvr3464lbjjh9fyaclhi3a2f8b1"; - }; - src = fetchFromGitHub { owner = "dejavu-fonts"; repo = "dejavu-fonts"; @@ -25,15 +15,7 @@ stdenv.mkDerivation rec { buildFlags = "full-ttf"; - preBuild = '' - sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/* - sed -e s@/usr/bin/perl@$(type -tP perl)@ -i scripts/* - mkdir resources - tar xf ${fontconfig.src} --wildcards '*/fc-lang' - ln -s $PWD/fontconfig-*/fc-lang -t resources/ - ln -s ${unicodeData} resources/UnicodeData.txt - ln -s ${blocks} resources/Blocks.txt - ''; + preBuild = "patchShebangs scripts"; installPhase = '' mkdir -p $out/share/fonts/truetype From 66d5edf654c6c98e3835dbee4f208794fc03c81d Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 6 Aug 2016 09:13:20 +0100 Subject: [PATCH 131/168] chromium: add nixos module security.chromiumSuidSandbox Closes #17460 Changed the wrapper derivation to produce a second output containing the sandbox. Add a launch wrapper to try and locate the sandbox (either in /var/setuid-wrappers or in /nix/store). This launch wrapper also sheds libredirect.so from LD_PRELOAD as Chromium does not tolerate it. Does not trigger a Chromium rebuild. cc @cleverca22 @joachifm @jasom --- nixos/modules/module-list.nix | 1 + .../security/chromium-suid-sandbox.nix | 28 +++++++++++++++ .../networking/browsers/chromium/common.nix | 4 +++ .../networking/browsers/chromium/default.nix | 34 +++++++++++++++++-- 4 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 nixos/modules/security/chromium-suid-sandbox.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d202b5a2c72..6a6730856b1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -92,6 +92,7 @@ ./security/apparmor-suid.nix ./security/audit.nix ./security/ca.nix + ./security/chromium-suid-sandbox.nix ./security/duosec.nix ./security/grsecurity.nix ./security/hidepid.nix diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix new file mode 100644 index 00000000000..b517e879f04 --- /dev/null +++ b/nixos/modules/security/chromium-suid-sandbox.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.security.chromiumSuidSandbox; + sandbox = pkgs.chromium.sandbox; +in +{ + options.security.chromiumSuidSandbox.enable = mkEnableOption '' + Whether to install the Chromium SUID sandbox which is an executable that + Chromium may use in order to achieve sandboxing. + + If you get the error "The SUID sandbox helper binary was found, but is not + configured correctly.", turning this on might help. + + Also, if the URL chrome://sandbox tells you that "You are not adequately + sandboxed!", turning this on might resolve the issue. + + Finally, if you have enabled and you + use Chromium, you probably need this. + ''; + + config = mkIf cfg.enable { + environment.systemPackages = [ sandbox ]; + security.setuidPrograms = [ sandbox.passthru.sandboxExecutableName ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2c70978a496..119a8c16f15 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -96,6 +96,8 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; + sandboxExecutableName = "__chromium-suid-sandbox"; + base = rec { name = "${packageName}-${version}"; inherit (upstream-info) version; @@ -221,6 +223,8 @@ let targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; in concatStringsSep "\n" commands; + + passthru = { inherit sandboxExecutableName; }; }; # Remove some extraAttrs we supplied to the base attributes already. diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index a7447db7c22..8b4cb00a778 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, makeWrapper, makeDesktopItem +{ newScope, stdenv, makeWrapper, makeDesktopItem, writeScript # package customization , channel ? "stable" @@ -61,22 +61,49 @@ let suffix = if channel != "stable" then "-" + channel else ""; + sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; + in stdenv.mkDerivation { name = "chromium${suffix}-${chromium.browser.version}"; buildInputs = [ makeWrapper ]; + outputs = ["out" "sandbox"]; + buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; + sandboxExecutableSourcePath = "${chromium.browser}/libexec/chromium/chrome-sandbox"; + launchScript = writeScript "chromium" '' + #! ${stdenv.shell} + + if [ -x "/var/setuid-wrappers/${sandboxExecutableName}" ] + then + export CHROME_DEVEL_SANDBOX="/var/setuid-wrappers/${sandboxExecutableName}" + else + export CHROME_DEVEL_SANDBOX="@sandbox@/bin/${sandboxExecutableName}" + fi + + # libredirect causes chromium to deadlock on startup + export LD_PRELOAD="$(echo -n "$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\.so$ | tr '\n' ':')" + + exec @out@/bin/.chromium-wrapped "''${extraFlagsArray[@]}" "$@" + ''; in with stdenv.lib; '' mkdir -p "$out/bin" "$out/share/applications" ln -s "${chromium.browser}/share" "$out/share" - eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --set CHROME_DEVEL_SANDBOX "${chromium.browser}/libexec/chromium/chrome-sandbox" \ + eval makeWrapper "${browserBinary}" "$out/bin/.chromium-wrapped" \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + cp -v "${launchScript}" "$out/bin/chromium" + substituteInPlace $out/bin/chromium --replace @out@ $out --replace @sandbox@ $sandbox + chmod 755 "$out/bin/chromium" + + mkdir -p "$sandbox/bin" + [ -x "${sandboxExecutableSourcePath}" ] || exit 1 + ln -sv "${sandboxExecutableSourcePath}" "$sandbox/bin/${sandboxExecutableName}" + ln -s "$out/bin/chromium" "$out/bin/chromium-browser" ln -s "${chromium.browser}/share/icons" "$out/share/icons" cp -v "${desktopItem}/share/applications/"* "$out/share/applications" @@ -87,5 +114,6 @@ in stdenv.mkDerivation { passthru = { inherit (chromium) upstream-info; mkDerivation = chromium.mkChromiumDerivation; + inherit sandboxExecutableName; }; } From 231ed9edd9f3bc142e878dc22d47c25c793a4ac1 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 6 Aug 2016 10:09:40 +0100 Subject: [PATCH 132/168] chromium: split the sandbox into a separate output Related to #17460 and 66d5edf Triggers a rebuild of Chromium --- pkgs/applications/networking/browsers/chromium/common.nix | 7 +++++++ pkgs/applications/networking/browsers/chromium/default.nix | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 119a8c16f15..7f6eb328ee1 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -224,6 +224,13 @@ let commands = map buildCommand targets; in concatStringsSep "\n" commands; + outputs = ["out" "sandbox"]; + + postInstall = '' + mkdir -p "$sandbox/bin" + mv -v "$out/libexec/chromium/chrome-sandbox" "$sandbox/bin/${sandboxExecutableName}" + ''; + passthru = { inherit sandboxExecutableName; }; }; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 8b4cb00a778..82143f20637 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -73,7 +73,6 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - sandboxExecutableSourcePath = "${chromium.browser}/libexec/chromium/chrome-sandbox"; launchScript = writeScript "chromium" '' #! ${stdenv.shell} @@ -100,9 +99,7 @@ in stdenv.mkDerivation { substituteInPlace $out/bin/chromium --replace @out@ $out --replace @sandbox@ $sandbox chmod 755 "$out/bin/chromium" - mkdir -p "$sandbox/bin" - [ -x "${sandboxExecutableSourcePath}" ] || exit 1 - ln -sv "${sandboxExecutableSourcePath}" "$sandbox/bin/${sandboxExecutableName}" + ln -sv "${chromium.browser.sandbox}" "$sandbox" ln -s "$out/bin/chromium" "$out/bin/chromium-browser" ln -s "${chromium.browser}/share/icons" "$out/share/icons" From 983ab7be1e1e8efe922d076f6c2f1ee7aa27f394 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 6 Aug 2016 14:29:01 +0300 Subject: [PATCH 133/168] haskellPackages.hans: fixed major version bugs (#17555) --- .../haskell-modules/configuration-common.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1cd4e15b4e9..53d810372a4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -946,4 +946,19 @@ self: super: { url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; }); + + # https://github.com/GaloisInc/HaNS/pull/12 + hans = overrideCabal super.hans (drv: { + src = pkgs.fetchFromGitHub { + owner = "GaloisInc"; + repo = "HaNS"; + rev = "53e4af3ee46fc06b31754cec620209a81bbef456"; + sha256 = "079205fqglzhh931h4n7qlrih18117m3w82ih19b8ygr55ps4ldj"; + }; + doHaddock = false; + patches = [(pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/GaloisInc/HaNS/pull/12.patch"; + sha256 = "0xa5b7i9wx32ji0zzlh1a1pws677iffby3bg39kv3c9srdb4by1g"; + })]; + }); } From 369ce2f7d1069838110b129a2beeb08fd91b7cda Mon Sep 17 00:00:00 2001 From: laMudri Date: Sat, 6 Aug 2016 13:01:35 +0100 Subject: [PATCH 134/168] spotify: 1.0.33 -> 1.0.34 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 019063f7a70..0038fad5dd8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.33.106.g60b5d1f0-22"; + version = "1.0.34.146.g28f9eda2-19"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "1hr127wnd45pyqj7j6dzinj2rcqjmv5gr26i9g43r6qp5cw1fc0f"; + sha256 = "1pks9b83aj6y3c3jlmll0rs05yk15r49v0v4amm950z68v182a5g"; }; buildInputs = [ dpkg makeWrapper ]; From 716591ea3b6ae42d9bddd7c43abd840827ba5eb9 Mon Sep 17 00:00:00 2001 From: laMudri Date: Sat, 6 Aug 2016 13:02:03 +0100 Subject: [PATCH 135/168] spotify: add mudri as maintainer --- pkgs/applications/audio/spotify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 0038fad5dd8..483527c8fa8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -104,6 +104,6 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu ]; + maintainers = with stdenv.lib.maintainers; [ eelco ftrvxmtrx sheenobu mudri ]; }; } From 20f009d56df9a0e5f224761ba48aa4142564753e Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 6 Aug 2016 14:40:56 +0100 Subject: [PATCH 136/168] chromium: split the sandbox into a seperate output (take 2) Fixup of 231ed9e --- .../networking/browsers/chromium/browser.nix | 10 +++++++++- .../networking/browsers/chromium/common.nix | 11 ----------- .../networking/browsers/chromium/default.nix | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index fe21642373e..9eb25c316f9 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -7,13 +7,19 @@ mkChromiumDerivation (base: rec { packageName = "chromium"; buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; + outputs = ["out" "sandbox"]; + + sandboxExecutableName = "__chromium-suid-sandbox"; + installPhase = '' mkdir -p "$libExecPath" cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" - cp -v "$buildPath/chrome_sandbox" "$libExecPath/chrome-sandbox" + + mkdir -p "$sandbox/bin" + cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" mkdir -vp "$out/share/man/man1" cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1" @@ -29,6 +35,8 @@ mkChromiumDerivation (base: rec { done ''; + passthru = { inherit sandboxExecutableName; }; + meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7f6eb328ee1..2c70978a496 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -96,8 +96,6 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; - sandboxExecutableName = "__chromium-suid-sandbox"; - base = rec { name = "${packageName}-${version}"; inherit (upstream-info) version; @@ -223,15 +221,6 @@ let targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; in concatStringsSep "\n" commands; - - outputs = ["out" "sandbox"]; - - postInstall = '' - mkdir -p "$sandbox/bin" - mv -v "$out/libexec/chromium/chrome-sandbox" "$sandbox/bin/${sandboxExecutableName}" - ''; - - passthru = { inherit sandboxExecutableName; }; }; # Remove some extraAttrs we supplied to the base attributes already. diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 82143f20637..049c1128b9f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -109,7 +109,7 @@ in stdenv.mkDerivation { inherit (chromium.browser) meta packageName; passthru = { - inherit (chromium) upstream-info; + inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; inherit sandboxExecutableName; }; From 44f462bf4d2d8878a9206ac0f6eb095cfc48e95f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:21:46 +0300 Subject: [PATCH 137/168] generate-config.pl: Be more verbose about missing options For instance, the current 3.10 kernel build fails at the end with: unused option: BRCMFMAC_PCIE unused option: FW_LOADER_USER_HELPER_FALLBACK unused option: KEXEC_FILE unused option: RANDOMIZE_BASE However, it's not obvious that only the _last_ one is actually fatal to the build. After this change it's at least somewhat better: warning: unused option: BRCMFMAC_PCIE warning: unused option: FW_LOADER_USER_HELPER_FALLBACK warning: unused option: KEXEC_FILE error: unused option: RANDOMIZE_BASE --- pkgs/os-specific/linux/kernel/generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 20abe1015c3..e5fa780c6e7 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -134,7 +134,7 @@ close CONFIG; foreach my $name (sort (keys %answers)) { my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1" - ? sub { die @_; } : sub { warn @_; }; + ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; }; &$f("unused option: $name\n") unless defined $config{$name}; &$f("option not set correctly: $name\n") if $config{$name} && $config{$name} ne $answers{$name}; From 088bcf4ec463e99176906dabf3b20bc69b794cc1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:38:57 +0300 Subject: [PATCH 138/168] kernel config: Fix 3.10, 3.12, 3.14 builds --- pkgs/os-specific/linux/kernel/common-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 8c8ddb03d6f..f591bdf13d6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -271,7 +271,7 @@ with stdenv.lib; DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages # Security related features. - RANDOMIZE_BASE y + RANDOMIZE_BASE? y STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default DEVKMEM n # Disable /dev/kmem @@ -498,7 +498,7 @@ with stdenv.lib; # zram support (e.g for in-memory compressed swap). ZSMALLOC y ZRAM m - ZSWAP y + ZSWAP? y # Enable PCIe and USB for the brcmfmac driver BRCMFMAC_USB? y From 3c513ebc13aed790e69906a19fc41253ca9c73d8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:43:51 +0300 Subject: [PATCH 139/168] assimp: Broken on Darwin http://hydra.nixos.org/build/38315116 --- pkgs/development/libraries/assimp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 3511c3331bc..5fbc45a7c08 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = http://assimp.sourceforge.net/; license = licenses.bsd3; maintainers = with maintainers; [ ehmry ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } From fcc3a1b41d89e0428547707d868f3275a2ccb9ec Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:44:56 +0300 Subject: [PATCH 140/168] bazel: Broken on i686 http://hydra.nixos.org/build/38314298 --- pkgs/development/tools/build-managers/bazel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index c103d11ac6e..e49697084e4 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Build tool that builds code quickly and reliably"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.philandstuff ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From f87f37c1eecc770e2f7d760140bf8d2663995b42 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:46:04 +0300 Subject: [PATCH 141/168] bwa: Broken on i686 http://hydra.nixos.org/build/38236956 --- pkgs/applications/science/biology/bwa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index 4e163a5b3f8..1ed1eda229c 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; homepage = http://bio-bwa.sourceforge.net/; maintainers = with maintainers; [ luispedro ]; - platforms = with platforms; linux; + platforms = [ "x86_64-linux" ]; }; } From 0498573573d06eb1c55764a0d7bc3047772e4918 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:47:18 +0300 Subject: [PATCH 142/168] drumstick: Broken on i686 http://hydra.nixos.org/build/38323068 --- pkgs/development/libraries/drumstick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 8675b046b20..809037bb5ed 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "MIDI libraries for Qt5/C++"; homepage = http://drumstick.sourceforge.net/; license = licenses.gpl2Plus; - platforms = with platforms; linux; + platforms = [ "x86_64-linux" ]; }; } From 9a5427f667aad7b55a19133990a5658aee06dea7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:48:17 +0300 Subject: [PATCH 143/168] klibc: Broken on i686 --- pkgs/os-specific/linux/klibc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 236f27765f8..02ec36d64ba 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From a15da44ab0c57b8de08b191cb73af35746bf0337 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:51:04 +0300 Subject: [PATCH 144/168] libe: Broken on i686 http://hydra.nixos.org/build/38264907/nixlog/1/raw --- pkgs/servers/nosql/hyperdex/libe.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix index dfce4c34a11..733f33288ce 100644 --- a/pkgs/servers/nosql/hyperdex/libe.nix +++ b/pkgs/servers/nosql/hyperdex/libe.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "Library containing high-performance datastructures and utilities for C++"; homepage = https://github.com/rescrv/e; license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; }; } From fdde95e09602b554b471523a40c0cacd6ab48791 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:52:18 +0300 Subject: [PATCH 145/168] msieve: Broken on i686 http://hydra.nixos.org/build/38236222 --- pkgs/applications/science/math/msieve/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index e01b9654711..4c99b5081cc 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.publicDomain; homepage = http://msieve.sourceforge.net/; maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From 1db43e0c18b89f99e7433a56df7e3b2686e27c8a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:54:30 +0300 Subject: [PATCH 146/168] rtags: Broken on i686 http://hydra.nixos.org/build/38304790 --- pkgs/development/tools/rtags/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 9b24a8fe8ea..06ab4ffed3c 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/andersbakken/rtags; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.allBut [ "i686-linux" ]; }; } From 9c0a090afe645dd8670ebc339e16750a6cf5f37f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:57:11 +0300 Subject: [PATCH 147/168] colm: Broken on i686 http://hydra.nixos.org/build/38072668 --- pkgs/development/compilers/colm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index f9dc99ee2f8..b7773a91d98 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "A programming language for the analysis and transformation of computer languages"; homepage = http://www.colm.net/open-source/colm; license = licenses.gpl2; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ pSub ]; }; } From 9deb6cfff1984a254a547e96d3c1d6d2e2c268c0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 16:59:14 +0300 Subject: [PATCH 148/168] xaos: Broken on i686 http://hydra.nixos.org/build/38238044 --- pkgs/applications/graphics/xaos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index c53d755da07..1f3a9967b02 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://xaos.sourceforge.net/; description = "Fractal viewer"; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From b7933981318d19eb44433bc714285c78998c36f1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 17:00:59 +0300 Subject: [PATCH 149/168] zimreader: Broken on i686 (Well, actually tntnet, but that derivation is defined in the same file). http://hydra.nixos.org/build/38238028 --- pkgs/tools/text/zimreader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index d9dcc3c0fbb..2e51e7d7f9e 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -39,6 +39,6 @@ in stdenv.mkDerivation rec { description = "A tool to serve ZIM files using HTTP"; homepage = http://git.wikimedia.org/log/openzim; maintainers = with stdenv.lib.maintainers; [ robbinch ]; - platforms = with stdenv.lib.platforms; linux; + platforms = [ "x86_64-linux" ]; }; } From 4f398dfd1389f88ee9243bb9afdf8eb3a7f0721b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 17:02:57 +0300 Subject: [PATCH 150/168] bro: Broken on Darwin http://hydra.nixos.org/build/38312081 --- pkgs/applications/networking/ids/bro/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 10243e5f1d8..10cf9874ff1 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -3,22 +3,21 @@ stdenv.mkDerivation rec { name = "bro-2.4.1"; - + src = fetchurl { url = "http://www.bro.org/downloads/release/${name}.tar.gz"; sha256 = "1xn8qwgnxihlr4lmg7kz2vqjk46aqgwc8878pbv30ih2lmrrdffq"; }; - - buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip - gperftools ]; + + buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ]; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "Powerful network analysis framework that is much different from the typical IDS you may know"; homepage = http://www.bro.org/; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; unix; + platforms = with platforms; linux; }; } From ea14f5c86dd1e28e4cf367c311353efb713e1a9e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 17:05:12 +0300 Subject: [PATCH 151/168] http-parser: Broken on Darwin http://hydra.nixos.org/build/38320273 --- pkgs/development/libraries/http-parser/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index e8a8ecee95e..df3f68b1249 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -42,6 +42,6 @@ in stdenv.mkDerivation { homepage = https://github.com/joyent/http-parser; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; # Broken on pure-darwin, wants xcode }; } From ce537c98dede1740986e00c6ffd568cf6bb6718b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 17:06:16 +0300 Subject: [PATCH 152/168] tweak: Broken on Darwin http://hydra.nixos.org/build/38316344 --- pkgs/applications/editors/tweak/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index f90eb609d44..eb0be39e7c1 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "An efficient hex editor"; homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 1767de9248130e8e31e63d6b441d9a7900fa1858 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Fri, 17 Jun 2016 00:12:55 +0200 Subject: [PATCH 153/168] lizardfs: 3.9.4 -> 3.10.0 --- pkgs/tools/filesystems/lizardfs/412.patch | 43 +++++++++++++++++++ .../filesystems/lizardfs/check-includes.patch | 30 ------------- pkgs/tools/filesystems/lizardfs/default.nix | 17 ++++---- 3 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 pkgs/tools/filesystems/lizardfs/412.patch delete mode 100644 pkgs/tools/filesystems/lizardfs/check-includes.patch diff --git a/pkgs/tools/filesystems/lizardfs/412.patch b/pkgs/tools/filesystems/lizardfs/412.patch new file mode 100644 index 00000000000..a2890cad399 --- /dev/null +++ b/pkgs/tools/filesystems/lizardfs/412.patch @@ -0,0 +1,43 @@ +From 26a27dedb7bee36f3ac5f48e22b977ea001d5903 Mon Sep 17 00:00:00 2001 +From: Maksymilian Paszkiewicz +Date: Mon, 23 May 2016 12:25:19 +0200 +Subject: [PATCH] common: Fix minor compile and copyright issues + +This commit adds include directive to +slice_read_planner.cc and fixes copyright +statement in filesystem_operations.cc + +Closes #411 +Closes #412 + +Change-Id: I3ac995708a09f64e1389871be2e961d594e4bc68 +--- + src/common/slice_read_planner.cc | 2 ++ + src/master/filesystem_operations.cc | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/common/slice_read_planner.cc b/src/common/slice_read_planner.cc +index 94c106c..d0284f1 100644 +--- a/src/common/slice_read_planner.cc ++++ b/src/common/slice_read_planner.cc +@@ -20,6 +20,8 @@ + + #include "common/slice_read_planner.h" + ++#include ++ + /*! + * Prepares read planner for serving selected parts of a slice type. + * Firstly, function checks if: +diff --git a/src/master/filesystem_operations.cc b/src/master/filesystem_operations.cc +index 69ff270..dc30b1f 100644 +--- a/src/master/filesystem_operations.cc ++++ b/src/master/filesystem_operations.cc +@@ -1,5 +1,6 @@ + /* +- Copyright 2013-2015 Skytechnology sp. z o.o.. ++ Copyright 2005-2010 Jakub Kruszona-Zawadzki, Gemius SA, 2013-2014 EditShare, ++ 2013-2016 Skytechnology sp. z o.o.. + + This file is part of LizardFS. + diff --git a/pkgs/tools/filesystems/lizardfs/check-includes.patch b/pkgs/tools/filesystems/lizardfs/check-includes.patch deleted file mode 100644 index 49aa0375762..00000000000 --- a/pkgs/tools/filesystems/lizardfs/check-includes.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 60f64d7077ebd2b29b18faa3b25ee593e126e347 Mon Sep 17 00:00:00 2001 -From: Dmitry Smirnov -Date: Sun, 20 Dec 2015 14:03:20 +1100 -Subject: [PATCH] build: Fix FTBFS with CMake-3.4 - -Closes: #363 - -~~~~ - CMake Error at CheckIncludes.cmake:4 (check_include_files): - Unknown CMake command "check_include_files". - Call Stack (most recent call first): - CMakeLists.txt:113 (check_includes) -~~~~ - -Change-Id: I70f03d829c40ae560083a98c2bcf6344dbac3ad6 -Signed-off-by: Dmitry Smirnov ---- - CheckIncludes.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CheckIncludes.cmake b/CheckIncludes.cmake -index 19ed485..f51075a 100644 ---- a/CheckIncludes.cmake -+++ b/CheckIncludes.cmake -@@ -1,3 +1,5 @@ -+include(CheckIncludeFiles) -+ - function(check_includes INCLUDES) - set(INCLUDE_MISSING FALSE) - foreach(INCLUDE_FILE ${INCLUDES}) diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 7b6f2e17dcf..ac20b735abc 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -4,8 +4,9 @@ , makeWrapper , python , fuse -# The following are required for manpages -#, asciidoc, libxml2 +, asciidoc +, libxml2 +, libxslt , boost , pkgconfig , judy @@ -15,27 +16,25 @@ stdenv.mkDerivation rec { name = "lizardfs-${version}"; - version = "3.9.4"; + version = "3.10.0"; src = fetchFromGitHub { owner = "lizardfs"; repo = "lizardfs"; rev = "v.${version}"; - sha256 = "1vg33jy280apm4lp5dn3x51pkf7035ijqjm8wbmyha2g35gfjrlx"; + sha256 = "18p2pj9crjqgxxxzdfcs3j3fqhinmwi7qxcf71jsw17syqwyygh8"; }; - # Manpages don't build in the current release - buildInputs = [ cmake fuse /* asciidoc libxml2.bin */ zlib boost pkgconfig judy pam makeWrapper ]; + buildInputs = [ cmake fuse asciidoc libxml2 libxslt zlib boost pkgconfig judy pam makeWrapper ]; - # Fixed in upcoming 3.10.0 - patches = [ ./check-includes.patch ]; + patches = [ ./412.patch ]; postInstall = '' wrapProgram $out/sbin/lizardfs-cgiserver \ --prefix PATH ":" "${python}/bin" # mfssnapshot and mfscgiserv are deprecated - rm -f $out/bin/mfssnapshot $out/sbin/mfscgiserv + rm $out/bin/mfssnapshot $out/sbin/mfscgiserv ''; meta = with stdenv.lib; { From adeab67bd80c7dc2d94152f3231c5940ae10a337 Mon Sep 17 00:00:00 2001 From: jokogr Date: Sat, 6 Aug 2016 18:20:18 +0300 Subject: [PATCH 154/168] syncthing service: add syncthing-inotify (#17320) --- .../modules/services/networking/syncthing.nix | 53 +++++++++++++++---- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index b44b03dc0bf..8a430734319 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -23,6 +23,18 @@ let RestartForceExitStatus="3 4"; }; + iNotifyHeader = { + description = "Syncthing Inotify File Watcher service"; + after = [ "network.target" "syncthing.service" ]; + requires = [ "syncthing.service" ]; + }; + + iNotifyService = { + SuccessExitStatus = "2"; + RestartForceExitStatus = "3"; + Restart = "on-failure"; + }; + in { @@ -39,6 +51,12 @@ in available on http://127.0.0.1:8384/. ''; + useInotify = mkOption { + type = types.bool; + default = false; + description = "Provide syncthing-inotify as a service."; + }; + systemService = mkOption { type = types.bool; default = true; @@ -112,27 +130,40 @@ in config.ids.gids.syncthing; }; - environment.systemPackages = [ cfg.package ]; + systemd.services = { + syncthing = mkIf cfg.systemService (header // { + wants = mkIf cfg.useInotify [ "syncthing-inotify.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = service // { + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}"; + }; + }); - systemd.services = mkIf cfg.systemService { - syncthing = header // { + syncthing-inotify = mkIf (cfg.systemService && cfg.useInotify) (iNotifyHeader // { wantedBy = [ "multi-user.target" ]; - serviceConfig = service // { + serviceConfig = iNotifyService // { User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}"; + ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -home=${cfg.dataDir} -logflags=0"; }; - }; + }); }; - systemd.user.services.syncthing = - header // { - wantedBy = [ "default.target" ]; + systemd.user.services = { + syncthing = header // { serviceConfig = service // { ExecStart = "${cfg.package}/bin/syncthing -no-browser"; }; }; + syncthing-inotify = mkIf cfg.useInotify (iNotifyHeader // { + serviceConfig = iNotifyService // { + ExecStart = "${pkgs.syncthing-inotify.bin}/bin/syncthing-inotify -logflags=0"; + }; + }); + }; + }; } From 51aee897403134981a5878aec2c4c7e0bcbd02bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Tue, 2 Aug 2016 20:55:22 +0200 Subject: [PATCH 155/168] kbfs: init --- pkgs/tools/security/kbfs/default.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/tools/security/kbfs/default.nix diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix new file mode 100644 index 00000000000..fb7b8cc9fe7 --- /dev/null +++ b/pkgs/tools/security/kbfs/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kbfs-2016-08-02-git"; + version = "1.0.16"; + + goPackagePath = "github.com/keybase/kbfs"; + subPackages = [ "kbfsfuse" ]; + + dontRenameImports = true; + + src = fetchFromGitHub { + owner = "keybase"; + repo = "kbfs"; + rev = "a8f0714536d15668e0f561ec4d3324762c8cf030"; + sha256 = "0m4k55akd8cv5k8mfpm3rb3fz13z31l49pml7mgviv0hi3mnisqd"; + }; + + buildFlags = [ "-tags production" ]; + + meta = with stdenv.lib; { + homepage = https://www.keybase.io; + description = "The Keybase FS FUSE driver"; + platforms = platforms.linux; + maintainers = with maintainers; [ bennofs ]; + }; +} From 22281009b7af633398d3cb315321b83483f884bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 6 Aug 2016 17:19:18 +0200 Subject: [PATCH 156/168] haskell/GLUT: fix "unkown GLUT entry glutInit" This fixes #17547 --- .../haskell-modules/configuration-common.nix | 10 ++++++++++ pkgs/development/haskell-modules/patches/GLUT.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/GLUT.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 53d810372a4..4499f260d60 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -961,4 +961,14 @@ self: super: { sha256 = "0xa5b7i9wx32ji0zzlh1a1pws677iffby3bg39kv3c9srdb4by1g"; })]; }); + + # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for + # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config + # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. + # + # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the + # RPATH also needs to be propagated when using static linking. GHC automatically handles this for + # us when we patch the cabal file (Link options will be recored in the ghc package registry). + GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; + } diff --git a/pkgs/development/haskell-modules/patches/GLUT.patch b/pkgs/development/haskell-modules/patches/GLUT.patch new file mode 100644 index 00000000000..3025812213b --- /dev/null +++ b/pkgs/development/haskell-modules/patches/GLUT.patch @@ -0,0 +1,12 @@ +diff --git a/GLUT.cabal b/GLUT.cabal +index f370d6c..a404e1e 100644 +--- a/GLUT.cabal ++++ b/GLUT.cabal +@@ -103,6 +103,7 @@ library + else + cpp-options: "-DCALLCONV=ccall" + cc-options: "-DUSE_DLSYM" ++ pkgconfig-depends: freeglut + + executable BOGLGP01-OnYourOwn1 + if !flag(BuildExamples) From 89c867196cd0db983eaef80e6ad497edaea362e0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Aug 2016 18:25:51 +0300 Subject: [PATCH 157/168] SDL2_{gfx,image,net}: Broken on Darwin Last successful Darwin build was 11 months ago, presumably nobody cares. http://hydra.nixos.org/build/38317749 http://hydra.nixos.org/build/38318268 http://hydra.nixos.org/build/38322306 --- .../libraries/SDL2_gfx/default.nix | 34 +++++++++---------- .../libraries/SDL2_image/default.nix | 2 +- .../libraries/SDL2_net/default.nix | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 66913fc0159..23a0924ad3b 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, SDL2} : +{stdenv, fetchsvn, SDL2}: let rev = 5; in stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i -e 's,"SDL.h",,' \ $out/include/SDL2/*.h - + ln -s $out/include/SDL2/SDL2_framerate.h $out/include/SDL2/SDL_framerate.h; ln -s $out/include/SDL2/SDL2_gfxPrimitives.h $out/include/SDL2/SDL_gfxPrimitives.h; ln -s $out/include/SDL2/SDL2_rotozoom.h $out/include/SDL2/SDL_rotozoom.h; @@ -27,28 +27,28 @@ stdenv.mkDerivation rec { meta = { description = "SDL graphics drawing primitives and support functions"; - longDescription = - '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code - which provided basic drawing routines such as lines, circles or - polygons and SDL_rotozoom which implemented a interpolating - rotozoomer for SDL surfaces. + longDescription = '' + The SDL_gfx library evolved out of the SDL_gfxPrimitives code + which provided basic drawing routines such as lines, circles or + polygons and SDL_rotozoom which implemented a interpolating + rotozoomer for SDL surfaces. - The current components of the SDL_gfx library are: + The current components of the SDL_gfx library are: - * Graphic Primitives (SDL_gfxPrimitves.h) - * Rotozoomer (SDL_rotozoom.h) - * Framerate control (SDL_framerate.h) - * MMX image filters (SDL_imageFilter.h) - * Custom Blit functions (SDL_gfxBlitFunc.h) + * Graphic Primitives (SDL_gfxPrimitves.h) + * Rotozoomer (SDL_rotozoom.h) + * Framerate control (SDL_framerate.h) + * MMX image filters (SDL_imageFilter.h) + * Custom Blit functions (SDL_gfxBlitFunc.h) - The library is backwards compatible to the above mentioned - code. Its is written in plain C and can be used in C++ code. - ''; + The library is backwards compatible to the above mentioned + code. Its is written in plain C and can be used in C++ code. + ''; homepage = https://sourceforge.net/projects/sdlgfx/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index eab9b1fb55d..7253fc7b4da 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "SDL image library"; homepage = "http://www.libsdl.org/projects/SDL_image/"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index e41546512e9..6f096577819 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = https://www.libsdl.org/projects/SDL_net; license = licenses.zlib; maintainers = [ maintainers.MP2E ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 7aaf75608fc75e0213f630c860c962bf179686e0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 6 Aug 2016 17:28:50 +0200 Subject: [PATCH 158/168] haskellPackages.fsnotify: add darwin build dependency --- pkgs/development/haskell-modules/configuration-common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 53d810372a4..62fd1d1542f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -160,7 +160,9 @@ self: super: { # FSEvents API is very buggy and tests are unreliable. See # http://openradar.appspot.com/10207999 and similar issues. # https://github.com/haskell-fswatch/hfsnotify/issues/62 - fsnotify = dontCheck super.fsnotify; # if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify; + fsnotify = if pkgs.stdenv.isDarwin + then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa + else dontCheck super.fsnotify; # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; From 72d164c40da88078bdf9c788bcd1dd173ab5dcff Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 6 Aug 2016 19:20:18 +0200 Subject: [PATCH 159/168] hedgewars: fix build --- pkgs/games/hedgewars/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 7d0f59a4e0d..2486d1da470 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -5,7 +5,8 @@ let ghc = ghcWithPackages (pkgs: with pkgs; [ - network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2 + network vector utf8-string bytestring-show random hslogger + dataenc SHA entropy zlib_0_5_4_2 ]); in stdenv.mkDerivation rec { @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { qt4 ghc ffmpeg freeglut makeWrapper physfs ]; + postPatch = '' + substituteInPlace gameServer/CMakeLists.txt --replace mask evaluate + ''; + preBuild = '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib -rpath ${SDL_mixer}/lib @@ -65,7 +70,7 @@ stdenv.mkDerivation rec { contact with explosions, to zero (the damage dealt to the attacked hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; - maintainers = with maintainers; [ kragniz ]; + maintainers = with maintainers; [ kragniz fpletz ]; platforms = ghc.meta.platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe4c30fc15f..cc720ccf253 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15669,6 +15669,7 @@ in hedgewars = callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; + ffmpeg = ffmpeg_2; }; hexen = callPackage ../games/hexen { }; From 39e689e316899c26166913b32474a4573b97edf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 6 Aug 2016 20:53:18 +0200 Subject: [PATCH 160/168] cleanSource: filter out also nix result symlinks (#16120) --- lib/sources.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/sources.nix b/lib/sources.nix index c1ec02b9c26..49dcd6d3dd2 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -20,7 +20,9 @@ rec { lib.hasSuffix "~" baseName || # Filter out generates files. lib.hasSuffix ".o" baseName || - lib.hasSuffix ".so" baseName + lib.hasSuffix ".so" baseName || + # Filter out nix-build result symlinks + (type == "symlink" && lib.hasPrefix "result" baseName) ); in src: builtins.filterSource filter src; From 8dc53d76d5dca09bf3ace15af7dbb32daba0fc9f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 6 Aug 2016 17:53:28 -0500 Subject: [PATCH 161/168] spotify: 1.0.33.106 -> 1.0.34.146 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 019063f7a70..0038fad5dd8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.33.106.g60b5d1f0-22"; + version = "1.0.34.146.g28f9eda2-19"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "1hr127wnd45pyqj7j6dzinj2rcqjmv5gr26i9g43r6qp5cw1fc0f"; + sha256 = "1pks9b83aj6y3c3jlmll0rs05yk15r49v0v4amm950z68v182a5g"; }; buildInputs = [ dpkg makeWrapper ]; From d6d4cf185ed7c6cfad369d694e844b3a5e98371f Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Sat, 6 Aug 2016 21:42:43 -0400 Subject: [PATCH 162/168] i3lock-fancy: use absolute paths (#17569) When it's used from command line or as a i3 shortcut, i3lock-fancy works without any issues. If you try to pass it as an argument to xss-lock or xautolock running as a systemd user service, getopt and fc-match are not in PATH and locking doesn't work as expected. This patch replaces non absolute paths with stable ones and should fix the issue. --- pkgs/applications/window-managers/i3/lock-fancy.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index dd7f89b2a8d..378001528b1 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk -, i3lock-color +, i3lock-color, getopt, fontconfig }: stdenv.mkDerivation rec { @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock sed -i -e 's|ICON="$SCRIPTPATH/lockdark.png"|ICON="'$out'/share/i3lock-fancy/lockdark.png"|' lock sed -i -e 's|ICON="$SCRIPTPATH/lock.png"|ICON="'$out'/share/i3lock-fancy/lock.png"|' lock + sed -i -e "s|getopt |${getopt}/bin/getopt |" lock + sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy From 486b8e7f5cd4d2a476c1f0fd50f71273d575d0e3 Mon Sep 17 00:00:00 2001 From: Paul Hendry Date: Sat, 6 Aug 2016 18:58:38 -0700 Subject: [PATCH 163/168] Add Terraria server service (#16832) --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/games/terraria.nix | 139 ++++++++++++++++++++++ pkgs/games/terraria-server/default.nix | 1 + 4 files changed, 143 insertions(+) create mode 100644 nixos/modules/services/games/terraria.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 3ba279f597d..83b47728639 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -273,6 +273,7 @@ smokeping = 250; gocd-agent = 251; gocd-server = 252; + terraria = 253; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -516,6 +517,7 @@ smokeping = 250; gocd-agent = 251; gocd-server = 252; + terraria = 253; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6a6730856b1..03a191c7232 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -174,6 +174,7 @@ ./services/games/ghost-one.nix ./services/games/minecraft-server.nix ./services/games/minetest-server.nix + ./services/games/terraria.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix ./services/hardware/amd-hybrid-graphics.nix diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix new file mode 100644 index 00000000000..57ac37bb1bd --- /dev/null +++ b/nixos/modules/services/games/terraria.nix @@ -0,0 +1,139 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.terraria; + worldSizeMap = { "small" = 1; "medium" = 2; "large" = 3; }; + valFlag = name: val: optionalString (val != null) "-${name} \"${escape ["\\" "\""] (toString val)}\""; + boolFlag = name: val: optionalString val "-${name}"; + flags = [ + (valFlag "port" cfg.port) + (valFlag "maxPlayers" cfg.maxPlayers) + (valFlag "password" cfg.password) + (valFlag "motd" cfg.messageOfTheDay) + (valFlag "world" cfg.worldPath) + (valFlag "autocreate" (builtins.getAttr cfg.autoCreatedWorldSize worldSizeMap)) + (valFlag "banlist" cfg.banListPath) + (boolFlag "secure" cfg.secure) + (boolFlag "noupnp" cfg.noUPnP) + ]; +in +{ + options = { + services.terraria = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, starts a Terraria server. The server can be connected to via tmux -S /var/lib/terraria/terraria.sock attach + for administration by users who are a part of the terraria group (use C-b d shortcut to detach again). + ''; + }; + + port = mkOption { + type = types.int; + default = 7777; + description = '' + Specifies the port to listen on. + ''; + }; + + maxPlayers = mkOption { + type = types.int; + default = 255; + description = '' + Sets the max number of players (between 1 and 255). + ''; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Sets the server password. Leave null for no password. + ''; + }; + + messageOfTheDay = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Set the server message of the day text. + ''; + }; + + worldPath = mkOption { + type = types.path; + default = null; + description = '' + The path to the world file (.wld) which should be loaded. + If no world exists at this path, one will be created with the size + specified by autoCreatedWorldSize. + ''; + }; + + autoCreatedWorldSize = mkOption { + type = types.enum [ "small" "medium" "large" ]; + default = "medium"; + description = '' + Specifies the size of the auto-created world if worldPath does not + point to an existing world. + ''; + }; + + banListPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + The path to the ban list. + ''; + }; + + secure = mkOption { + type = types.bool; + default = false; + description = "Adds additional cheat protection to the server."; + }; + + noUPnP = mkOption { + type = types.bool; + default = false; + description = "Disables automatic Universal Plug and Play."; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers.terraria = { + description = "Terraria server service user"; + home = "/var/lib/terraria"; + createHome = true; + uid = config.ids.uids.terraria; + }; + + users.extraGroups.terraria = { + gid = config.ids.gids.terraria; + members = [ "terraria" ]; + }; + + systemd.services.terraria = { + description = "Terraria Server Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = "terraria"; + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.tmux.bin}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}"; + ExecStop = "${pkgs.tmux.bin}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter \"exit\" Enter"; + }; + + postStart = '' + ${pkgs.coreutils}/bin/chmod 660 /var/lib/terraria/terraria.sock + ${pkgs.coreutils}/bin/chgrp terraria /var/lib/terraria/terraria.sock + ''; + }; + }; +} diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 59dabf2f9cd..5fcb5063bbc 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r Linux $out/ + chmod +x "$out/Linux/TerrariaServer.bin.x86_64" ln -s "$out/Linux/TerrariaServer.bin.x86_64" $out/bin/TerrariaServer # Fix "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. find "$out" | while read filepath; do From ed4a061c34382f487b4da11fd4b8130ed215931a Mon Sep 17 00:00:00 2001 From: David Reaver Date: Sat, 6 Aug 2016 19:10:29 -0700 Subject: [PATCH 164/168] NixOS manual: Add docs for Virtualbox guest (#17454) Fixes #13311 --- .../installing-virtualbox-guest.xml | 89 +++++++++++++++++++ nixos/doc/manual/installation/installing.xml | 1 + 2 files changed, 90 insertions(+) create mode 100644 nixos/doc/manual/installation/installing-virtualbox-guest.xml diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml new file mode 100644 index 00000000000..8fe61a5fdfd --- /dev/null +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -0,0 +1,89 @@ +
+ +Installing in a Virtualbox guest + + Installing NixOS into a Virtualbox guest is convenient for users who want to + try NixOS without installing it on bare metal. If you want to use a pre-made + Virtualbox appliance, it is available at the downloads page. + If you want to set up a Virtualbox guest manually, follow these instructions: + + + + + Add a New Machine in Virtualbox with OS Type "Linux / Other + Linux" + + Base Memory Size: 768 MB or higher. + + New Hard Disk of 8 GB or higher. + + Mount the CD-ROM with the NixOS ISO (by clicking on + CD/DVD-ROM) + + Click on Settings / System / Processor and enable + PAE/NX + + Click on Settings / System / Acceleration and enable + "VT-x/AMD-V" acceleration + + Save the settings, start the virtual machine, and continue + installation like normal + + + + + There are a few modifications you should make in configuration.nix. Enable + the virtualbox guest service in the main block: + + + +virtualisation.virtualbox.guest.enable = true; + + + + Enable booting: + + + +boot.loader.grub.device = "/dev/sda"; + + + + Also remove the fsck that runs at startup. It will always fail to run, + stopping your boot until you press *. + + + +boot.initrd.checkJournalingFS = false; + + + + Shared folders can be given a name and a path in the host system in the + VirtualBox settings (Machine / Settings / Shared Folders, then click on the + "Add" icon). Add the following to the + /etc/nixos/configuration.nix to auto-mount them: + + + +{ config, pkgs, ...} : +{ + ... + + fileSystems."/virtualboxshare" = { + fsType = "vboxsf"; + device = "nameofthesharedfolder"; + options = [ "rw" ]; + }; +} + + + + The folder will be available directly under the root directory. + + +
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 073f7ca3462..04a186a1bca 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -271,5 +271,6 @@ drive (here /dev/sda). + From f9dfe0d84361d2cb8bef0ea224cbaa4a0ed63c9e Mon Sep 17 00:00:00 2001 From: Mica Date: Sat, 6 Aug 2016 19:20:14 -0700 Subject: [PATCH 165/168] darktable 2.0.4 -> 2.0.5 (#17568) --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 609d88cea3a..2a4d52088e8 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.0.4"; + version = "2.0.5"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0qhyjsjjcd8yirqdnzbbzsldwd6y4wf1bxjbsshvqq7h5xi4ir40"; + sha256 = "00hap68yvfdif6a4lpbhn4jx1n68mpd2kj473kml1xby9swp32w9"; }; buildInputs = From 216ae3141a48544969ea094dc21071b3822b353b Mon Sep 17 00:00:00 2001 From: Matthijs Steen Date: Thu, 23 Jun 2016 16:07:57 +0200 Subject: [PATCH 166/168] vino: fix dependencies again, fixes #16457 My previous pull request was for release-15.09, and as such has not been reapplied in master (and thus release-16.09). Previous message: The libXtst dependency was missing, which was required to enable remote control. The other dependencies have been updated as well to reflect the dependencies stated at: https://wiki.gnome.org/Projects/Vino https://git.gnome.org/browse/vino/tree/configure.ac --- .../gnome-3/3.20/core/vino/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix index 336178f3729..52481395756 100644 --- a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix @@ -1,14 +1,28 @@ -{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, gnome3, libnotify, file, telepathy_glib, dbus_glib }: +{ stdenv, fetchurl, lib, makeWrapper +, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup +, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null +, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null +, zlib ? null, libjpeg ? null +, libXdamage ? null, libXfixes ? null, libXext ? null +, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, networkmanager ? null }: + +with lib; stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - gnome3.defaultIconTheme dbus_glib telepathy_glib file - makeWrapper ]; + buildInputs = [ + makeWrapper + pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup + ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] + ++ optional gnomeKeyringSupport libgnome_keyring3 + ++ filter (p: p != null) [ + libsecret gnutls libgcrypt avahi zlib libjpeg + libXdamage libXfixes libXext networkmanager + ]; preFixup = '' wrapProgram "$out/libexec/vino-server" \ From 882ad3bbd0bdbb5457d0f2086fd3f876a456960b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 7 Aug 2016 09:04:00 +0200 Subject: [PATCH 167/168] emacs25pre: Removes doCheck = false Fixes #13573. This package builds fine without this line now. --- pkgs/applications/editors/emacs-25/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix index 1a64a2a670e..dcd8a2ab696 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -80,9 +80,6 @@ stdenv.mkDerivation rec { mv nextstep/Emacs.app $out/Applications ''; - # https://github.com/NixOS/nixpkgs/issues/13573 - doCheck = false; - meta = with stdenv.lib; { description = "GNU Emacs 25 (pre), the extensible, customizable text editor"; homepage = http://www.gnu.org/software/emacs/; From 39b48ed2effa2bf2c4241869ec78d5bcbaac5a3d Mon Sep 17 00:00:00 2001 From: arconix Date: Sun, 7 Aug 2016 07:22:47 +0000 Subject: [PATCH 168/168] cpuminer-multi: disable on 686-linux (#17558) upstream bug lucasjones/cpuminer-multi#27 --- pkgs/tools/misc/cpuminer-multi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 9c8a54b5545..f35da52081b 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/wolf9466/cpuminer-multi; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; - platforms = platforms.linux; + # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 + platforms = [ "x86_64-linux" ]; }; }