git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commitca6ee8f519733e1f45b7598d995245dd687f535c authorFrederik Rietdijk <fridh@fridh.nl> dateSat 20 Oct 2018, 09:40 (8 years ago) parent4c774f2ceb0ce8
168 files changed+3432−2527
doc/languages-frameworks/coq.xml+3−4 lib/licenses.nix+5 lib/systems/default.nix+19 lib/systems/doubles.nix+4−1 lib/tests/systems.nix+15−14 nixos/modules/services/network-filesystems/openafs/client.nix+2 nixos/modules/services/network-filesystems/openafs/server.nix+1 nixos/modules/services/networking/tinc.nix−8 nixos/modules/services/x11/compton.nix+6 nixos/modules/services/x11/xserver.nix+2 nixos/modules/tasks/filesystems/zfs.nix+1−1 nixos/modules/virtualisation/kvmgt.nix+7−1 pkgs/applications/altcoins/parity/beta.nix+6−4 pkgs/applications/altcoins/parity/default.nix+4−4 pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch → pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patch+3−33 pkgs/applications/audio/lollypop/default.nix+2−2 pkgs/applications/audio/mixxx/default.nix+3−1 pkgs/applications/audio/radiotray-ng/default.nix+2−2 pkgs/applications/editors/vscode/default.nix+4−4 pkgs/applications/graphics/openimageio/default.nix+2−2 pkgs/applications/misc/gpxsee/default.nix+2−2 pkgs/applications/networking/browsers/chromium/default.nix+2 pkgs/applications/networking/browsers/eolie/default.nix+2−2 pkgs/applications/networking/remote/remmina/default.nix+24−13 pkgs/applications/networking/sync/rclone/browser.nix+25 pkgs/applications/networking/znc/default.nix+3−1 pkgs/applications/science/electronics/gtkwave/default.nix+2−2 pkgs/applications/science/logic/coq/default.nix+2 pkgs/applications/science/logic/why3/default.nix+3−3 pkgs/applications/science/math/sage/env-locations.nix+1 pkgs/applications/science/math/sage/patches/dochtml-optional.patch−127 pkgs/applications/science/math/sage/patches/eclib-20180710.patch−24 pkgs/applications/science/math/sage/patches/pari-no-threads.patch−18 pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch−274 pkgs/applications/science/math/sage/patches/spkg-scripts.patch−46 pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch−31 pkgs/applications/science/math/sage/sage-src.nix+2−108 pkgs/applications/science/math/sage/sagelib.nix+4 pkgs/applications/science/misc/sasview/default.nix+3−3 pkgs/desktops/deepin/dde-polkit-agent/default.nix+46 pkgs/desktops/deepin/deepin-movie-reborn/default.nix+53 pkgs/desktops/deepin/default.nix+3 pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix+40 pkgs/desktops/gnome-3/core/gdm/default.nix+4 pkgs/desktops/gnome-3/core/gdm/reset-environment.patch+20 pkgs/desktops/plasma-5/breeze-qt5.nix+2−2 pkgs/desktops/plasma-5/fetch.sh+1−1 pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch+8−8 pkgs/desktops/plasma-5/plasma-integration/D9070.patch−24 pkgs/desktops/plasma-5/plasma-integration/default.nix−7 pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch+5−9 pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch+9−11 pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch+3−3 pkgs/desktops/plasma-5/plasma-workspace/default.nix−4 pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch+17−17 pkgs/desktops/plasma-5/srcs.nix+180−180 pkgs/development/coq-modules/QuickChick/default.nix+1−1 pkgs/development/coq-modules/bignums/default.nix+1−1 pkgs/development/coq-modules/category-theory/default.nix+1−1 pkgs/development/coq-modules/contribs/default.nix+1−1 pkgs/development/coq-modules/coq-ext-lib/default.nix+1−1 pkgs/development/coq-modules/coq-haskell/default.nix+1−1 pkgs/development/coq-modules/dpdgraph/default.nix+3−3 pkgs/development/coq-modules/equations/default.nix+1−1 pkgs/development/coq-modules/fiat/HEAD.nix+1−1 pkgs/development/coq-modules/flocq/default.nix+1−1 pkgs/development/coq-modules/heq/default.nix+1−1 pkgs/development/coq-modules/mathcomp/generic.nix+1−1 pkgs/development/coq-modules/metalib/default.nix+1−1 pkgs/development/coq-modules/paco/default.nix+1−1 pkgs/development/coq-modules/ssreflect/generic.nix+1−1 pkgs/development/haskell-modules/configuration-common.nix+8−11 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix+3 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix+4 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+68−24 pkgs/development/haskell-modules/configuration-nix.nix+4 pkgs/development/haskell-modules/generic-builder.nix+1−1 pkgs/development/haskell-modules/hackage-packages.nix+869−256 pkgs/development/interpreters/ruby/default.nix+11−11 pkgs/development/interpreters/ruby/patchsets.nix+3−3 pkgs/development/libraries/boost/generic.nix+6−9 pkgs/development/libraries/c-ares/default.nix+2 pkgs/development/libraries/gpgme/default.nix+4−4 pkgs/development/libraries/libdbusmenu-qt/default.nix+1−1 pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix+9−8 pkgs/development/libraries/libgnome-keyring/default.nix+1−1 pkgs/development/libraries/libite/default.nix+1−1 pkgs/development/libraries/libjson/default.nix+10−3 pkgs/development/libraries/libkate/default.nix+3−3 pkgs/development/libraries/liblastfm/default.nix+3−2 pkgs/development/libraries/liblastfmSF/default.nix+1 pkgs/development/libraries/liblqr-1/default.nix+1−1 pkgs/development/libraries/libmilter/default.nix+1 pkgs/development/libraries/libmms/default.nix+4−3 pkgs/development/libraries/libmp3splt/default.nix+1 pkgs/development/libraries/libmtp/default.nix+3−3 pkgs/development/libraries/libmusicbrainz/5.x.nix+3−3 pkgs/development/libraries/libmusicbrainz/default.nix+3−3 pkgs/development/libraries/libnatspec/default.nix+3−3 pkgs/development/libraries/libnetfilter_queue/default.nix+3−3 pkgs/development/libraries/libnice/default.nix+3−2 pkgs/development/libraries/libnotify/default.nix+3−2 pkgs/development/libraries/libnova/default.nix+5−4 pkgs/development/libraries/liboauth/default.nix+1 pkgs/development/libraries/libofa/default.nix+3−2 pkgs/development/libraries/liboggz/default.nix+3−3 pkgs/development/libraries/libpcap/default.nix+1 pkgs/development/libraries/librdf/redland.nix+4−2 pkgs/development/libraries/msgpack/generic.nix−2 pkgs/development/libraries/nghttp2/default.nix+7−2 pkgs/development/libraries/nlohmann_json/default.nix−2 pkgs/development/libraries/range-v3/default.nix+2−2 pkgs/development/libraries/sqlite/default.nix+1−1 pkgs/development/libraries/wcslib/default.nix+2−2 pkgs/development/libraries/zlib/default.nix+2 pkgs/development/python-modules/paho-mqtt/default.nix+29 pkgs/development/python-modules/sasmodels/default.nix+4−4 pkgs/development/python-modules/voluptuous-serialize/default.nix+8−8 pkgs/development/tools/analysis/snowman/default.nix+2−2 pkgs/development/tools/global-platform-pro/default.nix+6−37 pkgs/development/tools/go2nix/default.nix+2−2 pkgs/development/tools/hcloud/default.nix+5−2 pkgs/development/tools/hcloud/deps.nix+102 pkgs/development/tools/misc/awf/default.nix+2−2 pkgs/development/tools/misc/cquery/default.nix+4−4 pkgs/development/tools/ocaml/dune/default.nix+2−2 pkgs/development/tools/rust/cbindgen/default.nix+3−3 pkgs/development/tools/unity3d/default.nix+52−59 pkgs/games/anki/default.nix+7−7 pkgs/games/warmux/default.nix+20−19 pkgs/games/warmux/gcc-fix.patch−51 pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix+4−4 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.18.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2 pkgs/servers/home-assistant/component-packages.nix+73−10 pkgs/servers/home-assistant/default.nix+13−11 pkgs/servers/home-assistant/frontend.nix+2−2 pkgs/servers/http/jetty/default.nix+2−2 pkgs/servers/openafs/1.6/module.nix+3−3 pkgs/servers/openafs/1.6/srcs.nix+3−3 pkgs/servers/openafs/1.8/cross-build.patch+223 pkgs/servers/openafs/1.8/default.nix+8−4 pkgs/servers/openafs/1.8/module.nix+2−4 pkgs/servers/openafs/1.8/srcs.nix+3−3 pkgs/servers/trezord/default.nix+2−2 pkgs/servers/x11/xorg/default.nix+759−511 pkgs/servers/x11/xorg/extra.list+1−1 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl+35−28 pkgs/servers/x11/xorg/old.list+1−1 pkgs/servers/x11/xorg/overrides.nix+272−259 pkgs/servers/x11/xorg/tarballs-7.7.list+3−3 pkgs/shells/zsh/default.nix+10−1 pkgs/stdenv/generic/make-derivation.nix+12 pkgs/tools/backup/btrbk/default.nix+2−2 pkgs/tools/compression/brotli/default.nix+1−3 pkgs/tools/misc/bat/default.nix+10−3 pkgs/tools/networking/curl/7_59.nix+5−1 pkgs/tools/networking/curl/default.nix+5−1 pkgs/tools/networking/eternal-terminal/default.nix+5−7 pkgs/tools/package-management/xbps/default.nix+4−4 pkgs/tools/security/monkeysphere/default.nix+8−6 pkgs/tools/security/nmap/default.nix+8−2 pkgs/tools/text/html-tidy/default.nix+1−2 pkgs/tools/video/bento4/default.nix+30 pkgs/top-level/all-packages.nix+18−15 pkgs/top-level/python-packages.nix+2−19 pkgs/top-level/splice.nix+3−1
doc/languages-frameworks/coq.xml+3−4
@@ -11,10 +11,9 @@
1111 </para>
1212
1313 <para>
14− Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact
15− versions that were used to build Coq are saved in the
16− <literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> and
17− <literal>coq.findlib</literal> attributes.
14+ Some extensions (plugins) might require OCaml and sometimes other OCaml
15+ packages. The <literal>coq.ocamlPackages</literal> attribute can be used
16+ to depend on the same package set Coq was built against.
1817 </para>
1918
2019 <para>
lib/licenses.nix+5
@@ -585,6 +585,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
585585 fullName = "Ruby License";
586586 };
587587
588+ sendmail = spdx {
589+ spdxId = "Sendmail";
590+ fullName = "Sendmail License";
591+ };
592+
588593 sgi-b-20 = spdx {
589594 spdxId = "SGI-B-2.0";
590595 fullName = "SGI Free Software License B v2.0";
lib/systems/default.nix+19
@@ -46,6 +46,25 @@ rec {
4646 # Misc boolean options
4747 useAndroidPrebuilt = false;
4848 useiOSPrebuilt = false;
49+
50+ # Output from uname
51+ uname = {
52+ # uname -s
53+ system = {
54+ "linux" = "Linux";
55+ "windows" = "Windows";
56+ "darwin" = "Darwin";
57+ "netbsd" = "NetBSD";
58+ "freebsd" = "FreeBSD";
59+ "openbsd" = "OpenBSD";
60+ }.${final.parsed.kernel.name} or null;
61+
62+ # uname -p
63+ processor = final.parsed.cpu.name;
64+
65+ # uname -r
66+ release = null;
67+ };
4968 } // mapAttrs (n: v: v final.parsed) inspect.predicates
5069 // args;
5170 in assert final.useAndroidPrebuilt -> final.isAndroid;
lib/systems/doubles.nix+4−1
@@ -15,6 +15,8 @@ let
1515
1616 "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux"
1717 "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
18+
19+ "x86_64-windows" "i686-windows"
1820 ];
1921
2022 allParsed = map parse.mkSystemFromString all;
@@ -37,12 +39,13 @@ in rec {
3739 darwin = filterDoubles predicates.isDarwin;
3840 freebsd = filterDoubles predicates.isFreeBSD;
3941 # Should be better, but MinGW is unclear.
40− gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
42+ gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
4143 illumos = filterDoubles predicates.isSunOS;
4244 linux = filterDoubles predicates.isLinux;
4345 netbsd = filterDoubles predicates.isNetBSD;
4446 openbsd = filterDoubles predicates.isOpenBSD;
4547 unix = filterDoubles predicates.isUnix;
48+ windows = filterDoubles predicates.isWindows;
4649
4750 mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"];
4851}
lib/tests/systems.nix+15−14
@@ -12,20 +12,21 @@ let
1212 expected = lib.sort lib.lessThan y;
1313 };
1414in with lib.systems.doubles; lib.runTests {
15− all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
15+ testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ windows);
1616
17− arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]);
18− i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]);
19− mips = assertTrue (mseteq mips [ "mipsel-linux" ]);
20− x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]);
17+ testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
18+ testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ];
19+ testmips = mseteq mips [ "mipsel-linux" ];
20+ testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" ];
2121
22− cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]);
23− darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]);
24− freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]);
25− gnu = assertTrue (mseteq gnu (linux /* ++ kfreebsd ++ ... */));
26− illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]);
27− linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]);
28− netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]);
29− openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]);
30− unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
22+ testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
23+ testdarwin = mseteq darwin [ "x86_64-darwin" ];
24+ testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
25+ testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
26+ testillumos = mseteq illumos [ "x86_64-solaris" ];
27+ testlinux = mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ];
28+ testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
29+ testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
30+ testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
31+ testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin);
3132}
nixos/modules/services/network-filesystems/openafs/client.nix+2
@@ -149,11 +149,13 @@ in
149149 packages = {
150150 module = mkOption {
151151 default = config.boot.kernelPackages.openafs;
152+ defaultText = "config.boot.kernelPackages.openafs";
152153 type = types.package;
153154 description = "OpenAFS kernel module package. MUST match the userland package!";
154155 };
155156 programs = mkOption {
156157 default = getBin pkgs.openafs;
158+ defaultText = "config.boot.kernelPackages.openafs";
157159 type = types.package;
158160 description = "OpenAFS programs package. MUST match the kernel module package!";
159161 };
nixos/modules/services/network-filesystems/openafs/server.nix+1
@@ -80,6 +80,7 @@ in {
8080
8181 package = mkOption {
8282 default = pkgs.openafs.server or pkgs.openafs;
83+ defaultText = "pkgs.openafs.server or pkgs.openafs";
8384 type = types.package;
8485 description = "OpenAFS package for the server binaries";
8586 };
nixos/modules/services/networking/tinc.nix−8
@@ -148,14 +148,6 @@ in
148148 }
149149 ));
150150
151− networking.interfaces = flip mapAttrs' cfg.networks (network: data: nameValuePair
152− ("tinc.${network}")
153− ({
154− virtual = true;
155− virtualType = "${data.interfaceType}";
156− })
157− );
158−
159151 systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair
160152 ("tinc.${network}")
161153 ({
nixos/modules/services/x11/compton.nix+6
@@ -238,6 +238,12 @@ in {
238238 description = "Compton composite manager";
239239 wantedBy = [ "graphical-session.target" ];
240240 partOf = [ "graphical-session.target" ];
241+
242+ # Temporarily fixes corrupt colours with Mesa 18
243+ environment = mkIf (cfg.backend == "glx") {
244+ allow_rgb10_configs = "false";
245+ };
246+
241247 serviceConfig = {
242248 ExecStart = "${cfg.package}/bin/compton --config ${configFile}";
243249 RestartSec = 3;
nixos/modules/services/x11/xserver.nix+2
@@ -631,6 +631,8 @@ in
631631 ]
632632 ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;
633633
634+ environment.pathsToLink = [ "/share/X11" ];
635+
634636 xdg = {
635637 autostart.enable = true;
636638 menus.enable = true;
nixos/modules/tasks/filesystems/zfs.nix+1−1
@@ -74,7 +74,7 @@ let
7474 importLib = {zpoolCmd, awkCmd, cfgZfs}: ''
7575 poolReady() {
7676 pool="$1"
77− state="$("${zpoolCmd}" import | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")"
77+ state="$("${zpoolCmd}" import 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")"
7878 if [[ "$state" = "ONLINE" ]]; then
7979 return 0
8080 else
nixos/modules/virtualisation/kvmgt.nix+7−1
@@ -50,11 +50,17 @@ in {
5050 nameValuePair "kvmgt-${name}" {
5151 description = "KVMGT VGPU ${name}";
5252 serviceConfig = {
53− Type = "oneshot";
53+ Type = "forking";
5454 RemainAfterExit = true;
55+ Restart = "on-failure";
56+ RestartSec = 5;
5557 ExecStart = "${pkgs.runtimeShell} -c 'echo ${value.uuid} > /sys/bus/pci/devices/${cfg.device}/mdev_supported_types/${name}/create'";
5658 ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/bus/pci/devices/${cfg.device}/${value.uuid}/remove'";
5759 };
60+ unitConfig = {
61+ StartLimitBurst = 5;
62+ StartLimitIntervalSec = 30;
63+ };
5864 wantedBy = [ "multi-user.target" ];
5965 }
6066 ) cfg.vgpus;
pkgs/applications/altcoins/parity/beta.nix+6−4
@@ -1,7 +1,9 @@
11let
2− version = "2.0.3";
3− sha256 = "1yf3ln4ksk8613kqkpsh16cj8xwx761q6czy57rs8kfh7pgc2pzb";
4− cargoSha256 = "1jayk4ngwbg0rv7x1slkl2z46czgy2hnfcxc0dhaz4xpbp2bjqq8";
5− patches = [ ./patches/vendored-sources-2.0.patch ];
2+ version = "2.1.3";
3+ sha256 = "0il18r229r32jzwsjksp8cc63rp6cf6c0j5dvbfzrnv1zndw0cg3";
4+ cargoSha256 = "08dyb0lgf66zfq9xmfkhcn6rj070d49dm0rjl3v39sfag6sryz20";
5+ patches = [
6+ ./patches/vendored-sources-2.1.patch
7+ ];
68in
79 import ./parity.nix { inherit version sha256 cargoSha256 patches; }
pkgs/applications/altcoins/parity/default.nix+4−4
@@ -1,7 +1,7 @@
11let
2− version = "1.11.10";
3− sha256 = "15sk6dvc8h1bdm6v7xlq517km0bakb9f13h1n7ixj311vahnmk15";
4− cargoSha256 = "0p2idd36cyzp2ax81k533bdma4hz0ws2981qj2s7jnhvmj4941l8";
5− patches = [ ./patches/vendored-sources-1.11.patch ];
2+ version = "2.0.8";
3+ sha256 = "1bz6dvx8wxhs3g447s62d9091sard2x7w2zd6iy7hf76wg0p73hr";
4+ cargoSha256 = "0wj93md87fr7a9ag73h0rd9xxqscl0lhbj3g3kvnqrqz9xxajing";
5+ patches = [ ./patches/vendored-sources-2.0.patch ];
66in
77 import ./parity.nix { inherit version sha256 cargoSha256 patches; }
pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch → pkgs/applications/altcoins/parity/patches/vendored-sources-2.1.patchrenamed+3−33
@@ -1,8 +1,8 @@
11diff --git a/.cargo/config b/.cargo/config
2−index 72652ad2f..57c5c2f8f 100644
2+index 72652ad2f..3c0eca89a 100644
33--- a/.cargo/config
44+++ b/.cargo/config
5−@@ -1,3 +1,108 @@
5+@@ -1,3 +1,78 @@
66 [target.x86_64-pc-windows-msvc]
77 # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
88 rustflags = ["-Ctarget-feature=+crt-static"]
@@ -12,19 +12,9 @@ index 72652ad2f..57c5c2f8f 100644
1212+branch = "master"
1313+replace-with = "vendored-sources"
1414+
15−+[source."https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"]
16−+git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"
17−+rev = "bd25b41cd642c6b822d820dded3aa601a29aa079"
18−+replace-with = "vendored-sources"
19−+
20−+[source."https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"]
21−+git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"
22−+rev = "4b6f112412716cd05123d32eeb7fda448288a6c6"
23−+replace-with = "vendored-sources"
24−+
2515+[source."https://github.com/nikvolf/parity-tokio-ipc"]
2616+git = "https://github.com/nikvolf/parity-tokio-ipc"
27−+branch = "master"
17++rev = "7c9bbe3bc45d8e72a92b0951acc877da228abd50"
2818+replace-with = "vendored-sources"
2919+
3020+[source."https://github.com/nikvolf/tokio-named-pipes"]
@@ -32,16 +22,6 @@ index 72652ad2f..57c5c2f8f 100644
3222+branch = "master"
3323+replace-with = "vendored-sources"
3424+
35−+[source."https://github.com/parity-js/dapp-wallet.git"]
36−+git = "https://github.com/parity-js/dapp-wallet.git"
37−+rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87"
38−+replace-with = "vendored-sources"
39−+
40−+[source."https://github.com/parity-js/shell.git"]
41−+git = "https://github.com/parity-js/shell.git"
42−+rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2"
43−+replace-with = "vendored-sources"
44−+
4525+[source."https://github.com/paritytech/app-dirs-rs"]
4626+git = "https://github.com/paritytech/app-dirs-rs"
4727+branch = "master"
@@ -87,21 +67,11 @@ index 72652ad2f..57c5c2f8f 100644
8767+branch = "master"
8868+replace-with = "vendored-sources"
8969+
90−+[source."https://github.com/paritytech/rust-rocksdb"]
91−+git = "https://github.com/paritytech/rust-rocksdb"
92−+branch = "master"
93−+replace-with = "vendored-sources"
94−+
9570+[source."https://github.com/paritytech/rust-secp256k1"]
9671+git = "https://github.com/paritytech/rust-secp256k1"
9772+branch = "master"
9873+replace-with = "vendored-sources"
9974+
100−+[source."https://github.com/paritytech/rust-snappy"]
101−+git = "https://github.com/paritytech/rust-snappy"
102−+branch = "master"
103−+replace-with = "vendored-sources"
104−+
10575+[source."https://github.com/paritytech/trezor-sys"]
10676+git = "https://github.com/paritytech/trezor-sys"
10777+branch = "master"
pkgs/applications/audio/lollypop/default.nix+2−2
@@ -4,7 +4,7 @@
44, gobjectIntrospection, wrapGAppsHook }:
55
66python3.pkgs.buildPythonApplication rec {
7− version = "0.9.604";
7+ version = "0.9.605";
88 name = "lollypop-${version}";
99
1010 format = "other";
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
1414 url = "https://gitlab.gnome.org/World/lollypop";
1515 rev = "refs/tags/${version}";
1616 fetchSubmodules = true;
17− sha256 = "0pfljs5q0xzqll6dybslin4nr7w18bn1yi0xn79vh44zn3l0r8q4";
17+ sha256 = "10d9k7ssh4snrrjy1hb3y39by6175493cmn50aq88xby2mdy3p74";
1818 };
1919
2020 nativeBuildInputs = with python3.pkgs; [
pkgs/applications/audio/mixxx/default.nix+3−1
@@ -1,6 +1,7 @@
11{ stdenv, fetchFromGitHub, makeWrapper, chromaprint, fetchpatch
22, fftw, flac, faad2, glibcLocales, mp4v2
33, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
4+, opusfile
45, pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
56, taglib, upower, vampSDK
67}:
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
2021
2122 buildInputs = [
2223 chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
23− libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
24+ libusb1 libvorbis opusfile pkgconfig portaudio portmidi protobuf qt4
2425 rubberband scons sqlite taglib upower vampSDK
2526 ];
2627
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
2829 "build=release"
2930 "qtdir=${qt4}"
3031 "faad=1"
32+ "opus=1"
3133 ];
3234
3335 buildPhase = ''
pkgs/applications/audio/radiotray-ng/default.nix+2−2
@@ -40,13 +40,13 @@ let
4040in
4141stdenv.mkDerivation rec {
4242 name = "radiotray-ng-${version}";
43− version = "0.2.3";
43+ version = "0.2.4";
4444
4545 src = fetchFromGitHub {
4646 owner = "ebruck";
4747 repo = "radiotray-ng";
4848 rev = "v${version}";
49− sha256 = "1sq7bc0dswv3vv56w527z268ib0pyhdxyf25388vnj1fv0c146wc";
49+ sha256 = "1jk80fv8ivwdx7waivls0mczn0rx4wv0fy7a28k77m88i5gkfgyw";
5050 };
5151
5252 nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
pkgs/applications/editors/vscode/default.nix+4−4
@@ -2,7 +2,7 @@
22 gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:
33
44let
5− version = "1.28.0";
5+ version = "1.28.2";
66 channel = "stable";
77
88 plat = {
@@ -12,9 +12,9 @@ let
1212 }.${stdenv.hostPlatform.system};
1313
1414 sha256 = {
15− "i686-linux" = "0f54py00lmw96x47nk823gwxxc9kr9haaa821ggi974ycr54af0y";
16− "x86_64-linux" = "07bbzm1159k2gkajj6z7dsr0kmadd5gx721w92r252i5hcwg5sx4";
17− "x86_64-darwin" = "019cl2rswls3gwwa8y70cllc4jnd8xj0y2m9rvg2rz695snp6rcm";
15+ "i686-linux" = "13zgx80qzq1wvss3byh56rvp2bdxywc4xmhhljsqrxf17g86g2zr";
16+ "x86_64-linux" = "1z50hkr9mcf76hlr1jb80nbvpxbpm2bh0l63yh9yqpalmz66xbfy";
17+ "x86_64-darwin" = "0n7lavpylg1q89qa64z4z1v7pgmwb2kidc57cgpvjnhjg8idys33";
1818 }.${stdenv.hostPlatform.system};
1919
2020 archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz";
pkgs/applications/graphics/openimageio/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 name = "openimageio-${version}";
7− version = "1.8.14";
7+ version = "1.8.15";
88
99 src = fetchFromGitHub {
1010 owner = "OpenImageIO";
1111 repo = "oiio";
1212 rev = "Release-${version}";
13− sha256 = "07axn7bziy9h5jawpwcchag0nkczivaajsw69mxgmr508gw9r0xn";
13+ sha256 = "0fbl5rzmip5q155lfsr07n65dnhww1kw97masps1i1x40gq15czx";
1414 };
1515
1616 outputs = [ "bin" "out" "dev" "doc" ];
pkgs/applications/misc/gpxsee/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "gpxsee-${version}";
5− version = "5.18";
5+ version = "6.2";
66
77 src = fetchFromGitHub {
88 owner = "tumic0";
99 repo = "GPXSee";
1010 rev = version;
11− sha256 = "0dl10fr881b8fwf2yj14bd6gagb8hm0s46q18y2y56rw98nk4vrq";
11+ sha256 = "13hd6n5mzkk4nx9v9dwg8vvixr73zjba72h6vmxvz9fmywc4rs5p";
1212 };
1313
1414 nativeBuildInputs = [ qmake ];
pkgs/applications/networking/browsers/chromium/default.nix+2
@@ -18,6 +18,8 @@ let
1818 callPackage = newScope chromium;
1919
2020 chromium = {
21+ inherit stdenv;
22+
2123 upstream-info = (callPackage ./update.nix {}).getChannel channel;
2224
2325 mkChromiumDerivation = callPackage ./common.nix {
pkgs/applications/networking/browsers/eolie/default.nix+2−2
@@ -5,7 +5,7 @@
55
66python3.pkgs.buildPythonApplication rec {
77 name = "eolie-${version}";
8− version = "0.9.41";
8+ version = "0.9.45";
99
1010 format = "other";
1111 doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
1414 url = "https://gitlab.gnome.org/World/eolie";
1515 rev = "refs/tags/${version}";
1616 fetchSubmodules = true;
17− sha256 = "0qrbgyzhvh96d7h2rcz04m7am6av30pcvb3fwlrjx0c402rslsx8";
17+ sha256 = "0x6f2qqqxpjf28mqxs4jlrz2z8wa9nvb9h24nf8qwmzavjjbraqg";
1818 };
1919
2020 nativeBuildInputs = [
pkgs/applications/networking/remote/remmina/default.nix+24−13
@@ -1,16 +1,18 @@
11{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
2−, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11
2+, glib, gtk3, gettext, libxkbfile, libX11
33, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
4−, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
4+, pcre, libdbusmenu-gtk3, libappindicator-gtk3
55, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
6−, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core
6+, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
77, openssl, gsettings-desktop-schemas, json-glib
88# The themes here are soft dependencies; only icons are missing without them.
99, hicolor-icon-theme, adwaita-icon-theme
10+, gnomeSupport ? true, libgnome-keyring
1011}:
1112
13+with stdenv.lib;
14+
1215let
13− version = "1.2.32";
1416
1517 desktopItem = makeDesktopItem {
1618 name = "remmina";
@@ -22,8 +24,9 @@ let
2224 categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
2325 };
2426
25−in stdenv.mkDerivation {
27+in stdenv.mkDerivation rec {
2628 name = "remmina-${version}";
29+ version = "1.2.32";
2730
2831 src = fetchFromGitLab {
2932 owner = "Remmina";
@@ -33,13 +36,21 @@ in stdenv.mkDerivation {
3336 };
3437
3538 nativeBuildInputs = [ pkgconfig ];
36− buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas
37− glib gtk3 gettext libxkbfile libgnome-keyring libX11
38− freerdp libssh libgcrypt gnutls
39− pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
40− libvncserver libpthreadstubs libXdmcp libxkbcommon
41− libsecret spice-protocol spice-gtk epoxy at-spi2-core
42− openssl hicolor-icon-theme adwaita-icon-theme json-glib ];
39+ buildInputs = [
40+ cmake wrapGAppsHook gsettings-desktop-schemas
41+ glib gtk3 gettext libxkbfile libX11
42+ freerdp libssh libgcrypt gnutls
43+ pcre libdbusmenu-gtk3 libappindicator-gtk3
44+ libvncserver libpthreadstubs libXdmcp libxkbcommon
45+ libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
46+ openssl hicolor-icon-theme adwaita-icon-theme json-glib
47+ ]
48+ ++ optional gnomeSupport libgnome-keyring;
49+
50+ preConfigure = optionalString (!gnomeSupport) ''
51+ substituteInPlace CMakeLists.txt \
52+ --replace "add_subdirectory(remmina-plugins-gnome)" ""
53+ '';
4354
4455 cmakeFlags = [
4556 "-DWITH_VTE=OFF"
@@ -62,7 +73,7 @@ in stdenv.mkDerivation {
6273 cp ${desktopItem}/share/applications/* $out/share/applications
6374 '';
6475
65− meta = with stdenv.lib; {
76+ meta = {
6677 license = stdenv.lib.licenses.gpl2;
6778 homepage = https://gitlab.com/Remmina/Remmina;
6879 description = "Remote desktop client written in GTK+";
pkgs/applications/networking/sync/rclone/browser.nixnew file+25
@@ -0,0 +1,25 @@
1+{ stdenv, fetchFromGitHub, cmake, qtbase }:
2+
3+stdenv.mkDerivation rec {
4+ name = "rclone-browser-${version}";
5+ version = "1.2";
6+
7+ src = fetchFromGitHub {
8+ owner = "mmozeiko";
9+ repo = "RcloneBrowser";
10+ rev = version;
11+ sha256 = "1ldradd5c606mfkh46y4mhcvf9kbjhamw0gahksp9w43h5dh3ir7";
12+ };
13+
14+ nativeBuildInputs = [ cmake ];
15+
16+ buildInputs = [ qtbase ];
17+
18+ meta = with stdenv.lib; {
19+ inherit (src.meta) homepage;
20+ description = "Graphical Frontend to Rclone written in Qt";
21+ license = licenses.unlicense;
22+ platforms = platforms.linux;
23+ maintainers = with maintainers; [ dotlambda ];
24+ };
25+}
pkgs/applications/networking/znc/default.nix+3−1
@@ -3,6 +3,7 @@
33, withPython ? false, python3
44, withTcl ? false, tcl
55, withCyrus ? true, cyrus_sasl
6+, withUnicode ? true, icu
67}:
78
89with stdenv.lib;
@@ -22,7 +23,8 @@ stdenv.mkDerivation rec {
2223 ++ optional withPerl perl
2324 ++ optional withPython python3
2425 ++ optional withTcl tcl
25− ++ optional withCyrus cyrus_sasl;
26+ ++ optional withCyrus cyrus_sasl
27+ ++ optional withUnicode icu;
2628
2729 configureFlags = [
2830 (stdenv.lib.enableFeature withPerl "perl")
pkgs/applications/science/electronics/gtkwave/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "gtkwave-${version}";
5− version = "3.3.94";
5+ version = "3.3.95";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
9− sha256 = "1v14sdd4lykly6szal6ky79b0s5pv6f1xifk5mkqkg5bkpjq71fg";
9+ sha256 = "1999wnipah1ncvjzjf95pfdrvgq1kd6hli8xlaj2hfjka8pamfaf";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
pkgs/applications/science/logic/coq/default.nix+2
@@ -37,6 +37,8 @@ self = stdenv.mkDerivation {
3737
3838 passthru = {
3939 inherit coq-version;
40+ inherit ocamlPackages;
41+ # For compatibility
4042 inherit (ocamlPackages) ocaml camlp5 findlib num;
4143 emacsBufferSetup = pkgs: ''
4244 ; Propagate coq paths to children
pkgs/applications/science/logic/why3/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "why3-${version}";
5− version = "1.0.0";
5+ version = "1.1.0";
66
77 src = fetchurl {
8− url = https://gforge.inria.fr/frs/download.php/file/37604/why3-1.0.0.tar.gz;
9− sha256 = "18h00diw1c051v7ya0lv09ns5630qi9savwffx0652mcc4b4qpxn";
8+ url = https://gforge.inria.fr/frs/download.php/file/37767/why3-1.1.0.tar.gz;
9+ sha256 = "199ziq8mv3r24y3dd1n2r8k2gy09p7kdyyhkg9qn1vzfd2fxwzc1";
1010 };
1111
1212 buildInputs = (with ocamlPackages; [
pkgs/applications/science/math/sage/env-locations.nix+1
@@ -38,6 +38,7 @@ writeTextFile rec {
3838 export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
3939 export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
4040 export JMOL_DIR="${jmol}"
41+ export JSMOL_DIR="${jmol}/share/jsmol"
4142 export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax"
4243 export THREEJS_DIR="${three}/lib/node_modules/three"
4344 export SAGE_INCLUDE_DIRECTORIES="${cysignals}/lib/python2.7/site-packages"
pkgs/applications/science/math/sage/patches/dochtml-optional.patchdeleted−127
@@ -1,127 +0,0 @@
1−diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py
2−index 25f94f7b7d..9f6139ea4a 100644
3−--- a/src/doc/common/conf.py
4−+++ b/src/doc/common/conf.py
5−@@ -622,9 +622,9 @@ def call_intersphinx(app, env, node, contnode):
6− Check that the link from the thematic tutorials to the reference
7− manual is relative, see :trac:`20118`::
8−
9−- sage: from sage.env import SAGE_DOC
10−- sage: thematic_index = os.path.join(SAGE_DOC, "html", "en", "thematic_tutorials", "index.html")
11−- sage: for line in open(thematic_index).readlines():
12−+ sage: from sage.env import SAGE_DOC # optional - dochtml
13−+ sage: thematic_index = os.path.join(SAGE_DOC, "html", "en", "thematic_tutorials", "index.html") # optional - dochtml
14−+ sage: for line in open(thematic_index).readlines(): # optional - dochtml
15− ....: if "padics" in line:
16− ....: sys.stdout.write(line)
17− <li><a class="reference external" href="../reference/padics/sage/rings/padics/tutorial.html#sage-rings-padics-tutorial" title="(in Sage Reference Manual: p-Adics ...)"><span>Introduction to the -adics</span></a></li>
18−diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
19−index 4236fd05e0..8e499cbaf7 100644
20−--- a/src/sage/doctest/control.py
21−+++ b/src/sage/doctest/control.py
22−@@ -87,7 +87,7 @@ class DocTestDefaults(SageObject):
23− self.sagenb = False
24− self.long = False
25− self.warn_long = None
26−- self.optional = set(['sage']) | auto_optional_tags
27−+ self.optional = set(['sage', 'dochtml']) | auto_optional_tags
28− self.randorder = None
29− self.global_iterations = 1 # sage-runtests default is 0
30− self.file_iterations = 1 # sage-runtests default is 0
31−@@ -343,7 +343,8 @@ class DocTestController(SageObject):
32− if not optionaltag_regex.search(o):
33− raise ValueError('invalid optional tag {!r}'.format(o))
34−
35−- options.optional |= auto_optional_tags
36−+ if "sage" in options.optional:
37−+ options.optional |= auto_optional_tags
38−
39− self.options = options
40− self.files = args
41−@@ -741,7 +742,7 @@ class DocTestController(SageObject):
42− sage: DC = DocTestController(DD, [dirname])
43− sage: DC.expand_files_into_sources()
44− sage: sorted(DC.sources[0].options.optional) # abs tol 1
45−- ['guava', 'magma', 'py3']
46−+ ['guava', 'magma']
47−
48− We check that files are skipped appropriately::
49−
50−@@ -968,7 +969,7 @@ class DocTestController(SageObject):
51− sage: from sage.doctest.control import DocTestDefaults, DocTestController
52− sage: DC = DocTestController(DocTestDefaults(), [])
53− sage: DC._optional_tags_string()
54−- 'sage'
55−+ 'dochtml,sage'
56− sage: DC = DocTestController(DocTestDefaults(optional="all,and,some,more"), [])
57− sage: DC._optional_tags_string()
58− 'all'
59−diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
60−index 9255aa848f..cc4712d3ec 100644
61−--- a/src/sage/misc/sagedoc.py
62−+++ b/src/sage/misc/sagedoc.py
63−@@ -18,9 +18,9 @@ TESTS:
64− Check that argspecs of extension function/methods appear correctly,
65− see :trac:`12849`::
66−
67−- sage: from sage.env import SAGE_DOC
68−- sage: docfilename = os.path.join(SAGE_DOC, 'html', 'en', 'reference', 'calculus', 'sage', 'symbolic', 'expression.html')
69−- sage: with open(docfilename) as fobj:
70−+ sage: from sage.env import SAGE_DOC # optional - dochtml
71−+ sage: docfilename = os.path.join(SAGE_DOC, 'html', 'en', 'reference', 'calculus', 'sage', 'symbolic', 'expression.html') # optional - dochtml
72−+ sage: with open(docfilename) as fobj: # optional - dochtml
73− ....: for line in fobj:
74− ....: if "#sage.symbolic.expression.Expression.numerical_approx" in line:
75− ....: print(line)
76−@@ -790,11 +790,12 @@ def _search_src_or_doc(what, string, extra1='', extra2='', extra3='',
77−
78− ::
79−
80−- sage: len(_search_src_or_doc('src', r'matrix\(', 'incidence_structures', 'self', 'combinat', interact=False).splitlines()) > 1
81−+ sage: from sage.misc.sagedoc import _search_src_or_doc # optional - dochtml
82−+ sage: len(_search_src_or_doc('src', r'matrix\(', 'incidence_structures', 'self', 'combinat', interact=False).splitlines()) > 1 # optional - dochtml
83− True
84−- sage: 'abvar/homology' in _search_src_or_doc('doc', 'homology', 'variety', interact=False) # long time (4s on sage.math, 2012)
85−+ sage: 'abvar/homology' in _search_src_or_doc('doc', 'homology', 'variety', interact=False) # optional - dochtml, long time (4s on sage.math, 2012)
86− True
87−- sage: 'divisors' in _search_src_or_doc('src', '^ *def prime', interact=False)
88−+ sage: 'divisors' in _search_src_or_doc('src', '^ *def prime', interact=False) # optional - dochtml
89− True
90− """
91− # process keywords
92−@@ -1160,9 +1161,9 @@ def search_doc(string, extra1='', extra2='', extra3='', extra4='',
93− counting the length of ``search_doc('tree',
94− interact=False).splitlines()`` gives the number of matches. ::
95−
96−- sage: len(search_doc('tree', interact=False).splitlines()) > 4000 # long time
97−+ sage: len(search_doc('tree', interact=False).splitlines()) > 4000 # optional - dochtml, long time
98− True
99−- sage: len(search_doc('tree', whole_word=True, interact=False).splitlines()) < 2000 # long time
100−+ sage: len(search_doc('tree', whole_word=True, interact=False).splitlines()) < 2000 # optional - dochtml, long time
101− True
102− """
103− return _search_src_or_doc('doc', string, extra1=extra1, extra2=extra2,
104−@@ -1332,9 +1333,9 @@ class _sage_doc:
105−
106− EXAMPLES::
107−
108−- sage: browse_sage_doc._open("reference", testing=True)[0] # indirect doctest
109−+ sage: browse_sage_doc._open("reference", testing=True)[0] # optional - dochtml, indirect doctest
110− 'http://localhost:8000/doc/live/reference/index.html'
111−- sage: browse_sage_doc(identity_matrix, 'rst')[-107:-47]
112−+ sage: browse_sage_doc(identity_matrix, 'rst')[-107:-47] # optional - dochtml
113− 'Full MatrixSpace of 3 by 3 sparse matrices over Integer Ring'
114− """
115− def __init__(self):
116−@@ -1494,9 +1495,9 @@ class _sage_doc:
117−
118− EXAMPLES::
119−
120−- sage: browse_sage_doc._open("reference", testing=True)[0]
121−+ sage: browse_sage_doc._open("reference", testing=True)[0] # optional - dochtml
122− 'http://localhost:8000/doc/live/reference/index.html'
123−- sage: browse_sage_doc._open("tutorial", testing=True)[1]
124−+ sage: browse_sage_doc._open("tutorial", testing=True)[1] # optional - dochtml
125− '.../html/en/tutorial/index.html'
126− """
127− url = self._base_url + os.path.join(name, "index.html")
pkgs/applications/science/math/sage/patches/eclib-20180710.patch−24
@@ -14,27 +14,3 @@ index 4417b59276..ae57ca2991 100644
1414 """
1515 global instances
1616 try:
17−diff --git a/src/sage/libs/eclib/wrap.cpp b/src/sage/libs/eclib/wrap.cpp
18−index 5fd5693b53..d12468faa8 100644
19−--- a/src/sage/libs/eclib/wrap.cpp
20−+++ b/src/sage/libs/eclib/wrap.cpp
21−@@ -133,8 +133,8 @@ char* Curvedata_isogeny_class(struct Curvedata* E, int verbose)
22−
23−
24− int mw_process(struct Curvedata* curve, struct mw* m,
25−- const struct bigint* x, const struct bigint* y,
26−- const struct bigint* z, int sat)
27−+ const bigint* x, const bigint* y,
28−+ const bigint* z, int sat)
29− {
30− Point P(*curve, *x, *y, *z);
31− if (!P.isvalid())
32−@@ -188,7 +188,7 @@ int mw_rank(struct mw* m)
33− }
34−
35− /* Returns index and unsat long array, which user must deallocate */
36−-int mw_saturate(struct mw* m, struct bigint* index, char** unsat,
37−+int mw_saturate(struct mw* m, bigint* index, char** unsat,
38− long sat_bd, int odd_primes_only)
39− {
40− vector<long> v;
pkgs/applications/science/math/sage/patches/pari-no-threads.patchdeleted−18
@@ -1,18 +0,0 @@
1−diff --git a/src/sage/libs/pari/__init__.py b/src/sage/libs/pari/__init__.py
2−index e451766474..77eda66097 100644
3−--- a/src/sage/libs/pari/__init__.py
4−+++ b/src/sage/libs/pari/__init__.py
5−@@ -205,6 +205,13 @@ def _get_pari_instance():
6− # messages in Sage.
7− P.default("debugmem", 0)
8−
9−+ # Make sure pari doesn't use threads, regardless of how it was compiled.
10−+ # Threads cause some doctest failures (memory issues). Those could probably
11−+ # be solved without disabling threads. But that would require figuring out
12−+ # some sensible values for `threadsizemax`. See
13−+ # https://pari.math.u-bordeaux.fr/dochtml/html/GP_defaults.html
14−+ P.default("nbthreads", 1)
15−+
16− return P
17−
18− pari = _get_pari_instance()
pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patchdeleted−274
@@ -1,274 +0,0 @@
1−diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
2−index 9d65c9fa6c..a028bbe719 100644
3−--- a/src/sage/interfaces/singular.py
4−+++ b/src/sage/interfaces/singular.py
5−@@ -654,7 +654,7 @@ class Singular(ExtraTabCompletion, Expect):
6−
7− s = Expect.eval(self, x, **kwds)
8−
9−- if s.find("error") != -1 or s.find("Segment fault") != -1:
10−+ if s.find("error occurred") != -1 or s.find("Segment fault") != -1:
11− raise SingularError('Singular error:\n%s'%s)
12−
13− if get_verbose() > 0:
14−@@ -1079,7 +1079,7 @@ class Singular(ExtraTabCompletion, Expect):
15− sage: S = singular.ring('real', '(a,b)', 'lp')
16− sage: singular.current_ring()
17− polynomial ring, over a field, global ordering
18−- // coefficients: float
19−+ // coefficients: Float()
20− // number of vars : 2
21− // block 1 : ordering lp
22− // : names a b
23−@@ -1157,7 +1157,7 @@ class Singular(ExtraTabCompletion, Expect):
24− sage: singular._tab_completion()
25− ['exteriorPower',
26− ...
27−- 'flintZ']
28−+ 'crossprod']
29− """
30− p = re.compile("// *([a-z0-9A-Z_]*).*") #compiles regular expression
31− proclist = self.eval("listvar(proc)").splitlines()
32−@@ -1183,7 +1183,7 @@ class Singular(ExtraTabCompletion, Expect):
33− EXAMPLES::
34−
35− sage: singular.version()
36−- "Singular ... version 4.1.0 ...
37−+ "Singular ... version 4...
38− """
39− return singular_version()
40−
41−@@ -1562,7 +1562,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement):
42− elif charstr[0] in ['0', 'QQ']:
43− from sage.all import QQ
44− br = QQ
45−- elif charstr[0]=='real':
46−+ elif charstr[0].startswith('Float'):
47− from sage.all import RealField, ceil, log
48− prec = singular.eval('ringlist(basering)[1][2][1]')
49− br = RealField(ceil((ZZ(prec)+1)/log(2,10)))
50−@@ -1750,7 +1750,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement):
51−
52− # Singular 4 puts parentheses around floats and sign outside them
53− charstr = self.parent().eval('charstr(basering)').split(',',1)
54−- if charstr[0] in ['real', 'complex']:
55−+ if charstr[0]=='complex' or charstr[0].startswith('Float'):
56− for i in range(coeff_start, 2 * coeff_start):
57− singular_poly_list[i] = singular_poly_list[i].replace('(','').replace(')','')
58−
59−@@ -1992,7 +1992,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement):
60− sage: S = singular.ring('real', '(a,b)', 'lp')
61− sage: singular.current_ring()
62− polynomial ring, over a field, global ordering
63−- // coefficients: float
64−+ // coefficients: Float()
65− // number of vars : 2
66− // block 1 : ordering lp
67− // : names a b
68−@@ -2072,7 +2072,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement):
69− sage: R._tab_completion()
70− ['exteriorPower',
71− ...
72−- 'flintZ']
73−+ 'crossprod']
74− """
75− return self.parent()._tab_completion()
76−
77−@@ -2358,7 +2358,7 @@ def singular_version():
78− EXAMPLES::
79−
80− sage: singular.version()
81−- "Singular ... version 4.1.0 ...
82−+ "Singular ... version 4...
83− """
84− return singular.eval('system("--version");')
85−
86−diff --git a/src/sage/libs/singular/decl.pxd b/src/sage/libs/singular/decl.pxd
87−index 4b658c4807..d863740419 100644
88−--- a/src/sage/libs/singular/decl.pxd
89−+++ b/src/sage/libs/singular/decl.pxd
90−@@ -170,7 +170,7 @@ cdef extern from "singular/Singular/libsingular.h":
91−
92− int n_NumberOfParameters(const n_Procs_s* r)
93−
94−- ctypedef struct poly "polyrec":
95−+ ctypedef struct poly "spolyrec":
96− poly *next
97− number *coef
98− unsigned long exp[1]
99−@@ -630,9 +630,13 @@ cdef extern from "singular/Singular/libsingular.h":
100− # return p*q, destroys p and q
101− poly *p_Mult_q(poly *p, poly *q, ring *r)
102−
103−+ # polynomial division, ignoring the rest
104−+ # via singclap_pdivide resp. idLift, destroys p,q
105−+ poly *p_Divide(poly *p, poly *q, ring *r)
106−+
107− # divide monomial p by monomial q, p,q const
108−
109−- poly *pDivide(poly *p,poly *q)
110−+ poly *pMDivide(poly *p,poly *q)
111−
112− # return the i-th power of p; p destroyed, requires global ring
113−
114−diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
115−index 2a8d9ae021..aeff53af6c 100644
116−--- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
117−+++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx
118−@@ -190,8 +190,8 @@ from sage.libs.singular.decl cimport (
119− n_IsUnit, n_Invers,
120− p_ISet, rChangeCurrRing, p_Copy, p_Init, p_SetCoeff, p_Setm, p_SetExp, p_Add_q,
121− p_NSet, p_GetCoeff, p_Delete, p_GetExp, pNext, rRingVar, omAlloc0, omStrDup,
122−- omFree, pDivide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, p_LmDivisibleBy,
123−- pDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy,
124−+ omFree, pMDivide, p_Divide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, p_LmDivisibleBy,
125−+ pMDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy,
126− p_IsUnit, p_Series, p_Head, idInit, fast_map_common_subexp, id_Delete,
127− p_IsHomogeneous, p_Homogen, p_Totaldegree,pLDeg1_Totaldegree, singclap_pdivide, singclap_factorize,
128− idLift, IDELEMS, On, Off, SW_USE_CHINREM_GCD, SW_USE_EZGCD,
129−@@ -1693,8 +1693,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
130− if not g._poly:
131− raise ZeroDivisionError
132−
133−- if r!=currRing: rChangeCurrRing(r) # pDivide
134−- res = pDivide(f._poly, g._poly)
135−+ if r!=currRing: rChangeCurrRing(r) # pMDivide
136−+ res = pMDivide(f._poly, g._poly)
137− if coeff:
138− if r.cf.type == n_unknown or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf):
139− n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf)
140−@@ -1853,8 +1853,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base):
141− and (<MPolynomial_libsingular>g) \
142− and g.parent() is self \
143− and p_LmDivisibleBy((<MPolynomial_libsingular>g)._poly, m, r):
144−- if r!=currRing: rChangeCurrRing(r) # pDivide
145−- flt = pDivide(f._poly, (<MPolynomial_libsingular>g)._poly)
146−+ if r!=currRing: rChangeCurrRing(r) # pMDivide
147−+ flt = pMDivide(f._poly, (<MPolynomial_libsingular>g)._poly)
148− #p_SetCoeff(flt, n_Div( p_GetCoeff(f._poly, r) , p_GetCoeff((<MPolynomial_libsingular>g)._poly, r), r), r)
149− p_SetCoeff(flt, n_Init(1, r), r)
150− return new_MP(self,flt), g
151−@@ -4023,16 +4023,6 @@ cdef class MPolynomial_libsingular(MPolynomial):
152− Traceback (most recent call last):
153− ...
154− NotImplementedError: Division of multivariate polynomials over non fields by non-monomials not implemented.
155−-
156−- TESTS::
157−-
158−- sage: P.<x,y> = ZZ[]
159−- sage: p = 3*(-x^8*y^2 - x*y^9 + 6*x^8*y + 17*x^2*y^6 - x^3*y^2)
160−- sage: q = 7*(x^2 + x*y + y^2 + 1)
161−- sage: p*q//q == p
162−- True
163−- sage: p*q//p == q
164−- True
165− """
166− cdef MPolynomialRing_libsingular parent = self._parent
167− cdef ring *r = self._parent_ring
168−@@ -4052,13 +4042,18 @@ cdef class MPolynomial_libsingular(MPolynomial):
169− _right = <MPolynomial_libsingular>right
170−
171− if r.cf.type != n_unknown:
172−+ if r.cf.type == n_Z:
173−+ P = parent.change_ring(RationalField())
174−+ f = P(self)//P(right)
175−+ CM = list(f)
176−+ return parent(sum([c.floor()*m for c,m in CM]))
177− if _right.is_monomial():
178− p = _self._poly
179− quo = p_ISet(0,r)
180−- if r != currRing: rChangeCurrRing(r) # pDivide
181−+ if r != currRing: rChangeCurrRing(r) # pMDivide
182− while p:
183− if p_DivisibleBy(_right._poly, p, r):
184−- temp = pDivide(p, _right._poly)
185−+ temp = pMDivide(p, _right._poly)
186− p_SetCoeff0(temp, n_Copy(p_GetCoeff(p, r), r), r)
187− quo = p_Add_q(quo, temp, r)
188− p = pNext(p)
189−@@ -4794,6 +4789,8 @@ cdef class MPolynomial_libsingular(MPolynomial):
190− sage: p = -x*y + x*z + 54*x - 2
191− sage: (5*p^2).lcm(3*p) == 15*p^2
192− True
193−+ sage: lcm(2*x,2*x*y)
194−+ 2*x*y
195− """
196− cdef ring *_ring = self._parent_ring
197− cdef poly *ret
198−@@ -4821,9 +4818,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
199− if _ring!=currRing: rChangeCurrRing(_ring) # singclap_gcd
200− gcd = singclap_gcd(p_Copy(self._poly, _ring), p_Copy(_g._poly, _ring), _ring )
201− prod = pp_Mult_qq(self._poly, _g._poly, _ring)
202−- ret = singclap_pdivide(prod , gcd , _ring)
203−- p_Delete(&prod, _ring)
204−- p_Delete(&gcd, _ring)
205−+ ret = p_Divide(prod, gcd, _ring)
206− if count >= 20:
207− sig_off()
208− return new_MP(self._parent, ret)
209−@@ -4866,7 +4861,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
210− sage: f.quo_rem(y)
211− (2*x^2, x + 1)
212− sage: f.quo_rem(3*x)
213−- (2*x*y + 1, -4*x^2*y - 2*x + 1)
214−+ (0, 2*x^2*y + x + 1)
215−
216− TESTS::
217−
218−@@ -4888,7 +4883,7 @@ cdef class MPolynomial_libsingular(MPolynomial):
219− if right.is_zero():
220− raise ZeroDivisionError
221−
222−- if not self._parent._base.is_field() and not is_IntegerRing(self._parent._base):
223−+ if not self._parent._base.is_field():
224− py_quo = self//right
225− py_rem = self - right*py_quo
226− return py_quo, py_rem
227−diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx
228−index d5439f7f08..ad20ebcca0 100644
229−--- a/src/sage/rings/polynomial/plural.pyx
230−+++ b/src/sage/rings/polynomial/plural.pyx
231−@@ -998,7 +998,7 @@ cdef class NCPolynomialRing_plural(Ring):
232− if not g._poly:
233− raise ZeroDivisionError
234−
235−- res = pDivide(f._poly,g._poly)
236−+ res = pMDivide(f._poly,g._poly)
237− if coeff:
238− if (r.cf.type == n_unknown) or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf):
239− n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf)
240−@@ -1193,7 +1193,7 @@ cdef class NCPolynomialRing_plural(Ring):
241− if isinstance(g, NCPolynomial_plural) \
242− and (<NCPolynomial_plural>g) \
243− and p_LmDivisibleBy((<NCPolynomial_plural>g)._poly, m, r):
244−- flt = pDivide(f._poly, (<NCPolynomial_plural>g)._poly)
245−+ flt = pMDivide(f._poly, (<NCPolynomial_plural>g)._poly)
246− #p_SetCoeff(flt, n_Div( p_GetCoeff(f._poly, r) , p_GetCoeff((<NCPolynomial_plural>g)._poly, r), r), r)
247− p_SetCoeff(flt, n_Init(1, r), r)
248− return new_NCP(self,flt), g
249−diff --git a/src/sage/rings/polynomial/polynomial_singular_interface.py b/src/sage/rings/polynomial/polynomial_singular_interface.py
250−index 9331169f8b..f753610fd3 100644
251−--- a/src/sage/rings/polynomial/polynomial_singular_interface.py
252−+++ b/src/sage/rings/polynomial/polynomial_singular_interface.py
253−@@ -81,8 +81,8 @@ class PolynomialRing_singular_repr:
254− sage: R.<x,y> = PolynomialRing(CC)
255− sage: singular(R)
256− polynomial ring, over a field, global ordering
257−- // coefficients: float[I](complex:15 digits, additional 0 digits)/(I^2+1)
258−- // number of vars : 2
259−+ // coefficients: real[I](complex:15 digits, additional 0 digits)/(I^2+1)
260−+ // number of vars : 2
261− // block 1 : ordering dp
262− // : names x y
263− // block 2 : ordering C
264−@@ -90,8 +90,8 @@ class PolynomialRing_singular_repr:
265− sage: R.<x,y> = PolynomialRing(RealField(100))
266− sage: singular(R)
267− polynomial ring, over a field, global ordering
268−- // coefficients: float
269−- // number of vars : 2
270−+ // coefficients: Float()
271−+ // number of vars : 2
272− // block 1 : ordering dp
273− // : names x y
274− // block 2 : ordering C
pkgs/applications/science/math/sage/patches/spkg-scripts.patchdeleted−46
@@ -1,46 +0,0 @@
1−commit f02714d4aea80e17cb8df62bab75d7c1a1b61a8e
2−Author: Timo Kaufmann <timokau@zoho.com>
3−Date: Mon Jul 9 18:26:18 2018 +0200
4−
5− Don't attempt to create dirs when showing pkg info
6−
7− The script dir cannot be assumed to be writeable after installation.
8−
9−diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg
10−index f3e02aeae5..190d558ad1 100755
11−--- a/build/bin/sage-spkg
12−+++ b/build/bin/sage-spkg
13−@@ -167,14 +167,6 @@ if [ -z "$SAGE_BUILD_DIR" ]; then
14− export SAGE_BUILD_DIR="$SAGE_LOCAL/var/tmp/sage/build"
15− fi
16−
17−-for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS"; do
18−- mkdir -p "$dir"
19−- if [ $? -ne 0 ]; then
20−- error_msg "Error creating directory $dir"
21−- exit 1
22−- fi
23−-done
24−-
25−
26− # Remove '.' from PYTHONPATH, which may also come from SAGE_PATH, to avoid
27− # trouble with setuptools / easy_install (cf. #10192, #10176):
28−@@ -563,11 +555,13 @@ fi
29− # Setup directories
30− ##################################################################
31−
32−-mkdir -p "$SAGE_BUILD_DIR"
33−-if [ $? -ne 0 ]; then
34−- error_msg "Error creating directory $SAGE_BUILD_DIR"
35−- exit 1
36−-fi
37−+for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS" "$SAGE_BUILD_DIR"; do
38−+ mkdir -p "$dir"
39−+ if [ $? -ne 0 ]; then
40−+ error_msg "Error creating directory $dir"
41−+ exit 1
42−+ fi
43−+done
44−
45− # Trac #5852: check write permissions
46− if [ ! -w "$SAGE_BUILD_DIR" ]; then
pkgs/applications/science/math/sage/patches/test-in-tmpdir.patchdeleted−31
@@ -1,31 +0,0 @@
1−diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py
2−index aa23c8405d..8a87de0591 100644
3−--- a/src/sage/repl/ipython_kernel/install.py
4−+++ b/src/sage/repl/ipython_kernel/install.py
5−@@ -112,7 +112,7 @@ class SageKernelSpec(object):
6− EXAMPLES::
7−
8− sage: from sage.repl.ipython_kernel.install import SageKernelSpec
9−- sage: spec = SageKernelSpec()
10−+ sage: spec = SageKernelSpec(prefix = tmp_dir())
11− sage: spec.use_local_mathjax()
12− sage: mathjax = os.path.join(spec.nbextensions_dir, 'mathjax')
13− sage: os.path.isdir(mathjax)
14−@@ -129,7 +129,7 @@ class SageKernelSpec(object):
15− EXAMPLES::
16−
17− sage: from sage.repl.ipython_kernel.install import SageKernelSpec
18−- sage: spec = SageKernelSpec()
19−+ sage: spec = SageKernelSpec(prefix = tmp_dir())
20− sage: spec.use_local_jsmol()
21− sage: jsmol = os.path.join(spec.nbextensions_dir, 'jsmol')
22− sage: os.path.isdir(jsmol)
23−@@ -146,7 +146,7 @@ class SageKernelSpec(object):
24− EXAMPLES::
25−
26− sage: from sage.repl.ipython_kernel.install import SageKernelSpec
27−- sage: spec = SageKernelSpec()
28−+ sage: spec = SageKernelSpec(prefix = tmp_dir())
29− sage: spec.use_local_threejs()
30− sage: threejs = os.path.join(spec.nbextensions_dir, 'threejs')
31− sage: os.path.isdir(threejs)
pkgs/applications/science/math/sage/sage-src.nix+2−108
@@ -3,35 +3,17 @@
33, fetchpatch
44}:
55stdenv.mkDerivation rec {
6− version = "8.3";
6+ version = "8.4";
77 name = "sage-src-${version}";
88
99 src = fetchFromGitHub {
1010 owner = "sagemath";
1111 repo = "sage";
1212 rev = version;
13− sha256 = "0mbm99m5xry21xpi4q3q96gx392liwbifywf5awvl0j85a7rkfyx";
13+ sha256 = "0gips1hagiz9m7s21bg5as8hrrm2x5k47h1bsq0pc46iplfwmv2d";
1414 };
1515
1616 nixPatches = [
17− # https://trac.sagemath.org/ticket/25809
18− ./patches/spkg-scripts.patch
19−
20− # https://trac.sagemath.org/ticket/25309
21− (fetchpatch {
22− name = "spkg-paths.patch";
23− url = "https://git.sagemath.org/sage.git/patch/?h=97f06fddee920399d4fcda65aa9b0925774aec69&id=a86151429ccce1ddd085e8090ada8ebdf02f3310";
24− sha256 = "1xb9108rzzkdhn71vw44525620d3ww9jv1fph5a77v9y7nf9wgr7";
25− })
26− (fetchpatch {
27− name = "maxima-fas.patch";
28− url = "https://git.sagemath.org/sage.git/patch/?h=97f06fddee920399d4fcda65aa9b0925774aec69";
29− sha256 = "14s50yg3hpw9cp3v581dx7zfmpm2j972im7x30iwki8k45mjvk3i";
30− })
31−
32− # https://trac.sagemath.org/ticket/25722
33− ./patches/test-in-tmpdir.patch
34−
3517 # https://trac.sagemath.org/ticket/25358
3618 (fetchpatch {
3719 name = "safe-directory-test-without-patch.patch";
@@ -45,46 +27,9 @@ stdenv.mkDerivation rec {
4527 # https://trac.sagemath.org/ticket/25316
4628 # https://github.com/python/cpython/pull/7476
4729 ./patches/python-5755-hotpatch.patch
48−
49− # https://trac.sagemath.org/ticket/25315
50− (fetchpatch {
51− name = "find-libraries-in-dyld-library-path.patch";
52− url = "https://git.sagemath.org/sage.git/patch/?h=20d4593876ce9c6004eac2ab6fd61786d0d96a06";
53− sha256 = "1k3afq3qlzmgqwx6rzs5wv153vv9dsf5rk8pi61g57l3r3npbjmc";
54− })
55−
56− # https://trac.sagemath.org/ticket/25345
57− # (upstream patch doesn't apply on 8.2 source)
58− ./patches/dochtml-optional.patch
59−
60− # work with pari with threads enabled at compile time (disable them at runtime)
61− # https://trac.sagemath.org/ticket/26002
62− ./patches/pari-no-threads.patch
6330 ];
6431
6532 packageUpgradePatches = [
66− (fetchpatch {
67− name = "cypari2-1.2.1.patch";
68− url = "https://git.sagemath.org/sage.git/patch/?h=62fe6eb15111327d930336d4252d5b23cbb22ab9";
69− sha256 = "1xax7vvs8h4xip16xcsp47xdb6lig6f2r3pl8cksvlz8lhgbyxh2";
70− })
71−
72− # matplotlib 2.2.2 deprecated `normed` (replaced by `density`).
73− # This patch only ignores the warning. It would be equally easy to fix it
74− # (by replacing all mentions of `normed` by `density`), but its better to
75− # stay close to sage upstream. I didn't open an upstream ticket about it
76− # because the matplotlib update also requires a new dependency (kiwisolver)
77− # and I don't want to invest the time to learn how to add it.
78− ./patches/matplotlib-normed-deprecated.patch
79−
80− # Update to 20171219 broke the doctests because of insignificant precision
81− # changes, make the doctests less fragile.
82− # I didn't open an upstream ticket because its not entirely clear if
83− # 20171219 is really "released" yet. It is listed on the github releases
84− # page, but not marked as "latest release" and the homepage still links to
85− # the last version.
86− ./patches/eclib-regulator-precision.patch
87−
8833 # New glpk version has new warnings, filter those out until upstream sage has found a solution
8934 # https://trac.sagemath.org/ticket/24824
9035 ./patches/pari-stackwarn.patch # not actually necessary since tha pari upgrade, but necessary for the glpk patch to apply
@@ -94,66 +39,15 @@ stdenv.mkDerivation rec {
9439 stripLen = 1;
9540 })
9641
97− (fetchpatch {
98− name = "matplotlib-2.2.2";
99− url = "https://git.sagemath.org/sage.git/patch?id=0d6244ed53b71aba861ce3d683d33e542c0bf0b0";
100− sha256 = "15x4cadxxlsdfh2sblgagqjj6ir13fgdzixxnwnvzln60saahb34";
101− })
102−
103− (fetchpatch {
104− name = "scipy-1.1.0";
105− url = "https://git.sagemath.org/sage.git/patch?id=e0db968a51678b34ebd8d34906c7042900272378";
106− sha256 = "0kq5zxqphhrmavrmg830wdr7hwp1bkzdqlf3jfqfr8r8xq12qwf7";
107− })
108−
10942 # https://trac.sagemath.org/ticket/25260
11043 ./patches/numpy-1.15.1.patch
11144
112− # https://trac.sagemath.org/ticket/25862
113− ./patches/eclib-20180710.patch
114−
115− # https://trac.sagemath.org/ticket/24735
116− ./patches/singular-4.1.1p2.patch
117−
118− # https://trac.sagemath.org/ticket/25567 and dependency #25635
119− (fetchpatch {
120− name = "pari-upgrade-dependency.patch";
121− url = "https://git.sagemath.org/sage.git/patch/?id=6995e7cae1b3476ad0145f8dfc897cf91f0c3c4d";
122− sha256 = "1dvhabl1c9pwd9xkjvbjjg15mvb14b24p1f3cby1mlqk34d4lrs6";
123− })
124− (fetchpatch {
125− name = "pari-2.11.0.patch";
126− url = "https://git.sagemath.org/sage.git/patch/?id=7af4748cab37d651eaa88be501db88f4a5ffc584";
127− sha256 = "13f740ly3c19gcmhjngiycvmc3mcfj61y00i6jv0wmfgpm2z3ank";
128− })
129−
13045 # ntl upgrade
13146 (fetchpatch {
13247 name = "lcalc-c++11.patch";
13348 url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa";
13449 sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb";
13550 })
136−
137− # cddlib 0.94i -> 0.94j
138− (fetchpatch {
139− name = "cddlib-0.94j.patch";
140− url = "https://git.sagemath.org/sage.git/patch/?id=2ab1546b3e21d1d0ab3b4fcd58576848b3a2d888";
141− sha256 = "1c5gnasq7y9xxj762bn79bis0zi8d9bgg7jzlf64ifixsrc5cymb";
142− })
143−
144− # arb 2.13.0 -> 2.14.0
145− (fetchpatch {
146− name = "arb-2.14.0.patch";
147− url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e";
148− sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk";
149− })
150−
151− # https://trac.sagemath.org/ticket/26117
152− (fetchpatch {
153− name = "sympy-1.2.patch";
154− url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta2&id=d94a0a3a3fb4aec05a6f4d95166d90c284f05c36";
155− sha256 = "0an2xl1pp3jg36kgg2m1vb7sns7rprk1h3d0qy1gxwdab6i7qnvi";
156− })
15751 ];
15852
15953 patches = nixPatches ++ packageUpgradePatches ++ [
pkgs/applications/science/math/sage/sagelib.nix+4
@@ -47,6 +47,8 @@
4747, singular
4848, pip
4949, jupyter_core
50+, libhomfly
51+, libbraiding
5052}:
5153
5254buildPythonPackage rec {
@@ -109,6 +111,8 @@ buildPythonPackage rec {
109111 pip
110112 cython
111113 cysignals
114+ libhomfly
115+ libbraiding
112116 ];
113117
114118 buildPhase = ''
pkgs/applications/science/misc/sasview/default.nix+3−3
@@ -17,7 +17,7 @@ in
1717
1818python.pkgs.buildPythonApplication rec {
1919 pname = "sasview";
20− version = "unstable-2018-05-05";
20+ version = "4.2.0";
2121
2222 checkInputs = with python.pkgs; [
2323 pytest
@@ -60,8 +60,8 @@ python.pkgs.buildPythonApplication rec {
6060 src = fetchFromGitHub {
6161 owner = "SasView";
6262 repo = "sasview";
63− rev = "de431924d0ddf73cfb952df88bd6661181947019";
64− sha256 = "01bk0i0g65yzyq16n1a61rgjna8rrc2i51x2ndf1z7khb1fl16vg";
63+ rev = "v${version}";
64+ sha256 = "0k3486h46k6406h0vla8h68fd78wh3dcaq5w6f12jh6g4cjxv9qa";
6565 };
6666
6767 patches = [ ./pyparsing-fix.patch ./local_config.patch ];
pkgs/desktops/deepin/dde-polkit-agent/default.nixnew file+46
@@ -0,0 +1,46 @@
1+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt,
2+dtkcore, dtkwidget, dde-qt-dbus-factory }:
3+
4+stdenv.mkDerivation rec {
5+ name = "${pname}-${version}";
6+ pname = "dde-polkit-agent";
7+ version = "0.2.1";
8+
9+ src = fetchFromGitHub {
10+ owner = "linuxdeepin";
11+ repo = pname;
12+ rev = version;
13+ sha256 = "1n3hys5hhhd99ycpx4im6ihy53vl9c28z7ls7smn117h3ca4c8wc";
14+ };
15+
16+ nativeBuildInputs = [
17+ pkgconfig
18+ qmake
19+ qttools
20+ ];
21+
22+ buildInputs = [
23+ dde-qt-dbus-factory
24+ dtkcore
25+ dtkwidget
26+ polkit-qt
27+ ];
28+
29+ postPatch = ''
30+ patchShebangs .
31+
32+ sed -i dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop \
33+ -e "s,/usr,$out,"
34+
35+ sed -i pluginmanager.cpp \
36+ -e "s,/usr/lib/polkit-1-dde/plugins,/run/current-system/sw/lib/polkit-1-dde/plugins,"
37+ '';
38+
39+ meta = with stdenv.lib; {
40+ description = "PolicyKit agent for Deepin Desktop Environment";
41+ homepage = https://github.com/linuxdeepin/dde-polkit-agent;
42+ license = licenses.gpl3;
43+ platforms = platforms.linux;
44+ maintainers = with maintainers; [ romildo ];
45+ };
46+}
pkgs/desktops/deepin/deepin-movie-reborn/default.nixnew file+53
@@ -0,0 +1,53 @@
1+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
2+ dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio,
3+ libdvdnav, libdvdread, xorg }:
4+
5+stdenv.mkDerivation rec {
6+ name = "${pname}-${version}";
7+ pname = "deepin-movie-reborn";
8+ version = "3.2.10";
9+
10+ src = fetchFromGitHub {
11+ owner = "linuxdeepin";
12+ repo = pname;
13+ rev = version;
14+ sha256 = "0lqmbvl9yyxgkiipd9r8mgmxl2sm34l3gr3hkwlc7r2l6kc32933";
15+ };
16+
17+ nativeBuildInputs = [
18+ cmake
19+ pkgconfig
20+ qttools
21+ ];
22+
23+ buildInputs = [
24+ dtkcore
25+ dtkwidget
26+ ffmpeg
27+ ffmpegthumbnailer
28+ libdvdnav
29+ libdvdread
30+ mpv
31+ pulseaudio
32+ qtx11extras
33+ xorg.libXdmcp
34+ xorg.libXtst
35+ xorg.libpthreadstubs
36+ xorg.xcbproto
37+ ];
38+
39+ NIX_LDFLAGS = "-ldvdnav";
40+
41+ postPatch = ''
42+ sed -i src/CMakeLists.txt -e "s,/usr/lib/dtk2,${dtkcore}/lib/dtk2,"
43+ sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,'
44+ '';
45+
46+ meta = with stdenv.lib; {
47+ description = "Deepin movie player";
48+ homepage = https://github.com/linuxdeepin/deepin-movie-reborn;
49+ license = licenses.gpl3;
50+ platforms = platforms.linux;
51+ maintainers = with maintainers; [ romildo ];
52+ };
53+}
pkgs/desktops/deepin/default.nix+3
@@ -6,6 +6,7 @@ let
66 dbus-factory = callPackage ./dbus-factory { };
77 dde-api = callPackage ./dde-api { };
88 dde-calendar = callPackage ./dde-calendar { };
9+ dde-polkit-agent = callPackage ./dde-polkit-agent { };
910 dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
1011 deepin-desktop-base = callPackage ./deepin-desktop-base { };
1112 deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
@@ -15,6 +16,7 @@ let
1516 deepin-image-viewer = callPackage ./deepin-image-viewer { };
1617 deepin-menu = callPackage ./deepin-menu { };
1718 deepin-metacity = callPackage ./deepin-metacity { };
19+ deepin-movie-reborn = callPackage ./deepin-movie-reborn { };
1820 deepin-mutter = callPackage ./deepin-mutter { };
1921 deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
2022 deepin-sound-theme = callPackage ./deepin-sound-theme { };
@@ -24,6 +26,7 @@ let
2426 };
2527 deepin-wallpapers = callPackage ./deepin-wallpapers { };
2628 deepin-wm = callPackage ./deepin-wm { };
29+ dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
2730 dtkcore = callPackage ./dtkcore { };
2831 dtkwm = callPackage ./dtkwm { };
2932 dtkwidget = callPackage ./dtkwidget { };
pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nixnew file+40
@@ -0,0 +1,40 @@
1+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, dde-polkit-agent }:
2+
3+stdenv.mkDerivation rec {
4+ name = "${pname}-${version}";
5+ pname = "dpa-ext-gnomekeyring";
6+ version = "0.1.0";
7+
8+ src = fetchFromGitHub {
9+ owner = "linuxdeepin";
10+ repo = pname;
11+ rev = version;
12+ sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw";
13+ };
14+
15+ nativeBuildInputs = [
16+ pkgconfig
17+ qmake
18+ qttools
19+ ];
20+
21+ buildInputs = [
22+ dde-polkit-agent
23+ gnome3.libgnome-keyring
24+ ];
25+
26+ postPatch = ''
27+ patchShebangs .
28+
29+ sed -i dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp \
30+ -e "s,/usr,$out,"
31+ '';
32+
33+ meta = with stdenv.lib; {
34+ description = "GNOME keyring extension for dde-polkit-agent";
35+ homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring;
36+ license = licenses.gpl3;
37+ platforms = platforms.linux;
38+ maintainers = with maintainers; [ romildo ];
39+ };
40+}
pkgs/desktops/gnome-3/core/gdm/default.nix+4
@@ -58,6 +58,10 @@ stdenv.mkDerivation rec {
5858 # Forwards certain environment variables to the gdm-x-session child process
5959 # to ensure that the above two patches actually work.
6060 ./gdm-session-worker_forward-vars.patch
61+
62+ # Set up the environment properly when launching sessions
63+ # https://github.com/NixOS/nixpkgs/issues/48255
64+ ./reset-environment.patch
6165 ];
6266
6367 installFlags = [
pkgs/desktops/gnome-3/core/gdm/reset-environment.patchnew file+20
@@ -0,0 +1,20 @@
1+--- a/daemon/gdm-wayland-session.c
2++++ b/daemon/gdm-wayland-session.c
3+@@ -285,6 +285,7 @@ spawn_session (State *state,
4+ "WAYLAND_DISPLAY",
5+ "WAYLAND_SOCKET",
6+ "GNOME_SHELL_SESSION_MODE",
7++ "__NIXOS_SET_ENVIRONMENT_DONE",
8+ NULL };
9+
10+ g_debug ("Running wayland session");
11+--- a/daemon/gdm-x-session.c
12++++ b/daemon/gdm-x-session.c
13+@@ -610,6 +610,7 @@ spawn_session (State *state,
14+ "WAYLAND_DISPLAY",
15+ "WAYLAND_SOCKET",
16+ "GNOME_SHELL_SESSION_MODE",
17++ "__NIXOS_SET_ENVIRONMENT_DONE",
18+ NULL };
19+
20+ g_debug ("Running X session");
pkgs/desktops/plasma-5/breeze-qt5.nix+2−2
@@ -3,7 +3,7 @@
33 extra-cmake-modules,
44 frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
55 kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative,
6− qtx11extras
6+ qtx11extras, fftw
77}:
88
99mkDerivation {
@@ -13,7 +13,7 @@ mkDerivation {
1313 propagatedBuildInputs = [
1414 frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
1515 kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
16− qtx11extras
16+ qtx11extras fftw
1717 ];
1818 outputs = [ "bin" "dev" "out" ];
1919 cmakeFlags = [ "-DUSE_Qt4=OFF" ];
pkgs/desktops/plasma-5/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.5/ -A '*.tar.xz' )
1+WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.0/ -A '*.tar.xz' )
pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch+8−8
@@ -1,11 +1,11 @@
1−Index: kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp
2−===================================================================
3−--- kde-gtk-config-5.12.4.orig/src/gtkconfigkcmodule.cpp
4−+++ kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp
5−@@ -78,6 +78,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWi
6− m_iconsModel = new IconThemesModel(false, this);
7− ui->cb_icon->setModel(m_iconsModel);
8− ui->cb_icon_fallback->setModel(m_iconsModel);
1+diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
2+index 7b82d50..96831d8 100644
3+--- a/src/gtkconfigkcmodule.cpp
4++++ b/src/gtkconfigkcmodule.cpp
5+@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
6+ iconsProxyModel->sort(0);
7+ ui->cb_icon->setModel(iconsProxyModel);
8+ ui->cb_icon_fallback->setModel(iconsProxyModel);
99+
1010+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
1111+ // Normally this would be done by wrapGAppsHook, but this plugin
pkgs/desktops/plasma-5/plasma-integration/D9070.patchdeleted−24
@@ -1,24 +0,0 @@
1−Index: src/platformtheme/kfontsettingsdata.cpp
2−===================================================================
3−--- src/platformtheme/kfontsettingsdata.cpp
4−+++ src/platformtheme/kfontsettingsdata.cpp
5−@@ -70,15 +70,18 @@
6− const KFontData &fontData = DefaultFontData[fontType];
7− cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight);
8− cachedFont->setStyleHint(fontData.StyleHint);
9−- cachedFont->setStyleName(QLatin1String(fontData.StyleName));
10−
11− const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey);
12− QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString());
13−
14− //If we have serialized information for this font, restore it
15− //NOTE: We are not using KConfig directly because we can't call QFont::QFont from here
16− if (!fontInfo.isEmpty()) {
17− cachedFont->fromString(fontInfo);
18−+ } else {
19−+ // set the canonical stylename here, where it cannot override
20−+ // user-specific font attributes if those do not include a stylename.
21−+ cachedFont->setStyleName(QLatin1String(fontData.StyleName));
22− }
23−
24− mFonts[fontType] = cachedFont;
pkgs/desktops/plasma-5/plasma-integration/default.nix−7
@@ -14,11 +14,4 @@ mkDerivation {
1414 breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
1515 libXcursor qtquickcontrols2
1616 ];
17− patches = [
18− # See also: https://phabricator.kde.org/D9070
19− # ttuegel: The patch is checked into Nixpkgs because I could not get
20− # Phabricator to give me a stable link to it.
21− ./D9070.patch
22− ];
23− patchFlags = "-p0";
2417}
pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch+5−9
@@ -1,17 +1,13 @@
11diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp
2−index f6ef54f..160034a 100644
2+index 58a6929..7212980 100644
33--- a/kded/engine/backends/cryfs/cryfsbackend.cpp
44+++ b/kded/engine/backends/cryfs/cryfsbackend.cpp
5−@@ -136,11 +136,10 @@ bool CryFsBackend::isInitialized(const Device &device) const
5+@@ -241,7 +241,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
6+ auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
7+ KConfigGroup backendConfig(config, "CryfsBackend");
68
7− QProcess *CryFsBackend::cryfs(const QStringList &arguments) const
8− {
99- return process("cryfs",
1010+ return process(NIXPKGS_CRYFS,
11− arguments,
11+ arguments + backendConfig.readEntry("extraMountOptions", QStringList{}),
1212 { { "CRYFS_FRONTEND", "noninteractive" } });
1313 }
14−
15−
16− } // namespace PlasmaVault
17−-
pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch+9−11
@@ -1,16 +1,17 @@
11diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp
2−index 47bb237..4ff064d 100644
2+index 628af7b..6edd38e 100644
33--- a/kded/engine/backends/encfs/encfsbackend.cpp
44+++ b/kded/engine/backends/encfs/encfsbackend.cpp
5−@@ -132,17 +132,16 @@ bool EncFsBackend::isInitialized(const Device &device) const
5+@@ -137,7 +137,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
6+ auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
7+ KConfigGroup backendConfig(config, "EncfsBackend");
68
7− QProcess *EncFsBackend::encfs(const QStringList &arguments) const
8− {
9−- return process("encfs", arguments, {});
10−+ return process(NIXPKGS_ENCFS, arguments, {});
9+- return process("encfs",
10++ return process(NIXPKGS_ENCFS,
11+ arguments + backendConfig.readEntry("extraMountOptions", QStringList{}),
12+ {});
1113 }
12−
13−
14+@@ -146,7 +146,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
1415
1516 QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
1617 {
@@ -19,6 +20,3 @@ index 47bb237..4ff064d 100644
1920 }
2021
2122
22−
23− } // namespace PlasmaVault
24−-
pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch+3−3
@@ -1,8 +1,8 @@
11diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
2−index 81ce494..d3c5c9f 100644
2+index d07e313..ea7d81c 100644
33--- a/kded/engine/fusebackend_p.cpp
44+++ b/kded/engine/fusebackend_p.cpp
5−@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable,
5+@@ -106,7 +106,7 @@ QProcess *FuseBackend::process(const QString &executable,
66
77 QProcess *FuseBackend::fusermount(const QStringList &arguments) const
88 {
@@ -11,7 +11,7 @@ index 81ce494..d3c5c9f 100644
1111 }
1212
1313
14−@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
14+@@ -279,4 +279,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const
1515 }
1616
1717 } // namespace PlasmaVault
pkgs/desktops/plasma-5/plasma-workspace/default.nix−4
@@ -68,10 +68,6 @@ mkDerivation {
6868 # ./plasma-workspace.patch.
6969 patches = [
7070 ./plasma-workspace.patch
71− (fetchpatch {
72− url = "https://github.com/KDE/plasma-workspace/commit/11e570d861858f3b3e2694e5f9ec242d7f9f12b9.patch";
73− sha256 = "1vk9yacb59k0v5mgbpgmciflca9r0ll4wh1d83ffx2y2v8sqwiv2";
74− })
7571 ];
7672
7773 preConfigure = ''
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch+17−17
@@ -36,7 +36,7 @@ index 493218ea..d507aa55 100644
3636+ return system( NIXPKGS_KDOSTARTUPCONFIG5 );
3737 }
3838diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
39−index f9e2e429..0a4267a9 100644
39+index 714a9bf1..9733c612 100644
4040--- a/startkde/startkde.cmake
4141+++ b/startkde/startkde.cmake
4242@@ -1,22 +1,31 @@
@@ -454,7 +454,7 @@ index f9e2e429..0a4267a9 100644
454454
455455 # finally, give the session control to the session manager
456456 # see kdebase/ksmserver for the description of the rest of the startup sequence
457−@@ -306,34 +352,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
457+@@ -306,12 +352,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
458458 # We only check for 255 which means that the ksmserver process could not be
459459 # started, any problems thereafter, e.g. ksmserver failing to initialize,
460460 # will remain undetected.
@@ -474,11 +474,9 @@ index f9e2e429..0a4267a9 100644
474474 if test $? -eq 255; then
475475 # Startup error
476476 echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
477− test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
478−- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
479− fi
480−
481− #Anything after here is logout/shutdown
477+@@ -322,36 +372,36 @@ fi
478+ #Anything after here is logout
479+ #It is not called after shutdown/restart
482480
483481-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
484482+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
@@ -498,12 +496,13 @@ index f9e2e429..0a4267a9 100644
498496 # ask remaining drkonqis to die in a graceful way
499497- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
500498- qdbus "$address" "/MainApplication" "quit"
499+- done
500+- break
501501+ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do
502502+ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit"
503− done
504− break
505503 fi
506−@@ -342,15 +391,17 @@ fi
504+ done
505+ fi
507506
508507 echo 'startkde: Shutting down...' 1>&2
509508 # just in case
@@ -526,7 +525,7 @@ index f9e2e429..0a4267a9 100644
526525
527526 echo 'startkde: Done.' 1>&2
528527diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
529−index f7330ab3..5eedbb11 100644
528+index de98541c..39c0b521 100644
530529--- a/startkde/startplasma.cmake
531530+++ b/startkde/startplasma.cmake
532531@@ -1,6 +1,6 @@
@@ -668,14 +667,15 @@ index f7330ab3..5eedbb11 100644
668667
669668 # finally, give the session control to the session manager
670669 # see kdebase/ksmserver for the description of the rest of the startup sequence
671−@@ -163,19 +109,19 @@ if test $? -eq 255; then
672− xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
673− fi
670+@@ -166,19 +112,19 @@ fi
671+ #Anything after here is logout
672+ #It is not called after shutdown/restart
674673
675674-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
676−+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
677−
675+-
678676-if test x"$wait_drkonqi"x = x"true"x ; then
677++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
678++
679679+if [ x"$wait_drkonqi"x = x"true"x ]; then
680680 # wait for remaining drkonqi instances with timeout (in seconds)
681681- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
@@ -695,7 +695,7 @@ index f7330ab3..5eedbb11 100644
695695 done
696696 break
697697 fi
698−@@ -184,15 +130,17 @@ fi
698+@@ -187,15 +133,17 @@ fi
699699
700700 echo 'startplasma: Shutting down...' 1>&2
701701 # just in case
pkgs/desktops/plasma-5/srcs.nix+180−180
@@ -3,363 +3,363 @@
33
44{
55 bluedevil = {
6− version = "5.13.5";
6+ version = "5.14.0";
77 src = fetchurl {
8− url = "${mirror}/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz";
9− sha256 = "0am708cb6jfccx1jfbriwc2jgwd4ajqllirc9i0bg4jz5ydxbjxg";
10− name = "bluedevil-5.13.5.tar.xz";
8+ url = "${mirror}/stable/plasma/5.14.0/bluedevil-5.14.0.tar.xz";
9+ sha256 = "0d1bw6cp2vwhs17j0bgc3gysy3g2syb1z0zwg28sa889l8a3qyv9";
10+ name = "bluedevil-5.14.0.tar.xz";
1111 };
1212 };
1313 breeze = {
14− version = "5.13.5";
14+ version = "5.14.0";
1515 src = fetchurl {
16− url = "${mirror}/stable/plasma/5.13.5/breeze-5.13.5.tar.xz";
17− sha256 = "09jkkfdmngvbp8i2y6irlv6yvrzpc86mw6apmqvphiaqsilyxaw0";
18− name = "breeze-5.13.5.tar.xz";
16+ url = "${mirror}/stable/plasma/5.14.0/breeze-5.14.0.tar.xz";
17+ sha256 = "0gd95a7km0pqc0qinn2p0kv72j0ihdl96vs14f5jr5n78a2r7r9a";
18+ name = "breeze-5.14.0.tar.xz";
1919 };
2020 };
2121 breeze-grub = {
22− version = "5.13.5";
22+ version = "5.14.0";
2323 src = fetchurl {
24− url = "${mirror}/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz";
25− sha256 = "03hsq77gi75chgyq9pzh3ry6k6bi78pfm33zn8gx784k9fx7gvqr";
26− name = "breeze-grub-5.13.5.tar.xz";
24+ url = "${mirror}/stable/plasma/5.14.0/breeze-grub-5.14.0.tar.xz";
25+ sha256 = "17kghx9qv7flm2019alqg1a6pnacgczj1hc9sc0bvj8znh9hhxvh";
26+ name = "breeze-grub-5.14.0.tar.xz";
2727 };
2828 };
2929 breeze-gtk = {
30− version = "5.13.5";
30+ version = "5.14.0";
3131 src = fetchurl {
32− url = "${mirror}/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz";
33− sha256 = "1knh0b27b81rnd87s31s2mawqcl1yzwjcakk5npzfm3nj23xakv3";
34− name = "breeze-gtk-5.13.5.tar.xz";
32+ url = "${mirror}/stable/plasma/5.14.0/breeze-gtk-5.14.0.tar.xz";
33+ sha256 = "1zlhyv26k3zqm2bbd9mk7123q5xy5g2cp6ayavhglgxxb8n0zyx9";
34+ name = "breeze-gtk-5.14.0.tar.xz";
3535 };
3636 };
3737 breeze-plymouth = {
38− version = "5.13.5";
38+ version = "5.14.0";
3939 src = fetchurl {
40− url = "${mirror}/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz";
41− sha256 = "0xsjl602wsb5ak1xg19w8y0fv9404cwbj1rcrm0hgjv735m32c57";
42− name = "breeze-plymouth-5.13.5.tar.xz";
40+ url = "${mirror}/stable/plasma/5.14.0/breeze-plymouth-5.14.0.tar.xz";
41+ sha256 = "1ilf3cp7cg3lpkxvd8n7h33wvsbbikrvd514gan2ns16j9d4ziz1";
42+ name = "breeze-plymouth-5.14.0.tar.xz";
4343 };
4444 };
4545 discover = {
46− version = "5.13.5";
46+ version = "5.14.0";
4747 src = fetchurl {
48− url = "${mirror}/stable/plasma/5.13.5/discover-5.13.5.tar.xz";
49− sha256 = "1q3nc5lih95vs5masd8z897hvfvpwidiisj8bg62iq0cblsgwz6d";
50− name = "discover-5.13.5.tar.xz";
48+ url = "${mirror}/stable/plasma/5.14.0/discover-5.14.0.tar.xz";
49+ sha256 = "1chkf5hjpnb4laq5sn7rr8f4fv90mg4brdsx71cz1b5xbvgyy1sf";
50+ name = "discover-5.14.0.tar.xz";
5151 };
5252 };
5353 drkonqi = {
54− version = "5.13.5";
54+ version = "5.14.0";
5555 src = fetchurl {
56− url = "${mirror}/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz";
57− sha256 = "02kbmymzzhsf9slaf64xlp8sfv59gl7qf1g2ahcq58sqry5bqjnk";
58− name = "drkonqi-5.13.5.tar.xz";
56+ url = "${mirror}/stable/plasma/5.14.0/drkonqi-5.14.0.tar.xz";
57+ sha256 = "0i5zgafkdxw6wqqfw81ygdmg5fffy2gkf6sciq7f8nfxxglw6pkp";
58+ name = "drkonqi-5.14.0.tar.xz";
5959 };
6060 };
6161 kactivitymanagerd = {
62− version = "5.13.5";
62+ version = "5.14.0";
6363 src = fetchurl {
64− url = "${mirror}/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz";
65− sha256 = "0zfvypxh748vsl270l8wn6inmp8shi2m051yy699qdqbyb039wjq";
66− name = "kactivitymanagerd-5.13.5.tar.xz";
64+ url = "${mirror}/stable/plasma/5.14.0/kactivitymanagerd-5.14.0.tar.xz";
65+ sha256 = "03jxvf4mgh0wmphykskc8ra49ghrjv5in4mgzpafswn7w8q8gyii";
66+ name = "kactivitymanagerd-5.14.0.tar.xz";
6767 };
6868 };
6969 kde-cli-tools = {
70− version = "5.13.5";
70+ version = "5.14.0";
7171 src = fetchurl {
72− url = "${mirror}/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz";
73− sha256 = "0p1az420p4ldinmxnkdwl69542ddm0r4f3wmdysfird7d68yw2hp";
74− name = "kde-cli-tools-5.13.5.tar.xz";
72+ url = "${mirror}/stable/plasma/5.14.0/kde-cli-tools-5.14.0.tar.xz";
73+ sha256 = "1n51vaiy073jzs051wlpll7652bb7vwg5qmravndhl8ibqrv7qaz";
74+ name = "kde-cli-tools-5.14.0.tar.xz";
7575 };
7676 };
7777 kdecoration = {
78− version = "5.13.5";
78+ version = "5.14.0";
7979 src = fetchurl {
80− url = "${mirror}/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz";
81− sha256 = "04p77fs5c9b4mbpcl4a2c1wc0i09g51b7c1v7n9fd4nfkm7z8sqs";
82− name = "kdecoration-5.13.5.tar.xz";
80+ url = "${mirror}/stable/plasma/5.14.0/kdecoration-5.14.0.tar.xz";
81+ sha256 = "01gkl0yqplm1l2qa4gfw7rzi5zfdxq7d3a25qicdwhas69hc8nzm";
82+ name = "kdecoration-5.14.0.tar.xz";
8383 };
8484 };
8585 kde-gtk-config = {
86− version = "5.13.5";
86+ version = "5.14.0";
8787 src = fetchurl {
88− url = "${mirror}/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz";
89− sha256 = "06j64y7p5kxnrc3407hma0drh3sb8jvjp3mx6na6b86z4xxf1kj6";
90− name = "kde-gtk-config-5.13.5.tar.xz";
88+ url = "${mirror}/stable/plasma/5.14.0/kde-gtk-config-5.14.0.tar.xz";
89+ sha256 = "0mb1am14hd3x5gkmy3vcg3wb9g29c8y38ywhr0f93riphws0nhvh";
90+ name = "kde-gtk-config-5.14.0.tar.xz";
9191 };
9292 };
9393 kdeplasma-addons = {
94− version = "5.13.5";
94+ version = "5.14.0";
9595 src = fetchurl {
96− url = "${mirror}/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz";
97− sha256 = "1a4f61bbwhc2y0lnrglbq3sas16bxff0ga3im9d15nq5a5q637i1";
98− name = "kdeplasma-addons-5.13.5.tar.xz";
96+ url = "${mirror}/stable/plasma/5.14.0/kdeplasma-addons-5.14.0.tar.xz";
97+ sha256 = "0k98ms851z2naw4rjmxldy6pl9a51mmwvq6c4znm2pnrw04jz15d";
98+ name = "kdeplasma-addons-5.14.0.tar.xz";
9999 };
100100 };
101101 kgamma5 = {
102− version = "5.13.5";
102+ version = "5.14.0";
103103 src = fetchurl {
104− url = "${mirror}/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz";
105− sha256 = "08brmdi5y69iwhj7506q2l0bfm92c9l9ds9w4d1ipcgnbydrhfyn";
106− name = "kgamma5-5.13.5.tar.xz";
104+ url = "${mirror}/stable/plasma/5.14.0/kgamma5-5.14.0.tar.xz";
105+ sha256 = "17vb1bb4glw6ccd1s1chjm07lvpkklcvny7rdjgmz2r00vk6mjqy";
106+ name = "kgamma5-5.14.0.tar.xz";
107107 };
108108 };
109109 khotkeys = {
110− version = "5.13.5";
110+ version = "5.14.0";
111111 src = fetchurl {
112− url = "${mirror}/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz";
113− sha256 = "16kp5ck6zfpnmnvspdnqklix54np3sxvj5ixs9saqf3gd5rk49mp";
114− name = "khotkeys-5.13.5.tar.xz";
112+ url = "${mirror}/stable/plasma/5.14.0/khotkeys-5.14.0.tar.xz";
113+ sha256 = "0b2q4s0j6wji8112l89347fc8ph9vrf2p8ngig0c4dn4ayk7hqd1";
114+ name = "khotkeys-5.14.0.tar.xz";
115115 };
116116 };
117117 kinfocenter = {
118− version = "5.13.5";
118+ version = "5.14.0";
119119 src = fetchurl {
120− url = "${mirror}/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz";
121− sha256 = "15r9j33z3l31gip9q3fw015s4mxakgy5wqfs04w5p0aq8x9xkpzl";
122− name = "kinfocenter-5.13.5.tar.xz";
120+ url = "${mirror}/stable/plasma/5.14.0/kinfocenter-5.14.0.tar.xz";
121+ sha256 = "0pc1jc7d26w2asa2yj8rr04rgjvmavlyhw3wd0dqv08rhr0rl7pj";
122+ name = "kinfocenter-5.14.0.tar.xz";
123123 };
124124 };
125125 kmenuedit = {
126− version = "5.13.5";
126+ version = "5.14.0";
127127 src = fetchurl {
128− url = "${mirror}/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz";
129− sha256 = "0zha39cd3p5nmrbkhkbcavxns2n2wnb6chc5kcsk5km9wn4laxz0";
130− name = "kmenuedit-5.13.5.tar.xz";
128+ url = "${mirror}/stable/plasma/5.14.0/kmenuedit-5.14.0.tar.xz";
129+ sha256 = "0ld9q5jq7zc6kz72pg9qqg10rbargkwyks657cnv8id1pna17bsr";
130+ name = "kmenuedit-5.14.0.tar.xz";
131131 };
132132 };
133133 kscreen = {
134− version = "5.13.5";
134+ version = "5.14.0";
135135 src = fetchurl {
136− url = "${mirror}/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz";
137− sha256 = "0kf1cf88n46b4js7x9r504605v68wp5hwpwid6phvfqdyqrvbb77";
138− name = "kscreen-5.13.5.tar.xz";
136+ url = "${mirror}/stable/plasma/5.14.0/kscreen-5.14.0.tar.xz";
137+ sha256 = "1y28a96kal2gziga2vr6vg5swv2ynfiv3804n06v9847rd7s3ixk";
138+ name = "kscreen-5.14.0.tar.xz";
139139 };
140140 };
141141 kscreenlocker = {
142− version = "5.13.5";
142+ version = "5.14.0";
143143 src = fetchurl {
144− url = "${mirror}/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz";
145− sha256 = "171zjk9r333kbkb9pashw0rdmiwq11nzfin4wnmqzwp7rrclxs18";
146− name = "kscreenlocker-5.13.5.tar.xz";
144+ url = "${mirror}/stable/plasma/5.14.0/kscreenlocker-5.14.0.tar.xz";
145+ sha256 = "1nyd8jy4ngpg51nq46cx038i4w1qak9zi4d4v69blkhzd65gckj1";
146+ name = "kscreenlocker-5.14.0.tar.xz";
147147 };
148148 };
149149 ksshaskpass = {
150− version = "5.13.5";
150+ version = "5.14.0";
151151 src = fetchurl {
152− url = "${mirror}/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz";
153− sha256 = "1znhj8x8kag1jrw0j1kfvqgprdayrcfbmawz2jap1ik2bjq7dp81";
154− name = "ksshaskpass-5.13.5.tar.xz";
152+ url = "${mirror}/stable/plasma/5.14.0/ksshaskpass-5.14.0.tar.xz";
153+ sha256 = "0nqvr3z7058hfymw8gglnfmcxx976km6sf0msyd3ykfpymxsmz74";
154+ name = "ksshaskpass-5.14.0.tar.xz";
155155 };
156156 };
157157 ksysguard = {
158− version = "5.13.5";
158+ version = "5.14.0";
159159 src = fetchurl {
160− url = "${mirror}/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz";
161− sha256 = "1qjqhqc23rbimz3qj8gr3dhp0griwgbiajhvjngh1jl55fb3q29j";
162− name = "ksysguard-5.13.5.tar.xz";
160+ url = "${mirror}/stable/plasma/5.14.0/ksysguard-5.14.0.tar.xz";
161+ sha256 = "0hbcx20r57lfh566q2974rs2kzlq5ghxadnd1ghiwz5141xh02bm";
162+ name = "ksysguard-5.14.0.tar.xz";
163163 };
164164 };
165165 kwallet-pam = {
166− version = "5.13.5";
166+ version = "5.14.0";
167167 src = fetchurl {
168− url = "${mirror}/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz";
169− sha256 = "145daahh8qjpbfcvjk2zyd6k3sr22npgnv3n23j9aim75qiwz1ac";
170− name = "kwallet-pam-5.13.5.tar.xz";
168+ url = "${mirror}/stable/plasma/5.14.0/kwallet-pam-5.14.0.tar.xz";
169+ sha256 = "0cw173wbf105p7028xik33lm38z82b1rlc7090l4khwsgmwgff97";
170+ name = "kwallet-pam-5.14.0.tar.xz";
171171 };
172172 };
173173 kwayland-integration = {
174− version = "5.13.5";
174+ version = "5.14.0";
175175 src = fetchurl {
176− url = "${mirror}/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz";
177− sha256 = "1qhkrs8md36z5gndkm88pyv6mspqsdsdavjz8klfwfv1hii6qyds";
178− name = "kwayland-integration-5.13.5.tar.xz";
176+ url = "${mirror}/stable/plasma/5.14.0/kwayland-integration-5.14.0.tar.xz";
177+ sha256 = "19xbqb7m6hxyg8s8jdbg1x9qcfia2ypm0z4k6zgva6mwqwhqcbw1";
178+ name = "kwayland-integration-5.14.0.tar.xz";
179179 };
180180 };
181181 kwin = {
182− version = "5.13.5";
182+ version = "5.14.0";
183183 src = fetchurl {
184− url = "${mirror}/stable/plasma/5.13.5/kwin-5.13.5.tar.xz";
185− sha256 = "0ld1pclni1axrh7jww3gxlfwkbjsfbqb9z7gygj2ff3nmc6khgfm";
186− name = "kwin-5.13.5.tar.xz";
184+ url = "${mirror}/stable/plasma/5.14.0/kwin-5.14.0.tar.xz";
185+ sha256 = "0rd6hkyg6n0w2jnj648sp7gs7n624igraz8ajyrglfzvxkxvqi8i";
186+ name = "kwin-5.14.0.tar.xz";
187187 };
188188 };
189189 kwrited = {
190− version = "5.13.5";
190+ version = "5.14.0";
191191 src = fetchurl {
192− url = "${mirror}/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz";
193− sha256 = "150nhjk4vcigs2r2bxqk309g81lxpnkkv8l44hiyivcbmwvc3aya";
194− name = "kwrited-5.13.5.tar.xz";
192+ url = "${mirror}/stable/plasma/5.14.0/kwrited-5.14.0.tar.xz";
193+ sha256 = "0s9lgi5a945xzpl1j5gdn65n8bywqlwfnrig56x90550achbvmlq";
194+ name = "kwrited-5.14.0.tar.xz";
195195 };
196196 };
197197 libkscreen = {
198− version = "5.13.5";
198+ version = "5.14.0";
199199 src = fetchurl {
200− url = "${mirror}/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz";
201− sha256 = "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k";
202− name = "libkscreen-5.13.5.tar.xz";
200+ url = "${mirror}/stable/plasma/5.14.0/libkscreen-5.14.0.tar.xz";
201+ sha256 = "1fsi9cb724kwr0cll60dl9qh67290r3gp8lcsmlyw30zk9mqwgdi";
202+ name = "libkscreen-5.14.0.tar.xz";
203203 };
204204 };
205205 libksysguard = {
206− version = "5.13.5";
206+ version = "5.14.0";
207207 src = fetchurl {
208− url = "${mirror}/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz";
209− sha256 = "0pccjjjzk8dxgmkj5vrq20nwb3qpf9isjd1zmg5nc127jld924x6";
210− name = "libksysguard-5.13.5.tar.xz";
208+ url = "${mirror}/stable/plasma/5.14.0/libksysguard-5.14.0.tar.xz";
209+ sha256 = "00s1dkiqykw2drlmvzs3hkdrkbk8n86s751kl4xlvcbslbijzcv0";
210+ name = "libksysguard-5.14.0.tar.xz";
211211 };
212212 };
213213 milou = {
214− version = "5.13.5";
214+ version = "5.14.0";
215215 src = fetchurl {
216− url = "${mirror}/stable/plasma/5.13.5/milou-5.13.5.tar.xz";
217− sha256 = "0rhgj10l2iik1mgnv2bixxqjyc3pl731bs1bqz9gsa3wiazspwrv";
218− name = "milou-5.13.5.tar.xz";
216+ url = "${mirror}/stable/plasma/5.14.0/milou-5.14.0.tar.xz";
217+ sha256 = "1k413zs70ggsamwxxidlfjdf8aqrcnzznar86z30q3ki1y14xf1l";
218+ name = "milou-5.14.0.tar.xz";
219219 };
220220 };
221221 oxygen = {
222− version = "5.13.5";
222+ version = "5.14.0";
223223 src = fetchurl {
224− url = "${mirror}/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz";
225− sha256 = "0wm2mngh0gb0lqvx8g82ml2sdv0kbkx14mpb8c6aw3hslcwma7yd";
226− name = "oxygen-5.13.5.tar.xz";
224+ url = "${mirror}/stable/plasma/5.14.0/oxygen-5.14.0.tar.xz";
225+ sha256 = "0kbafhzjkm61dpznx1w713jwyicj7qq76vk7zf6vz2g90b8c47na";
226+ name = "oxygen-5.14.0.tar.xz";
227227 };
228228 };
229229 plasma-browser-integration = {
230− version = "5.13.5";
230+ version = "5.14.0";
231231 src = fetchurl {
232− url = "${mirror}/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz";
233− sha256 = "0bhpbq4n29x8m0nmxlli5ljmgpw9da7sfbmf3j5c3wnxqja16sgy";
234− name = "plasma-browser-integration-5.13.5.tar.xz";
232+ url = "${mirror}/stable/plasma/5.14.0/plasma-browser-integration-5.14.0.tar.xz";
233+ sha256 = "1s8cxlfyp8crq2j4appffnhc3cgx9igmqhxyyk9pr4jbb4cwv42b";
234+ name = "plasma-browser-integration-5.14.0.tar.xz";
235235 };
236236 };
237237 plasma-desktop = {
238− version = "5.13.5";
238+ version = "5.14.0";
239239 src = fetchurl {
240− url = "${mirror}/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz";
241− sha256 = "14isrq3n9lm1nzmyv8zdgq6pwnv2zmg4dwxyp7fvqjxfls8851vp";
242− name = "plasma-desktop-5.13.5.tar.xz";
240+ url = "${mirror}/stable/plasma/5.14.0/plasma-desktop-5.14.0.tar.xz";
241+ sha256 = "0qrqd78bp9n73rr142wxiynxij2i8cw41ckgd46iw8an550v8s80";
242+ name = "plasma-desktop-5.14.0.tar.xz";
243243 };
244244 };
245245 plasma-integration = {
246− version = "5.13.5";
246+ version = "5.14.0";
247247 src = fetchurl {
248− url = "${mirror}/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz";
249− sha256 = "0j57ra79p5lkj81d05hhb87mrxgyj6qikkpzcb0p2dr2x8cmkng2";
250− name = "plasma-integration-5.13.5.tar.xz";
248+ url = "${mirror}/stable/plasma/5.14.0/plasma-integration-5.14.0.tar.xz";
249+ sha256 = "1dv43iwh6rp5ldn16jd6krkab6nmplav47j5qvngcp88src31k47";
250+ name = "plasma-integration-5.14.0.tar.xz";
251251 };
252252 };
253253 plasma-nm = {
254− version = "5.13.5";
254+ version = "5.14.0";
255255 src = fetchurl {
256− url = "${mirror}/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz";
257− sha256 = "1z8f5iybgra72vhpiayiwpysvv2z8x2r5xal8rhgf7y24xcjwxmi";
258− name = "plasma-nm-5.13.5.tar.xz";
256+ url = "${mirror}/stable/plasma/5.14.0/plasma-nm-5.14.0.tar.xz";
257+ sha256 = "1pr4dg90vw22jzsrbhzx3rycyj9by8r4239ypprw0i5d9795mian";
258+ name = "plasma-nm-5.14.0.tar.xz";
259259 };
260260 };
261261 plasma-pa = {
262− version = "5.13.5";
262+ version = "5.14.0";
263263 src = fetchurl {
264− url = "${mirror}/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz";
265− sha256 = "0p54x4zr3w009nn7g00qmxh7xil35x7b48d0l0flz5d7hvkk6nd8";
266− name = "plasma-pa-5.13.5.tar.xz";
264+ url = "${mirror}/stable/plasma/5.14.0/plasma-pa-5.14.0.tar.xz";
265+ sha256 = "1b95vyirgxfpjrccnl81bynlk3zdxz0bf7czsap0bnwhal0mcp2w";
266+ name = "plasma-pa-5.14.0.tar.xz";
267267 };
268268 };
269269 plasma-sdk = {
270− version = "5.13.5";
270+ version = "5.14.0";
271271 src = fetchurl {
272− url = "${mirror}/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz";
273− sha256 = "1x8hq343xzwlcsdvf0jy0qgn64xw8l11lawhknbjrf90qq58axga";
274− name = "plasma-sdk-5.13.5.tar.xz";
272+ url = "${mirror}/stable/plasma/5.14.0/plasma-sdk-5.14.0.tar.xz";
273+ sha256 = "0b5h7qvan0f5afdf4d19dmpalgbd9gyxgkq3r5h7axqdfdanz38f";
274+ name = "plasma-sdk-5.14.0.tar.xz";
275275 };
276276 };
277277 plasma-tests = {
278− version = "5.13.5";
278+ version = "5.14.0";
279279 src = fetchurl {
280− url = "${mirror}/stable/plasma/5.13.5/plasma-tests-5.13.5.tar.xz";
281− sha256 = "00nm0d0c4zccbwnhy8sc1qb4sf7bs5vfky3n7lihwyng3syqwz3d";
282− name = "plasma-tests-5.13.5.tar.xz";
280+ url = "${mirror}/stable/plasma/5.14.0/plasma-tests-5.14.0.tar.xz";
281+ sha256 = "01li04p44f1yajnjhvhhqd8mjwv8si5d02749p5dn0x80fkxgh9d";
282+ name = "plasma-tests-5.14.0.tar.xz";
283283 };
284284 };
285285 plasma-vault = {
286− version = "5.13.5";
286+ version = "5.14.0";
287287 src = fetchurl {
288− url = "${mirror}/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz";
289− sha256 = "1045zb58pmcyn0cznb81bmcpd4hkhxm6509rznrjykkhcfcrbf8z";
290− name = "plasma-vault-5.13.5.tar.xz";
288+ url = "${mirror}/stable/plasma/5.14.0/plasma-vault-5.14.0.tar.xz";
289+ sha256 = "1kclryjld7lanimr6n7r1b9y8wqgyjvcsky9cfq3ql1ssfc0ncm3";
290+ name = "plasma-vault-5.14.0.tar.xz";
291291 };
292292 };
293293 plasma-workspace = {
294− version = "5.13.5";
294+ version = "5.14.0";
295295 src = fetchurl {
296− url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz";
297− sha256 = "1qcmw60lyp966rhvw9raaqrvxdv09pr8zc7x3fx1vpm9kphh3lv3";
298− name = "plasma-workspace-5.13.5.tar.xz";
296+ url = "${mirror}/stable/plasma/5.14.0/plasma-workspace-5.14.0.tar.xz";
297+ sha256 = "1fgz06dnszrrq5kqa3zn22cj93adz8vwg9n9vdihgi6c77rqlxyf";
298+ name = "plasma-workspace-5.14.0.tar.xz";
299299 };
300300 };
301301 plasma-workspace-wallpapers = {
302− version = "5.13.5";
302+ version = "5.14.0";
303303 src = fetchurl {
304− url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz";
305− sha256 = "1wbnm6bzvgx2ssig4dk3plhrsjiw3lq1yhr2dfga6vvlyi6wg9mg";
306− name = "plasma-workspace-wallpapers-5.13.5.tar.xz";
304+ url = "${mirror}/stable/plasma/5.14.0/plasma-workspace-wallpapers-5.14.0.tar.xz";
305+ sha256 = "10j006wc1l2hjw9s9w7sxwimpahrnlpidnrrdgwjp0fswmnyqj5c";
306+ name = "plasma-workspace-wallpapers-5.14.0.tar.xz";
307307 };
308308 };
309309 plymouth-kcm = {
310− version = "5.13.5";
310+ version = "5.14.0";
311311 src = fetchurl {
312− url = "${mirror}/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz";
313− sha256 = "0flgr68rms40acgl2f4539mvp53m36ifignxix27raqmibaf38s1";
314− name = "plymouth-kcm-5.13.5.tar.xz";
312+ url = "${mirror}/stable/plasma/5.14.0/plymouth-kcm-5.14.0.tar.xz";
313+ sha256 = "0smjnh3adhsbp2ds8gvi5k3jq21i85zvaf9pvr0ih4nqpn4plalk";
314+ name = "plymouth-kcm-5.14.0.tar.xz";
315315 };
316316 };
317317 polkit-kde-agent = {
318− version = "1-5.13.5";
318+ version = "1-5.14.0";
319319 src = fetchurl {
320− url = "${mirror}/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz";
321− sha256 = "00f05ii3www8knn2ycgkc6izc8ydb3vjy4f657k38hkzl2sjnhl6";
322− name = "polkit-kde-agent-1-5.13.5.tar.xz";
320+ url = "${mirror}/stable/plasma/5.14.0/polkit-kde-agent-1-5.14.0.tar.xz";
321+ sha256 = "0bzz2qmxslmms7mrs4l8myg9byx0w7dz6xrmvi8v11wyk2lngsb0";
322+ name = "polkit-kde-agent-1-5.14.0.tar.xz";
323323 };
324324 };
325325 powerdevil = {
326− version = "5.13.5";
326+ version = "5.14.0";
327327 src = fetchurl {
328− url = "${mirror}/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz";
329− sha256 = "1k7ilcvm5nvx6sd43j0djar9ay6ag84g4m8f420yf7q4yryp76yn";
330− name = "powerdevil-5.13.5.tar.xz";
328+ url = "${mirror}/stable/plasma/5.14.0/powerdevil-5.14.0.tar.xz";
329+ sha256 = "057hj7c3pq5a064ydx2r6kkf0q8lj7rl0jfrzcpr72s0yri3wcjr";
330+ name = "powerdevil-5.14.0.tar.xz";
331331 };
332332 };
333333 sddm-kcm = {
334− version = "5.13.5";
334+ version = "5.14.0";
335335 src = fetchurl {
336− url = "${mirror}/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz";
337− sha256 = "122g83ajh0xqylvmicrhgw0fm8bmzpw26v7fjckfk9if5zqzk8ch";
338− name = "sddm-kcm-5.13.5.tar.xz";
336+ url = "${mirror}/stable/plasma/5.14.0/sddm-kcm-5.14.0.tar.xz";
337+ sha256 = "0dz6iz0qf4ycfic1ad99cqxj05pa4m92m5l74as8pkqviv8mm33d";
338+ name = "sddm-kcm-5.14.0.tar.xz";
339339 };
340340 };
341341 systemsettings = {
342− version = "5.13.5";
342+ version = "5.14.0";
343343 src = fetchurl {
344− url = "${mirror}/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz";
345− sha256 = "14029a3mf2d6cw87lyffnwy88yvj0n3jmi0glr69zwi8lmz0cbsv";
346− name = "systemsettings-5.13.5.tar.xz";
344+ url = "${mirror}/stable/plasma/5.14.0/systemsettings-5.14.0.tar.xz";
345+ sha256 = "0gywcc1zcqp7613gd7m9811plmmk8hr9frd2v0ari69ppm1ndmpj";
346+ name = "systemsettings-5.14.0.tar.xz";
347347 };
348348 };
349349 user-manager = {
350− version = "5.13.5";
350+ version = "5.14.0";
351351 src = fetchurl {
352− url = "${mirror}/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz";
353− sha256 = "12550xvl084rab0y331r8dm3qwpcvm83k3j02gxrwrigv1vckas8";
354− name = "user-manager-5.13.5.tar.xz";
352+ url = "${mirror}/stable/plasma/5.14.0/user-manager-5.14.0.tar.xz";
353+ sha256 = "17qdpdq1j53h49i71ri8f91fby9m47ngpd7gn6qp7gzsfcyqky3j";
354+ name = "user-manager-5.14.0.tar.xz";
355355 };
356356 };
357357 xdg-desktop-portal-kde = {
358− version = "5.13.5";
358+ version = "5.14.0";
359359 src = fetchurl {
360− url = "${mirror}/stable/plasma/5.13.5/xdg-desktop-portal-kde-5.13.5.tar.xz";
361− sha256 = "0i9pcbdxfh2cbv9ybk9i11l7vcm2ifx0zm3gkj3ry3bjxxbphn4f";
362− name = "xdg-desktop-portal-kde-5.13.5.tar.xz";
360+ url = "${mirror}/stable/plasma/5.14.0/xdg-desktop-portal-kde-5.14.0.tar.xz";
361+ sha256 = "0xziyrrccv0jjjf8h8p5w2wx0qz745ilib1i2l50amy6dwy0k0s9";
362+ name = "xdg-desktop-portal-kde-5.14.0.tar.xz";
363363 };
364364 };
365365}
pkgs/development/coq-modules/QuickChick/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 inherit (param) rev sha256;
3434 };
3535
36− buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
36+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
3737 propagatedBuildInputs = [ coq ssreflect ];
3838
3939 enableParallelBuilding = false;
pkgs/development/coq-modules/bignums/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 inherit (param) rev sha256;
2929 };
3030
31− buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
31+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
3232
3333 installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
3434
pkgs/development/coq-modules/category-theory/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 inherit (param) rev sha256;
2727 };
2828
29− buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
29+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
3030 propagatedBuildInputs = [ coq ssreflect ];
3131
3232 enableParallelBuilding = false;
pkgs/development/coq-modules/contribs/default.nix+1−1
@@ -12,7 +12,7 @@ let mkContrib = repo: revs: param:
1212 sha256 = "${param.sha256}";
1313 };
1414
15− buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
15+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
1616
1717 installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
1818
pkgs/development/coq-modules/coq-ext-lib/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 inherit (param) sha256;
2323 };
2424
25− buildInputs = [ coq.ocaml coq.camlp5 ];
25+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 ];
2626 propagatedBuildInputs = [ coq ];
2727
2828 enableParallelBuilding = true;
pkgs/development/coq-modules/coq-haskell/default.nix+1−1
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 inherit (param) rev sha256;
3939 };
4040
41− buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
41+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
4242 propagatedBuildInputs = [ coq ssreflect ];
4343
4444 enableParallelBuilding = false;
pkgs/development/coq-modules/dpdgraph/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, coq }:
22
33let params = {
44 "8.8" = {
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
3434 };
3535
3636 nativeBuildInputs = [ autoreconfHook ];
37− buildInputs = [ coq coq.camlp5 ]
38− ++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]);
37+ buildInputs = [ coq ]
38+ ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ocamlgraph ]);
3939
4040 preInstall = ''
4141 mkdir -p $out/bin
pkgs/development/coq-modules/equations/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 sha256 = "${param.sha256}";
3636 };
3737
38− buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
38+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
3939
4040 preBuild = "coq_makefile -f _CoqProject -o Makefile";
4141
pkgs/development/coq-modules/fiat/HEAD.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
1212 };
1313
14− buildInputs = [ coq.ocaml coq.camlp5 python27 ];
14+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 python27 ];
1515 propagatedBuildInputs = [ coq ];
1616
1717 doCheck = false;
pkgs/development/coq-modules/flocq/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3";
1111 };
1212
13− buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ];
13+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 bash which autoconf automake ];
1414 propagatedBuildInputs = [ coq ];
1515
1616 buildPhase = ''
pkgs/development/coq-modules/heq/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p";
1111 };
1212
13− buildInputs = [ coq.ocaml coq.camlp5 unzip ];
13+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
1414 propagatedBuildInputs = [ coq ];
1515
1616 preBuild = "cd src";
pkgs/development/coq-modules/mathcomp/generic.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 inherit src;
1010
1111 nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
12− buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
12+ buildInputs = with coq.ocamlPackages; [ ocaml findlib camlp5 ncurses which ];
1313 propagatedBuildInputs = [ coq ];
1414
1515 enableParallelBuilding = true;
pkgs/development/coq-modules/metalib/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 license = stdenv.lib.licenses.mit;
3030 };
3131
32− buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott coq.findlib ];
32+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 which coq lngen ott findlib ];
3333 propagatedBuildInputs = [ coq ];
3434
3535 enableParallelBuilding = true;
pkgs/development/coq-modules/paco/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy";
1111 };
1212
13− buildInputs = [ coq.ocaml coq.camlp5 unzip ];
13+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
1414 propagatedBuildInputs = [ coq ];
1515
1616 preBuild = "cd src";
pkgs/development/coq-modules/ssreflect/generic.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 inherit src;
1010
1111 nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
12− buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
12+ buildInputs = with coq.ocamlPackages; [ ocaml findlib camlp5 ncurses which ];
1313 propagatedBuildInputs = [ coq ];
1414
1515 enableParallelBuilding = true;
pkgs/development/haskell-modules/configuration-common.nix+8−11
@@ -923,9 +923,9 @@ self: super: {
923923 text-icu = dontCheck super.text-icu;
924924
925925 # https://github.com/haskell/cabal/issues/4969
926− haddock-api = (super.haddock-api.overrideScope (self: super: {
927− haddock-library = self.haddock-library_1_6_0;
928− })).override { hspec = self.hspec_2_4_8; };
926+ # haddock-api = (super.haddock-api.overrideScope (self: super: {
927+ # haddock-library = self.haddock-library_1_6_0;
928+ # })).override { hspec = self.hspec_2_4_8; };
929929
930930 # Jailbreak "unix-compat >=0.1.2 && <0.5".
931931 # Jailbreak "graphviz >=2999.18.1 && <2999.20".
@@ -1060,7 +1060,7 @@ self: super: {
10601060
10611061 # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
10621062 haddock-library = doJailbreak (dontCheck super.haddock-library);
1063− haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
1063+ # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
10641064
10651065 # The tool needs a newer hpack version than the one mandated by LTS-12.x.
10661066 cabal2nix = super.cabal2nix.overrideScope (self: super: {
@@ -1072,9 +1072,6 @@ self: super: {
10721072 yaml = self.yaml_0_11_0_0;
10731073 });
10741074
1075− # Break out of "aeson <1.3, temporary <1.3".
1076− stack = doJailbreak super.stack;
1077−
10781075 # https://github.com/pikajude/stylish-cabal/issues/11
10791076 stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
10801077 hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; };
@@ -1108,9 +1105,6 @@ self: super: {
11081105 # Can be removed once yi-language >= 0.18 is in the LTS
11091106 yi-core = super.yi-core.overrideScope (self: super: { yi-language = self.yi-language_0_18_0; });
11101107
1111− # https://github.com/MarcWeber/hasktags/issues/52
1112− hasktags = dontCheck super.hasktags;
1113−
11141108 # https://github.com/haskell/hoopl/issues/50
11151109 hoopl = dontCheck super.hoopl;
11161110
@@ -1154,6 +1148,9 @@ self: super: {
11541148 arbtt = doJailbreak super.arbtt;
11551149
11561150 # https://github.com/yesodweb/yesod/issues/1563
1157− yesod-core = dontCheck super.yesod-core;
1151+ yesod-core = self.yesod-core_1_6_8_1;
1152+
1153+ # https://github.com/danfran/cabal-macosx/issues/13
1154+ cabal-macosx = dontCheck super.cabal-macosx;
11581155
11591156} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix+3
@@ -85,4 +85,7 @@ self: super: {
8585 # GHC 8.0 doesn't have semigroups included by default
8686 ListLike = addBuildDepend super.ListLike self.semigroups;
8787
88+ # Add missing build depedency for this compiler.
89+ base-compat-batteries = addBuildDepend super.base-compat-batteries self.bifunctors;
90+
8891}
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix+4
@@ -56,4 +56,8 @@ self: super: {
5656 };
5757 in appendPatch super.hadoop-rpc patch;
5858
59+ # Version 1.9.1 needs Cabal 2.4.x or later, so
60+ # we use the one from the ghc-8.6.1 package set.
61+ stack = markBroken super.stack;
62+
5963}
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+68−24
@@ -46,44 +46,88 @@ self: super: {
4646
4747 # LTS-12.x versions do not compile.
4848 base-orphans = self.base-orphans_0_8;
49+ brick = doJailbreak super.brick_0_41_2; # https://github.com/jtdaugherty/brick/pull/188
50+ cassava-megaparsec = doJailbreak super.cassava-megaparsec;
51+ config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
4952 contravariant = self.contravariant_1_5;
50− control-monad-free = markBrokenVersion "0.6.1" super.control-monad-free;
5153 free = self.free_5_1;
52− Glob = self.Glob_0_9_3;
53− haddock-library = markBroken super.haddock-library;
54− hslogger = self.hslogger_1_2_12;
54+ haddock-library = dontCheck super.haddock-library_1_7_0;
55+ HaTeX = doJailbreak super.HaTeX;
56+ hledger = doJailbreak super.hledger;
57+ hledger-lib = doJailbreak super.hledger-lib;
58+ hledger-ui = doJailbreak super.hledger-ui;
59+ hpack = self.hpack_0_31_0;
60+ hslua = self.hslua_1_0_1;
61+ hslua-module-text = self.hslua-module-text_0_2_0;
5562 hspec = self.hspec_2_5_8;
5663 hspec-core = self.hspec-core_2_5_8;
57− hspec-core_2_5_8 = super.hspec-core_2_5_8.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; });
5864 hspec-discover = self.hspec-discover_2_5_8;
65+ hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
5966 hspec-meta = self.hspec-meta_2_5_6;
60− hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; });
61− JuicyPixels = self.JuicyPixels_3_3_1;
67+ JuicyPixels = self.JuicyPixels_3_3_2;
6268 lens = self.lens_4_17;
63− polyparse = markBrokenVersion "1.12" super.polyparse;
69+ megaparsec = dontCheck (doJailbreak super.megaparsec);
70+ neat-interpolation = dontCheck super.neat-interpolation; # test suite depends on broken HTF
71+ patience = markBrokenVersion "0.1.1" super.patience;
6472 primitive = self.primitive_0_6_4_0;
73+ QuickCheck = self.QuickCheck_2_12_6_1;
6574 semigroupoids = self.semigroupoids_5_3_1;
6675 tagged = self.tagged_0_8_6;
67− unordered-containers = dontCheck super.unordered-containers;
76+ vty = self.vty_5_25;
77+ wizards = doJailbreak super.wizards;
78+ wl-pprint-extras = doJailbreak super.wl-pprint-extras;
79+ yaml = self.yaml_0_11_0_0;
6880
69− # Over-specified constraints.
70− async = doJailbreak super.async; # base >=4.3 && <4.12, stm >=2.2 && <2.5
71− ChasingBottoms = doJailbreak super.ChasingBottoms; # base >=4.2 && <4.12, containers >=0.3 && <0.6
72− hashable = doJailbreak super.hashable; # base >=4.4 && <4.1
73− hashable-time = doJailbreak super.hashable-time; # base >=4.7 && <4.12
74− integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
75− optparse-applicative = doJailbreak super.optparse-applicative; # https://github.com/pcapriotti/optparse-applicative/issues/319
76− tar = doJailbreak super.tar; # containers >=0.2 && <0.6
77− test-framework = doJailbreak super.test-framework; # containers >=0.1 && <0.6
81+ # https://github.com/tibbe/unordered-containers/issues/214
82+ unordered-containers = dontCheck super.unordered-containers;
7883
7984 # https://github.com/haskell/fgl/issues/79
8085 # https://github.com/haskell/fgl/issues/81
81− fgl = appendPatch super.fgl ./patches/fgl-monad-fail.patch;
86+ fgl = appendPatch (overrideCabal super.fgl (drv: { editedCabalFile = null; })) ./patches/fgl-monad-fail.patch;
87+
88+ # Test suite does not compile.
89+ cereal = dontCheck super.cereal;
90+ data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
91+ Diff = dontCheck super.Diff;
92+ http-api-data = doJailbreak super.http-api-data;
93+ lucid = doJailbreak super.lucid;
94+ persistent-sqlite = dontCheck super.persistent-sqlite;
95+ psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
96+ system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
97+ unicode-transforms = dontCheck super.unicode-transforms;
98+ monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66
99+
100+ # https://github.com/bmillwood/haskell-src-meta/pull/80
101+ haskell-src-meta = doJailbreak super.haskell-src-meta;
102+
103+ # The official 1.12 release is broken and unmaintained.
104+ polyparse = appendPatch (overrideCabal super.polyparse (drv: { editedCabalFile = null; })) (pkgs.fetchpatch {
105+ url = https://github.com/bergmark/polyparse/commit/8a69ee7e57db798c106d8b56dce05b1dfc4fed37.patch;
106+ sha256 = "11r73wx1w6bfrkrnk6r9k7rfzp6qrvkdikb2by37ld06c0w6nn57";
107+ });
108+
109+ # https://github.com/skogsbaer/HTF/issues/69
110+ HTF = markBrokenVersion "0.13.2.4" super.HTF;
111+
112+ # https://github.com/jgm/pandoc-types/issues/52
113+ pandoc-types = doJailbreak super.pandoc-types;
114+
115+ #
116+ skylighting-core = dontCheck super.skylighting-core;
117+
118+ # https://github.com/joelburget/easytest/issues/12
119+ easytest = appendPatch super.easytest (pkgs.fetchpatch {
120+ url = https://github.com/joelburget/easytest/pull/13.patch;
121+ sha256 = "0gnsgga8x2yxyg27pya6rhmxfsxf167vsi4xdj98fn8v0j7zz1v1";
122+ });
123+
124+ # https://github.com/jgm/pandoc/issues/4974
125+ pandoc = doJailbreak super.pandoc_2_3_1;
126+
127+ # Break out of "yaml >=0.10.4.0 && <0.11".
128+ stack = doJailbreak super.stack;
82129
83− # https://github.com/jgm/texmath/pull/121
84− texmath = appendPatch (doJailbreak super.texmath) (pkgs.fetchpatch
85− { url = https://github.com/jgm/texmath/pull/121.patch;
86− sha256 = "14pz2cpz9rvmy7mlmnz8iz76rsdyv5v442ij2i8k9zrbxj6nai7l";
87− });
130+ # https://github.com/vimus/libmpd-haskell/issues/109
131+ xmobar = disableCabalFlag (super.xmobar.override { libmpd = null; }) "with_mpd";
88132
89133}
pkgs/development/haskell-modules/configuration-nix.nix+4
@@ -543,4 +543,8 @@ self: super: builtins.intersectAttrs super {
543543 --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
544544 '';
545545 });
546+
547+ # The test suite has undeclared dependencies on git.
548+ githash = dontCheck super.githash;
549+
546550}
pkgs/development/haskell-modules/generic-builder.nix+1−1
@@ -194,7 +194,7 @@ let
194194 optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);
195195
196196
197− allBuildInputs = propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild;
197+ allBuildInputs = propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs;
198198 isHaskellPartition =
199199 stdenv.lib.partition isHaskellPkg allBuildInputs;
200200
pkgs/development/haskell-modules/hackage-packages.nix+869−256
@@ -15854,8 +15854,8 @@ self: {
1585415854 }:
1585515855 mkDerivation {
1585615856 pname = "SCRIPTWriter";
15857− version = "1.0";
15858− sha256 = "0333p5r2ms9yhkxgbhdrmhylszqq6xpr4hdvjgn62xwd6a4a1i3l";
15857+ version = "1.0.1";
15858+ sha256 = "0sipk7brfw42zq4ksp7gz23ghia9faffshc5zh8j0zb4f1497mwi";
1585915859 isLibrary = true;
1586015860 isExecutable = true;
1586115861 libraryHaskellDepends = [
@@ -22185,7 +22185,7 @@ self: {
2218522185
2218622186 "aeson-schema" = callPackage
2218722187 ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
22188− , directory, filepath, ghc-prim, hashable, hint, HUnit, mtl
22188+ , directory, fail, filepath, ghc-prim, hashable, hint, HUnit, mtl
2218922189 , QuickCheck, regex-base, regex-compat, regex-pcre, scientific, syb
2219022190 , template-haskell, temporary, test-framework, test-framework-hunit
2219122191 , test-framework-quickcheck2, text, th-lift, transformers
@@ -22193,15 +22193,14 @@ self: {
2219322193 }:
2219422194 mkDerivation {
2219522195 pname = "aeson-schema";
22196− version = "0.4.1.1";
22197− sha256 = "1idw9bb1miw61vvyacrlnx98rl4p0wx750gnhc4blx4a07i5vs9h";
22198− revision = "1";
22199− editedCabalFile = "1rl9hm85r607iwigzg5y1rki8vl7943ws4j1zsz0hq8g3mcb5alf";
22196+ version = "0.4.1.2";
22197+ sha256 = "1afw0kf39myh4yqkkz8z1a7ji02j2iy7j66ch06pglvp5hzyi9dk";
2220022198 enableSeparateDataOutput = true;
2220122199 libraryHaskellDepends = [
22202− aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
22203− regex-base regex-compat regex-pcre scientific syb template-haskell
22204− text th-lift transformers unordered-containers vector
22200+ aeson attoparsec base bytestring containers fail ghc-prim mtl
22201+ QuickCheck regex-base regex-compat regex-pcre scientific syb
22202+ template-haskell text th-lift transformers unordered-containers
22203+ vector
2220522204 ];
2220622205 testHaskellDepends = [
2220722206 aeson attoparsec base bytestring containers directory filepath
@@ -23148,6 +23147,18 @@ self: {
2314823147 license = stdenv.lib.licenses.bsd3;
2314923148 }) {};
2315023149
23150+ "alg_0_2_8_0" = callPackage
23151+ ({ mkDerivation, base, util }:
23152+ mkDerivation {
23153+ pname = "alg";
23154+ version = "0.2.8.0";
23155+ sha256 = "1zw50da4wz8qdc62qlvg74k3g5n48xlzda2k7c3y9zb8xb2xbfrr";
23156+ libraryHaskellDepends = [ base util ];
23157+ description = "Algebraic structures";
23158+ license = stdenv.lib.licenses.bsd3;
23159+ hydraPlatforms = stdenv.lib.platforms.none;
23160+ }) {};
23161+
2315123162 "alga" = callPackage
2315223163 ({ mkDerivation, aeson, base, containers, data-default, exceptions
2315323164 , file-embed, filepath, formatting, haskeline, hspec, hxt
@@ -27456,6 +27467,17 @@ self: {
2745627467 license = stdenv.lib.licenses.bsd3;
2745727468 }) {};
2745827469
27470+ "apecs-physics-gloss" = callPackage
27471+ ({ mkDerivation, apecs, apecs-physics, base, gloss }:
27472+ mkDerivation {
27473+ pname = "apecs-physics-gloss";
27474+ version = "0.1.0.0";
27475+ sha256 = "075rpm4l1na7j79vkh7n5c806zj7vvj2qxrxq6pkb6k6364ff249";
27476+ libraryHaskellDepends = [ apecs apecs-physics base gloss ];
27477+ description = "Gloss rendering for apecs-physics";
27478+ license = stdenv.lib.licenses.bsd3;
27479+ }) {};
27480+
2745927481 "apelsin" = callPackage
2746027482 ({ mkDerivation, array, base, bytestring, containers, deepseq
2746127483 , directory, filepath, glib, gtk, HTTP, mtl, network, process
@@ -28291,6 +28313,29 @@ self: {
2829128313 hydraPlatforms = stdenv.lib.platforms.none;
2829228314 }) {arbb_dev = null;};
2829328315
28316+ "arbor-datadog" = callPackage
28317+ ({ mkDerivation, aeson, auto-update, base, buffer-builder
28318+ , bytestring, Cabal, dlist, generic-lens, hspec, lens, mtl, network
28319+ , random, resourcet, text, time, transformers, unordered-containers
28320+ , vector
28321+ }:
28322+ mkDerivation {
28323+ pname = "arbor-datadog";
28324+ version = "0.0.0.1";
28325+ sha256 = "0lc3c2jnn2kmfyg7xgsnkgzkfir1ycn6qyq1z44501g360wrq0cv";
28326+ libraryHaskellDepends = [
28327+ aeson auto-update base buffer-builder bytestring dlist generic-lens
28328+ lens mtl network random resourcet text time transformers
28329+ unordered-containers vector
28330+ ];
28331+ testHaskellDepends = [
28332+ base Cabal generic-lens hspec lens network resourcet time
28333+ transformers
28334+ ];
28335+ description = "Datadog client for Haskell";
28336+ license = stdenv.lib.licenses.mit;
28337+ }) {};
28338+
2829428339 "arbor-lru-cache" = callPackage
2829528340 ({ mkDerivation, base, containers, generic-lens, hedgehog, hspec
2829628341 , hw-hspec-hedgehog, lens, stm
@@ -28307,6 +28352,24 @@ self: {
2830728352 license = stdenv.lib.licenses.mit;
2830828353 }) {};
2830928354
28355+ "arbor-monad-counter" = callPackage
28356+ ({ mkDerivation, base, containers, generic-lens, hedgehog, hspec
28357+ , hw-hspec-hedgehog, lens, mtl, resourcet, stm, transformers
28358+ }:
28359+ mkDerivation {
28360+ pname = "arbor-monad-counter";
28361+ version = "2.0.0";
28362+ sha256 = "1pzgqxrsfaq9l6400ykv8gz34z90r0lwq93pzadsq5qpkhk55053";
28363+ libraryHaskellDepends = [
28364+ base containers generic-lens lens mtl resourcet stm transformers
28365+ ];
28366+ testHaskellDepends = [
28367+ base containers generic-lens hedgehog hspec hw-hspec-hedgehog lens
28368+ mtl resourcet stm transformers
28369+ ];
28370+ license = stdenv.lib.licenses.mit;
28371+ }) {};
28372+
2831028373 "arbor-postgres" = callPackage
2831128374 ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri
2831228375 , optparse-applicative, postgresql-simple, text
@@ -29302,33 +29365,33 @@ self: {
2930229365 ({ mkDerivation, attoparsec, base, binary, bytestring, conduit
2930329366 , conduit-combinators, conduit-extra, containers, cpu, directory
2930429367 , either, exceptions, generic-lens, hedgehog, hspec, hw-bits
29305− , hw-hspec-hedgehog, hw-ip, iproute, lens, old-locale
29368+ , hw-hspec-hedgehog, hw-ip, iproute, lens, network, old-locale
2930629369 , optparse-applicative, resourcet, temporary-resourcet, text, thyme
2930729370 , vector
2930829371 }:
2930929372 mkDerivation {
2931029373 pname = "asif";
29311− version = "3.0.0";
29312− sha256 = "01ic071i7cgc888xqdjjq3srihnjxcqx33f9m97ilsp7dxi7a03q";
29374+ version = "3.1.0";
29375+ sha256 = "0z9i40xz7hnhqnxv79saj9wsigi25bxkn0v4p5fhvfqj3r06ms2l";
2931329376 isLibrary = true;
2931429377 isExecutable = true;
2931529378 libraryHaskellDepends = [
2931629379 attoparsec base binary bytestring conduit conduit-combinators
2931729380 conduit-extra containers cpu either exceptions generic-lens hw-bits
29318− hw-ip iproute lens old-locale resourcet temporary-resourcet text
29319− thyme vector
29381+ hw-ip iproute lens network old-locale resourcet temporary-resourcet
29382+ text thyme vector
2932029383 ];
2932129384 executableHaskellDepends = [
2932229385 attoparsec base binary bytestring conduit conduit-combinators
2932329386 conduit-extra containers cpu directory either exceptions
29324− generic-lens hw-bits hw-ip iproute lens old-locale
29387+ generic-lens hw-bits hw-ip iproute lens network old-locale
2932529388 optparse-applicative resourcet temporary-resourcet text thyme
2932629389 vector
2932729390 ];
2932829391 testHaskellDepends = [
2932929392 attoparsec base binary bytestring conduit conduit-combinators
2933029393 conduit-extra containers cpu either exceptions generic-lens
29331− hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens
29394+ hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens network
2933229395 old-locale resourcet temporary-resourcet text thyme vector
2933329396 ];
2933429397 license = stdenv.lib.licenses.mit;
@@ -30329,8 +30392,8 @@ self: {
3032930392 }:
3033030393 mkDerivation {
3033130394 pname = "ats-pkg";
30332− version = "3.2.2.0";
30333− sha256 = "10xwgc7y324fgisqjkx2jk5bq226fj3ayl373m6m1nbnx2qax22w";
30395+ version = "3.2.2.3";
30396+ sha256 = "111lwv4461ij5z8z9n0kyvqcrjk0x5yjajfc3wyc3lklgc6ccjva";
3033430397 isLibrary = true;
3033530398 isExecutable = true;
3033630399 enableSeparateDataOutput = true;
@@ -30608,14 +30671,14 @@ self: {
3060830671 hydraPlatforms = stdenv.lib.platforms.none;
3060930672 }) {};
3061030673
30611− "attoparsec-ip_0_0_3" = callPackage
30674+ "attoparsec-ip_0_0_4" = callPackage
3061230675 ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty
3061330676 , tasty-quickcheck, text, vector
3061430677 }:
3061530678 mkDerivation {
3061630679 pname = "attoparsec-ip";
30617− version = "0.0.3";
30618− sha256 = "02d66mm1rc00dswkl9ink4pxwy8h7lyi2k9zcqda6ywa7cllhgl0";
30680+ version = "0.0.4";
30681+ sha256 = "1q3nrr8ps5wsqq2bahx9wy7924ccq110wwlwkiycsz32pflcamr7";
3061930682 libraryHaskellDepends = [ attoparsec base ip vector ];
3062030683 testHaskellDepends = [
3062130684 attoparsec base ip QuickCheck tasty tasty-quickcheck text vector
@@ -31456,6 +31519,33 @@ self: {
3145631519 license = stdenv.lib.licenses.bsd3;
3145731520 }) {};
3145831521
31522+ "avro_0_3_6_1" = callPackage
31523+ ({ mkDerivation, aeson, array, base, base16-bytestring, binary
31524+ , bytestring, containers, data-binary-ieee754, directory, entropy
31525+ , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
31526+ , QuickCheck, scientific, semigroups, tagged, template-haskell
31527+ , text, transformers, unordered-containers, vector
31528+ }:
31529+ mkDerivation {
31530+ pname = "avro";
31531+ version = "0.3.6.1";
31532+ sha256 = "0b1pj47nfpbqvcp5vzraa1przq1c9ll8n76qbyg05fjfvamycbq3";
31533+ libraryHaskellDepends = [
31534+ aeson array base base16-bytestring binary bytestring containers
31535+ data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
31536+ semigroups tagged template-haskell text unordered-containers vector
31537+ ];
31538+ testHaskellDepends = [
31539+ aeson array base base16-bytestring binary bytestring containers
31540+ directory entropy extra fail hashable hspec lens lens-aeson mtl
31541+ pure-zlib QuickCheck scientific semigroups tagged template-haskell
31542+ text transformers unordered-containers vector
31543+ ];
31544+ description = "Avro serialization support for Haskell";
31545+ license = stdenv.lib.licenses.bsd3;
31546+ hydraPlatforms = stdenv.lib.platforms.none;
31547+ }) {};
31548+
3145931549 "avwx" = callPackage
3146031550 ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
3146131551 , parsers, pretty-show, text
@@ -32375,8 +32465,8 @@ self: {
3237532465 }:
3237632466 mkDerivation {
3237732467 pname = "b9";
32378− version = "0.5.49";
32379− sha256 = "0n9vci1wc2ws4nyzmmqi2npwkd3zz28znyqj4905y1hc126x0yi3";
32468+ version = "0.5.50";
32469+ sha256 = "1wsspzkcydad9akqj6n8s9xpm7id49dll5h12vv3xbmgjgj0pdhr";
3238032470 isLibrary = true;
3238132471 isExecutable = true;
3238232472 libraryHaskellDepends = [
@@ -32949,6 +33039,18 @@ self: {
3294933039 license = stdenv.lib.licenses.mit;
3295033040 }) {};
3295133041
33042+ "base-compat_0_10_5" = callPackage
33043+ ({ mkDerivation, base, unix }:
33044+ mkDerivation {
33045+ pname = "base-compat";
33046+ version = "0.10.5";
33047+ sha256 = "0hgvlqcr852hfp52jp99snhbj550mvxxpi8qn15d8ml9aqhyl2lr";
33048+ libraryHaskellDepends = [ base unix ];
33049+ description = "A compatibility layer for base";
33050+ license = stdenv.lib.licenses.mit;
33051+ hydraPlatforms = stdenv.lib.platforms.none;
33052+ }) {};
33053+
3295233054 "base-compat-batteries" = callPackage
3295333055 ({ mkDerivation, base, base-compat, hspec, hspec-discover
3295433056 , QuickCheck
@@ -32964,14 +33066,14 @@ self: {
3296433066 license = stdenv.lib.licenses.mit;
3296533067 }) {};
3296633068
32967− "base-compat-batteries_0_10_4" = callPackage
33069+ "base-compat-batteries_0_10_5" = callPackage
3296833070 ({ mkDerivation, base, base-compat, contravariant, hspec
3296933071 , hspec-discover, QuickCheck
3297033072 }:
3297133073 mkDerivation {
3297233074 pname = "base-compat-batteries";
32973− version = "0.10.4";
32974− sha256 = "11k4k2n88kyaa41431cmjwmnlnhjbqx95r67mgrdxfyqxxwnxwp8";
33075+ version = "0.10.5";
33076+ sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p";
3297533077 libraryHaskellDepends = [ base base-compat contravariant ];
3297633078 testHaskellDepends = [ base hspec QuickCheck ];
3297733079 testToolDepends = [ hspec-discover ];
@@ -36279,8 +36381,8 @@ self: {
3627936381 }:
3628036382 mkDerivation {
3628136383 pname = "biohazard";
36282− version = "1.1.0";
36283− sha256 = "0sd12i3542hkvy7ijabc0y5dcf758diyvmdpi120wbvh0ay15gvy";
36384+ version = "1.1.1";
36385+ sha256 = "1b9jba89l4jsyzxn3s40qp0njq4b5hdgvbs07vsrrbnlwlvshb7a";
3628436386 libraryHaskellDepends = [
3628536387 async attoparsec base base-prelude bytestring containers exceptions
3628636388 hashable primitive stm text transformers unix unordered-containers
@@ -38879,6 +38981,17 @@ self: {
3887938981 license = stdenv.lib.licenses.mit;
3888038982 }) {};
3888138983
38984+ "bounded-array" = callPackage
38985+ ({ mkDerivation, array, base }:
38986+ mkDerivation {
38987+ pname = "bounded-array";
38988+ version = "0.1.0.0";
38989+ sha256 = "0zv5a82rm6hwikgls2hw9d18igvfgw655s5pw5h1xbwcv1d8d0ji";
38990+ libraryHaskellDepends = [ array base ];
38991+ description = "Arrays with a value for every index";
38992+ license = stdenv.lib.licenses.bsd3;
38993+ }) {};
38994+
3888238995 "bounded-tchan" = callPackage
3888338996 ({ mkDerivation, base, stm }:
3888438997 mkDerivation {
@@ -38941,8 +39054,8 @@ self: {
3894139054 ({ mkDerivation, base, ghc-prim }:
3894239055 mkDerivation {
3894339056 pname = "box-tuples";
38944− version = "0.1.0.0";
38945− sha256 = "1mksy2kiai1vwigpf45zxsq54wjwibib7974ydsv0sp1dhag6gki";
39057+ version = "0.1.1.0";
39058+ sha256 = "1j0s7pb9milrz5spqsxwwhva1zwa7ywwd8nbb5y0z97p84wvyy7k";
3894639059 libraryHaskellDepends = [ base ghc-prim ];
3894739060 description = "A hack to use GHC.Prim primitives in GHCi";
3894839061 license = stdenv.lib.licenses.mit;
@@ -48264,6 +48377,24 @@ self: {
4826448377 license = stdenv.lib.licenses.bsd3;
4826548378 }) {};
4826648379
48380+ "cmark-gfm_0_1_6" = callPackage
48381+ ({ mkDerivation, base, blaze-html, bytestring, cheapskate
48382+ , criterion, discount, HUnit, markdown, sundown, text
48383+ }:
48384+ mkDerivation {
48385+ pname = "cmark-gfm";
48386+ version = "0.1.6";
48387+ sha256 = "0s39djd1j0rq63g4sy0cnras14m263anr56nvijcbcy9zg41dyf8";
48388+ libraryHaskellDepends = [ base bytestring text ];
48389+ testHaskellDepends = [ base HUnit text ];
48390+ benchmarkHaskellDepends = [
48391+ base blaze-html cheapskate criterion discount markdown sundown text
48392+ ];
48393+ description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
48394+ license = stdenv.lib.licenses.bsd3;
48395+ hydraPlatforms = stdenv.lib.platforms.none;
48396+ }) {};
48397+
4826748398 "cmark-highlight" = callPackage
4826848399 ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text
4826948400 }:
@@ -53027,6 +53158,23 @@ self: {
5302753158 license = stdenv.lib.licenses.bsd3;
5302853159 }) {};
5302953160
53161+ "control-dsl_0_2_1_3" = callPackage
53162+ ({ mkDerivation, base, containers, doctest, doctest-discover
53163+ , temporary
53164+ }:
53165+ mkDerivation {
53166+ pname = "control-dsl";
53167+ version = "0.2.1.3";
53168+ sha256 = "0rv9wpjnr3y957vd6l8vmn87f9gi97nhk07bkgpr8083avi9biz8";
53169+ libraryHaskellDepends = [ base ];
53170+ testHaskellDepends = [
53171+ base containers doctest doctest-discover temporary
53172+ ];
53173+ description = "An alternative to monads for control flow DSLs";
53174+ license = stdenv.lib.licenses.bsd3;
53175+ hydraPlatforms = stdenv.lib.platforms.none;
53176+ }) {};
53177+
5303053178 "control-event" = callPackage
5303153179 ({ mkDerivation, base, containers, stm, time }:
5303253180 mkDerivation {
@@ -62040,30 +62188,34 @@ self: {
6204062188 ({ mkDerivation, aeson, base, base16-bytestring, blake2
6204162189 , bloomfilter, BoundedChan, bytestring, cmdargs, concurrent-extra
6204262190 , conduit, containers, criterion, data-default-class, deepseq
62043− , ghc-prim, lens-simple, leveldb-haskell, lmdb-simple, lrucaching
62044− , mtl, QuickCheck, resourcet, semigroups, serialise, tasty
62045− , tasty-hunit, tasty-quickcheck, temporary, text
62191+ , directory, dlist, filepath, ghc-prim, hashtables, lens-simple
62192+ , leveldb-haskell, lmdb-simple, lrucaching, mtl, QuickCheck
62193+ , reducers, resourcet, semigroups, serialise, stm, tasty
62194+ , tasty-hunit, tasty-quickcheck, temporary, text, transformers
6204662195 , unordered-containers
6204762196 }:
6204862197 mkDerivation {
6204962198 pname = "dfinity-radix-tree";
62050− version = "0.4.0";
62051− sha256 = "1bx82andqa7jd682ky0ga14jzfidkcsbgcb6md0wjyy8qgh18sg8";
62199+ version = "0.5.0";
62200+ sha256 = "0c721d4vcar7h5alrigi9q63pwwvp0xqwwrvfh6pa9p2y90p820b";
6205262201 isLibrary = true;
6205362202 isExecutable = true;
6205462203 libraryHaskellDepends = [
6205562204 base base16-bytestring blake2 bloomfilter BoundedChan bytestring
6205662205 concurrent-extra conduit containers data-default-class deepseq
62057− ghc-prim lens-simple leveldb-haskell lmdb-simple lrucaching mtl
62058− resourcet semigroups serialise
62206+ directory dlist ghc-prim hashtables lens-simple leveldb-haskell
62207+ lmdb-simple lrucaching mtl reducers resourcet semigroups serialise
62208+ stm temporary transformers
6205962209 ];
6206062210 executableHaskellDepends = [
6206162211 base blake2 bytestring cmdargs criterion data-default-class
6206262212 leveldb-haskell lmdb-simple resourcet temporary
6206362213 ];
6206462214 testHaskellDepends = [
62065− aeson base base16-bytestring bytestring containers mtl QuickCheck
62066− tasty tasty-hunit tasty-quickcheck text unordered-containers
62215+ aeson base base16-bytestring blake2 BoundedChan bytestring
62216+ concurrent-extra conduit containers filepath leveldb-haskell mtl
62217+ QuickCheck resourcet tasty tasty-hunit tasty-quickcheck temporary
62218+ text transformers unordered-containers
6206762219 ];
6206862220 description = "A generic data integrity layer";
6206962221 license = stdenv.lib.licenses.gpl3;
@@ -62161,39 +62313,36 @@ self: {
6216162313 license = stdenv.lib.licenses.bsd3;
6216262314 }) {};
6216362315
62164− "dhall_1_17_0" = callPackage
62316+ "dhall_1_18_0" = callPackage
6216562317 ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
6216662318 , cborg, containers, contravariant, criterion, cryptonite, deepseq
62167− , Diff, directory, doctest, exceptions, filepath, hashable
62168− , haskeline, http-client, http-client-tls
62169− , insert-ordered-containers, lens-family-core, megaparsec, memory
62170− , mockery, mtl, optparse-applicative, parsers, prettyprinter
62171− , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
62172− , repline, scientific, serialise, tasty, tasty-hunit
62173− , tasty-quickcheck, template-haskell, text, transformers
62174− , unordered-containers, vector
62319+ , Diff, directory, doctest, exceptions, filepath, haskeline
62320+ , http-client, http-client-tls, lens-family-core, megaparsec
62321+ , memory, mockery, mtl, optparse-applicative, parsers
62322+ , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
62323+ , quickcheck-instances, repline, scientific, serialise, tasty
62324+ , tasty-hunit, tasty-quickcheck, template-haskell, text
62325+ , transformers, unordered-containers, vector
6217562326 }:
6217662327 mkDerivation {
6217762328 pname = "dhall";
62178− version = "1.17.0";
62179− sha256 = "14a74zqsnv00hbv19lhmv78xzl36qnsznmncnzq7jji2aslgwad0";
62329+ version = "1.18.0";
62330+ sha256 = "155bmfk4ivjvffyj0zbd21hwg47blswgydhnys2s0zvm9zzyqa5m";
6218062331 isLibrary = true;
6218162332 isExecutable = true;
6218262333 libraryHaskellDepends = [
6218362334 ansi-terminal base bytestring case-insensitive cborg containers
6218462335 contravariant cryptonite Diff directory exceptions filepath
62185− hashable haskeline http-client http-client-tls
62186− insert-ordered-containers lens-family-core megaparsec memory mtl
62187− optparse-applicative parsers prettyprinter
62336+ haskeline http-client http-client-tls lens-family-core megaparsec
62337+ memory mtl optparse-applicative parsers prettyprinter
6218862338 prettyprinter-ansi-terminal repline scientific serialise
6218962339 template-haskell text transformers unordered-containers vector
6219062340 ];
6219162341 executableHaskellDepends = [ base ];
6219262342 testHaskellDepends = [
62193− base containers deepseq directory doctest filepath hashable
62194− insert-ordered-containers mockery prettyprinter QuickCheck
62195− quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck
62196− text transformers vector
62343+ base containers deepseq directory doctest filepath mockery
62344+ prettyprinter QuickCheck quickcheck-instances serialise tasty
62345+ tasty-hunit tasty-quickcheck text transformers vector
6219762346 ];
6219862347 benchmarkHaskellDepends = [
6219962348 base bytestring containers criterion directory serialise text
@@ -62225,6 +62374,28 @@ self: {
6222562374 license = stdenv.lib.licenses.bsd3;
6222662375 }) {};
6222762376
62377+ "dhall-bash_1_0_16" = callPackage
62378+ ({ mkDerivation, base, bytestring, containers, dhall
62379+ , neat-interpolation, optparse-generic, shell-escape, text
62380+ }:
62381+ mkDerivation {
62382+ pname = "dhall-bash";
62383+ version = "1.0.16";
62384+ sha256 = "0zaz38df08fyfil11906agmz7vfz9wapxszzizyvvp9zid5gx58g";
62385+ isLibrary = true;
62386+ isExecutable = true;
62387+ libraryHaskellDepends = [
62388+ base bytestring containers dhall neat-interpolation shell-escape
62389+ text
62390+ ];
62391+ executableHaskellDepends = [
62392+ base bytestring dhall optparse-generic text
62393+ ];
62394+ description = "Compile Dhall to Bash";
62395+ license = stdenv.lib.licenses.bsd3;
62396+ hydraPlatforms = stdenv.lib.platforms.none;
62397+ }) {};
62398+
6222862399 "dhall-check" = callPackage
6222962400 ({ mkDerivation, base, containers, dhall, directory, filepath
6223062401 , fsnotify, text, trifecta
@@ -62267,6 +62438,32 @@ self: {
6226762438 license = stdenv.lib.licenses.bsd3;
6226862439 }) {};
6226962440
62441+ "dhall-json_1_2_4" = callPackage
62442+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
62443+ , optparse-applicative, tasty, tasty-hunit, text
62444+ , unordered-containers, vector, yaml
62445+ }:
62446+ mkDerivation {
62447+ pname = "dhall-json";
62448+ version = "1.2.4";
62449+ sha256 = "1rv3vf5g3cwiy0ps1yn9jnhk56rbw7fci54xj9fj4iwc2rxb9575";
62450+ isLibrary = true;
62451+ isExecutable = true;
62452+ libraryHaskellDepends = [
62453+ aeson base dhall optparse-applicative text unordered-containers
62454+ ];
62455+ executableHaskellDepends = [
62456+ aeson aeson-pretty base bytestring dhall optparse-applicative text
62457+ vector yaml
62458+ ];
62459+ testHaskellDepends = [
62460+ aeson base bytestring dhall tasty tasty-hunit text
62461+ ];
62462+ description = "Compile Dhall to JSON or YAML";
62463+ license = stdenv.lib.licenses.bsd3;
62464+ hydraPlatforms = stdenv.lib.platforms.none;
62465+ }) {};
62466+
6227062467 "dhall-lex" = callPackage
6227162468 ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
6227262469 , hspec, hspec-dirstream, scientific
@@ -62324,6 +62521,22 @@ self: {
6232462521 license = stdenv.lib.licenses.bsd3;
6232562522 }) {};
6232662523
62524+ "dhall-text_1_0_13" = callPackage
62525+ ({ mkDerivation, base, dhall, optparse-applicative, text }:
62526+ mkDerivation {
62527+ pname = "dhall-text";
62528+ version = "1.0.13";
62529+ sha256 = "09bwhc2wrwliwrvd565wr0rgdxmi0g4i9691b8nb32nybb20l1ah";
62530+ isLibrary = false;
62531+ isExecutable = true;
62532+ executableHaskellDepends = [
62533+ base dhall optparse-applicative text
62534+ ];
62535+ description = "Template text using Dhall";
62536+ license = stdenv.lib.licenses.bsd3;
62537+ hydraPlatforms = stdenv.lib.platforms.none;
62538+ }) {};
62539+
6232762540 "dhall-to-cabal" = callPackage
6232862541 ({ mkDerivation, base, bytestring, Cabal, containers, contravariant
6232962542 , dhall, Diff, directory, filepath, hashable
@@ -66149,15 +66362,15 @@ self: {
6614966362 hydraPlatforms = stdenv.lib.platforms.none;
6615066363 }) {};
6615166364
66152− "dotenv_0_6_0_2" = callPackage
66365+ "dotenv_0_6_0_3" = callPackage
6615366366 ({ mkDerivation, base, base-compat, containers, directory
6615466367 , exceptions, hspec, hspec-megaparsec, megaparsec
6615566368 , optparse-applicative, process, text, transformers, yaml
6615666369 }:
6615766370 mkDerivation {
6615866371 pname = "dotenv";
66159− version = "0.6.0.2";
66160− sha256 = "0xgpz4pk684vlm3w2k9ynywj0knrx6am2szja6x4k9wyk9a64w89";
66372+ version = "0.6.0.3";
66373+ sha256 = "0dckfs69k3hqfjrpxkk30liq52pjd2424r8gp6i8xb0zk1xlsqgk";
6616166374 isLibrary = true;
6616266375 isExecutable = true;
6616366376 enableSeparateDataOutput = true;
@@ -66590,6 +66803,26 @@ self: {
6659066803 hydraPlatforms = stdenv.lib.platforms.none;
6659166804 }) {};
6659266805
66806+ "dragen" = callPackage
66807+ ({ mkDerivation, base, containers, extra, ghc-prim, matrix
66808+ , QuickCheck, split, template-haskell, text, transformers
66809+ }:
66810+ mkDerivation {
66811+ pname = "dragen";
66812+ version = "0.1.0.0";
66813+ sha256 = "079r8d3j5qm15cqg0d12iz4n6z0lxlmhbcqpv37dhdafjf12dyy7";
66814+ libraryHaskellDepends = [
66815+ base containers extra ghc-prim matrix QuickCheck split
66816+ template-haskell transformers
66817+ ];
66818+ testHaskellDepends = [
66819+ base containers extra ghc-prim matrix QuickCheck split
66820+ template-haskell text transformers
66821+ ];
66822+ description = "Automatic derivation of optimized QuickCheck random generators";
66823+ license = stdenv.lib.licenses.bsd3;
66824+ }) {};
66825+
6659366826 "draw-poker" = callPackage
6659466827 ({ mkDerivation, base, random-shuffle, safe }:
6659566828 mkDerivation {
@@ -68735,8 +68968,8 @@ self: {
6873568968 pname = "ekg";
6873668969 version = "0.4.0.15";
6873768970 sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8";
68738− revision = "3";
68739− editedCabalFile = "05vyycpr627znm769ilyaah39npwa6p23sncgar2vyvxscchkzpi";
68971+ revision = "4";
68972+ editedCabalFile = "17b68p16hsh79jaya1jfncml5cjf8y1jbr8827r42acnf9jk4s23";
6874068973 enableSeparateDataOutput = true;
6874168974 libraryHaskellDepends = [
6874268975 aeson base bytestring ekg-core ekg-json filepath network snap-core
@@ -68964,6 +69197,8 @@ self: {
6896469197 pname = "ekg-statsd";
6896569198 version = "0.2.4.0";
6896669199 sha256 = "1nvsiblha1fzykvfaq1s0fyvfmhm32wvxdsfkn9pqd6dl5ivyx2y";
69200+ revision = "1";
69201+ editedCabalFile = "1iayg5ac94rgdz7shvvz7ff4saffww8dc6fy82hi0cpyk7kr2xy9";
6896769202 libraryHaskellDepends = [
6896869203 base bytestring ekg-core network text time unordered-containers
6896969204 ];
@@ -72711,8 +72946,8 @@ self: {
7271172946 }:
7271272947 mkDerivation {
7271372948 pname = "exp-cache";
72714− version = "0.1.0.1";
72715− sha256 = "0yg5p3682fgkb0cn8gyb01zr9qy7y5maqzc6ssc04w9ll06l66jd";
72949+ version = "0.1.0.2";
72950+ sha256 = "1r3k4l44hii964c2xm4zb981hi0pklzik62fxr3zwyzwdjzdd36a";
7271672951 isLibrary = true;
7271772952 isExecutable = true;
7271872953 libraryHaskellDepends = [
@@ -73210,19 +73445,19 @@ self: {
7321073445 }) {};
7321173446
7321273447 "extensible-effects-concurrent" = callPackage
73213− ({ mkDerivation, base, containers, deepseq, directory
73448+ ({ mkDerivation, base, containers, data-default, deepseq, directory
7321473449 , extensible-effects, filepath, HUnit, lens, logging-effect
7321573450 , monad-control, mtl, parallel, process, QuickCheck, random, stm
7321673451 , tagged, tasty, tasty-discover, tasty-hunit, time, transformers
7321773452 }:
7321873453 mkDerivation {
7321973454 pname = "extensible-effects-concurrent";
73220− version = "0.4.0.0";
73221− sha256 = "0asqibn8hf4i627k9ms8sak90wmyis919ggb41lra4rlv03r61rc";
73455+ version = "0.5.0.1";
73456+ sha256 = "00gr2x00byfc842p8b5apzc4qi8l0fx8cgrvsi73f1mshkiqs9sp";
7322273457 libraryHaskellDepends = [
73223− base containers deepseq directory extensible-effects filepath lens
73224− logging-effect monad-control mtl parallel process QuickCheck random
73225− stm tagged time transformers
73458+ base containers data-default deepseq directory extensible-effects
73459+ filepath lens logging-effect monad-control mtl parallel process
73460+ QuickCheck random stm tagged time transformers
7322673461 ];
7322773462 testHaskellDepends = [
7322873463 base containers deepseq extensible-effects HUnit lens QuickCheck
@@ -73760,8 +73995,8 @@ self: {
7376073995 }:
7376173996 mkDerivation {
7376273997 pname = "fast-arithmetic";
73763− version = "0.6.2.3";
73764− sha256 = "17k8xghlk0nqmby33ziwbp6zvb27kh6adwhlydzzy8azn1m2snf7";
73998+ version = "0.6.3.0";
73999+ sha256 = "0f02fi63xq0x1r5qqagwzz6wbsxblz99jm2g994gs13ba11abix1";
7376574000 libraryHaskellDepends = [ base composition-prelude gmpint ];
7376674001 testHaskellDepends = [
7376774002 arithmoi base combinat-compat hspec QuickCheck
@@ -77479,8 +77714,8 @@ self: {
7747977714 ({ mkDerivation, ansi-terminal, base, fmt }:
7748077715 mkDerivation {
7748177716 pname = "fmt-terminal-colors";
77482− version = "0.1.0.0";
77483− sha256 = "1x2g5vc84l00lz4i8x2jhliglg6l32zxa7mm2l9f4rsgav6mvgc1";
77717+ version = "0.1.0.1";
77718+ sha256 = "0a8gs4m21c1b0xl7v6rm2j915yix3pks0vvy0n3c2298lpkj0z6b";
7748477719 libraryHaskellDepends = [ ansi-terminal base fmt ];
7748577720 testHaskellDepends = [ ansi-terminal base fmt ];
7748677721 description = "ANSI terminal colors formatters for fmt library";
@@ -81779,8 +82014,8 @@ self: {
8177982014 pname = "generic-trie";
8178082015 version = "0.3.1";
8178182016 sha256 = "1x7f5bp7d13g737198l43y2mf9mzngg9vmhyh1yaxg8xfpzc3anh";
81782− revision = "1";
81783− editedCabalFile = "0rr6fncm17ff7z9jdb90gvd03smd8vlhmhzf5b9hzms7s2scnvh6";
82017+ revision = "2";
82018+ editedCabalFile = "1dxf7c66vncw8zn0848g0bk2i2msbrb4njzvkzwvlaiphq0gqg10";
8178482019 libraryHaskellDepends = [ base containers transformers ];
8178582020 description = "A map, where the keys may be complex structured data";
8178682021 license = stdenv.lib.licenses.bsd3;
@@ -83089,22 +83324,23 @@ self: {
8308983324 }) {};
8309083325
8309183326 "ghc-events-analyze" = callPackage
83092− ({ mkDerivation, base, containers, diagrams-lib, diagrams-svg
83093− , filepath, ghc-events, lens, mtl, optparse-applicative, parsec
83327+ ({ mkDerivation, base, blaze-svg, bytestring, containers
83328+ , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens
83329+ , mtl, optparse-applicative, parsec, regex-base, regex-pcre-builtin
8309483330 , SVGFonts, template-haskell, th-lift, transformers
83331+ , unordered-containers
8309583332 }:
8309683333 mkDerivation {
8309783334 pname = "ghc-events-analyze";
83098− version = "0.2.4";
83099− sha256 = "1nad7n6kmp6g014fdgzzd4m1w357qm47qp16r24j499l394zaqb1";
83100− revision = "1";
83101− editedCabalFile = "1g32r4dmmrjx1ablgkpp8vhqfvwicklqnmcsl4c4qxxiad03291j";
83335+ version = "0.2.5";
83336+ sha256 = "087fjk6630fhln3srh0ah83kfdwjazwci8rxiai31nfsprsipvf8";
8310283337 isLibrary = false;
8310383338 isExecutable = true;
8310483339 executableHaskellDepends = [
83105− base containers diagrams-lib diagrams-svg filepath ghc-events lens
83106− mtl optparse-applicative parsec SVGFonts template-haskell th-lift
83107− transformers
83340+ base blaze-svg bytestring containers diagrams-lib diagrams-svg
83341+ filepath ghc-events hashable lens mtl optparse-applicative parsec
83342+ regex-base regex-pcre-builtin SVGFonts template-haskell th-lift
83343+ transformers unordered-containers
8310883344 ];
8310983345 description = "Analyze and visualize event logs";
8311083346 license = stdenv.lib.licenses.bsd3;
@@ -85186,8 +85422,8 @@ self: {
8518685422 }:
8518785423 mkDerivation {
8518885424 pname = "ginger";
85189− version = "0.8.0.1";
85190− sha256 = "0ahd12y6qlnqi8wvhczn5hk2k7g48m6a0d2nxbvjx00iixs5dr34";
85425+ version = "0.8.1.0";
85426+ sha256 = "1l0gwi92jb38a8maq96xxfjvjqyhlh3v21xvgkqszqappjzabcpd";
8519185427 isLibrary = true;
8519285428 isExecutable = true;
8519385429 enableSeparateDataOutput = true;
@@ -86795,6 +87031,8 @@ self: {
8679587031 pname = "glirc";
8679687032 version = "2.29";
8679787033 sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx";
87034+ revision = "1";
87035+ editedCabalFile = "0kjari98vcx5d1nfvxk8f6nx557hpy6njw7fj5p1lfdals81qifz";
8679887036 isLibrary = true;
8679987037 isExecutable = true;
8680087038 setupHaskellDepends = [ base Cabal filepath ];
@@ -90441,6 +90679,17 @@ self: {
9044190679 license = stdenv.lib.licenses.asl20;
9044290680 }) {};
9044390681
90682+ "graphql-w-persistent" = callPackage
90683+ ({ mkDerivation, base, containers, json, text }:
90684+ mkDerivation {
90685+ pname = "graphql-w-persistent";
90686+ version = "0.1.0.3";
90687+ sha256 = "0yinjcd74hdxfvph760cvf319hnrb5skkc174ih7fqjjllrp5din";
90688+ libraryHaskellDepends = [ base containers json text ];
90689+ description = "Haskell GraphQL query parser-interpreter-data processor";
90690+ license = stdenv.lib.licenses.isc;
90691+ }) {};
90692+
9044490693 "graphs" = callPackage
9044590694 ({ mkDerivation, array, base, containers, transformers
9044690695 , transformers-compat, void
@@ -90821,17 +91070,16 @@ self: {
9082191070 }) {};
9082291071
9082391072 "grid" = callPackage
90824− ({ mkDerivation, base, cereal, containers, QuickCheck
90825− , test-framework, test-framework-quickcheck2
91073+ ({ mkDerivation, base, containers, QuickCheck, test-framework
91074+ , test-framework-quickcheck2
9082691075 }:
9082791076 mkDerivation {
9082891077 pname = "grid";
90829− version = "7.8.9";
90830− sha256 = "1gzf8k4v16aavz63fcl0byqxzha796g77dng7rsxjm8zsgzlicy0";
90831− libraryHaskellDepends = [ base cereal containers ];
91078+ version = "7.8.10";
91079+ sha256 = "1470w214jk285jvb7hyzz539gi3jl52dpa97k5yyfcm2q7186pbj";
91080+ libraryHaskellDepends = [ base containers ];
9083291081 testHaskellDepends = [
90833− base containers QuickCheck test-framework
90834− test-framework-quickcheck2
91082+ base QuickCheck test-framework test-framework-quickcheck2
9083591083 ];
9083691084 description = "Tools for working with regular grids (graphs, lattices)";
9083791085 license = stdenv.lib.licenses.bsd3;
@@ -91092,8 +91340,8 @@ self: {
9109291340 }:
9109391341 mkDerivation {
9109491342 pname = "groundhog-postgresql";
91095− version = "0.9.0";
91096− sha256 = "0r756ccnrwzwl6x9fkrvyws8l00sp9jjqlj5n42jkw7nwwx3i8gy";
91343+ version = "0.9.0.1";
91344+ sha256 = "0p88l85rsmbdpfnrh2411n68yy70g0iw7pqmp496b8n6gr0mmvl5";
9109791345 libraryHaskellDepends = [
9109891346 aeson attoparsec base blaze-builder bytestring containers groundhog
9109991347 monad-control postgresql-libpq postgresql-simple resource-pool
@@ -93677,15 +93925,15 @@ self: {
9367793925 }) {};
9367893926
9367993927 "haddock" = callPackage
93680− ({ mkDerivation, base, filepath, haddock-api, hspec }:
93928+ ({ mkDerivation, base, filepath, haddock-api }:
9368193929 mkDerivation {
9368293930 pname = "haddock";
93683− version = "2.20.0";
93684− sha256 = "0jfgd9n0gcbg9i2ifra5cnj0xh2nc5j65ns3b280482r65vnph9w";
93931+ version = "2.21.0";
93932+ sha256 = "1dkqhclhnjx6786vsmkw6k75kkq06cv1xcxkivm34l5pgnkwwqq8";
9368593933 isLibrary = false;
9368693934 isExecutable = true;
9368793935 executableHaskellDepends = [ base haddock-api ];
93688− testHaskellDepends = [ base filepath hspec ];
93936+ testHaskellDepends = [ base filepath ];
9368993937 doCheck = false;
9369093938 preCheck = "unset GHC_PACKAGE_PATH";
9369193939 description = "A documentation-generation tool for Haskell libraries";
@@ -93761,8 +94009,8 @@ self: {
9376194009 }:
9376294010 mkDerivation {
9376394011 pname = "haddock-api";
93764− version = "2.20.0";
93765− sha256 = "02f6038djjbx2vshd5digk4rm16fl33m080s7v01nn5bzfak9g7j";
94012+ version = "2.21.0";
94013+ sha256 = "0j6ixhq64nhjmq2ymhzdgz49ixdbffrrh8a96awl89d2kwdv3bnw";
9376694014 enableSeparateDataOutput = true;
9376794015 libraryHaskellDepends = [
9376894016 array base bytestring Cabal containers deepseq directory filepath
@@ -93854,24 +94102,22 @@ self: {
9385494102 license = stdenv.lib.licenses.bsd3;
9385594103 }) {};
9385694104
93857− "haddock-library_1_6_0" = callPackage
94105+ "haddock-library_1_7_0" = callPackage
9385894106 ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
93859− , directory, filepath, hspec, hspec-discover, optparse-applicative
93860− , QuickCheck, transformers, tree-diff
94107+ , hspec, hspec-discover, parsec, QuickCheck, text, transformers
9386194108 }:
9386294109 mkDerivation {
9386394110 pname = "haddock-library";
93864− version = "1.6.0";
93865− sha256 = "0h7721zw6kbm1vcr0kp69avfy3qfd9zsgmh24gy909kxgdp0k7v0";
94111+ version = "1.7.0";
94112+ sha256 = "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7";
9386694113 libraryHaskellDepends = [
93867− base bytestring containers deepseq transformers
94114+ base bytestring containers parsec text transformers
9386894115 ];
9386994116 testHaskellDepends = [
93870− base base-compat bytestring containers deepseq directory filepath
93871− hspec optparse-applicative QuickCheck transformers tree-diff
94117+ base base-compat bytestring containers deepseq hspec parsec
94118+ QuickCheck text transformers
9387294119 ];
9387394120 testToolDepends = [ hspec-discover ];
93874− doHaddock = false;
9387594121 description = "Library exposing some functionality of Haddock";
9387694122 license = stdenv.lib.licenses.bsd3;
9387794123 hydraPlatforms = stdenv.lib.platforms.none;
@@ -94553,10 +94799,8 @@ self: {
9455394799 }:
9455494800 mkDerivation {
9455594801 pname = "hakyll-dhall";
94556− version = "0.2.2.0";
94557− sha256 = "02hqp9gm26n2w3hh54j94h3ga9nbh24yglx8ljkr30gz7l6r9sc8";
94558− revision = "1";
94559− editedCabalFile = "1q9dz2cb26272hfj4dqgp0kcl2rprh7vvpxyjwvh04n3siixxf62";
94802+ version = "0.2.2.1";
94803+ sha256 = "03s1fs95mhaxwq79gf2qjlbzjfkimd3kkiksjmp42j8zxn0y9sbf";
9456094804 isLibrary = true;
9456194805 isExecutable = true;
9456294806 libraryHaskellDepends = [
@@ -94907,13 +95151,11 @@ self: {
9490795151 ({ mkDerivation, base, hedgehog, lens }:
9490895152 mkDerivation {
9490995153 pname = "halves";
94910− version = "0.1.0.0";
94911− sha256 = "06axsxkfja0p7vki4cnrf3rf3k255f5mk573pzn0zvzi4f8mmadn";
94912− revision = "1";
94913− editedCabalFile = "0hwp6fgnfmms2ckg0bzriklnshn7m39dxvj2vjrzm19spnf55fdn";
95154+ version = "0.1.0.1";
95155+ sha256 = "0mjxi7aq58k5aydslsihp66kabh0mr5wp2nngbzkvzbs0z7rrwma";
9491495156 libraryHaskellDepends = [ base lens ];
9491595157 testHaskellDepends = [ base hedgehog lens ];
94916− description = "Splitting/combining data structures to/from halves, quarters, eighths";
95158+ description = "Split or combine data structures to and from halves, quarters, eighths";
9491795159 license = stdenv.lib.licenses.bsd3;
9491895160 hydraPlatforms = stdenv.lib.platforms.none;
9491995161 }) {};
@@ -96459,8 +96701,8 @@ self: {
9645996701 }:
9646096702 mkDerivation {
9646196703 pname = "hasbolt-extras";
96462− version = "0.0.0.11";
96463− sha256 = "1x0dm5x4jr1k619s7ad78bb717c8572s8pakailf8g2wsyc340gr";
96704+ version = "0.0.0.12";
96705+ sha256 = "0rh4nn7dy9jfn4vhmf18fgyqhldj5lg46l35ka2m60ig86za9fkn";
9646496706 libraryHaskellDepends = [
9646596707 base containers free hasbolt lens mtl neat-interpolation
9646696708 template-haskell text th-lift-instances
@@ -99780,8 +100022,8 @@ self: {
99780100022 }:
99781100023 mkDerivation {
99782100024 pname = "haskoin-node";
99783− version = "0.8.1";
99784− sha256 = "08zwn8s1ddr6aw2c3n6j2xazxa7zc3x5ga27v2rwqky0cma311c4";
100025+ version = "0.9.2";
100026+ sha256 = "1aiqhw7fk6h70ps5svbhhhk577ai0rqk6s4bm00ii4yhnbdrdk60";
99785100027 libraryHaskellDepends = [
99786100028 base bytestring cereal conduit conduit-extra data-default hashable
99787100029 haskoin-core monad-logger mtl network nqe random resourcet
@@ -102050,10 +102292,8 @@ self: {
102050102292 }:
102051102293 mkDerivation {
102052102294 pname = "hdocs";
102053− version = "0.5.3.0";
102054− sha256 = "0gkv4xy7jr2ic22gn5fpj3vd6avgd1xqblv96gg1m0fhfsj92y5h";
102055− revision = "1";
102056− editedCabalFile = "0dy2jamwd0jxai8hcfq506xqczi0hn9c8p7z4dbmq62d29fm79yb";
102295+ version = "0.5.3.1";
102296+ sha256 = "0nxvkmhxpxx3500sy7kzpqyp45rq83hjm6gkj10vglxgjk32vzp4";
102057102297 isLibrary = true;
102058102298 isExecutable = true;
102059102299 libraryHaskellDepends = [
@@ -109101,8 +109341,8 @@ self: {
109101109341 pname = "hpack-dhall";
109102109342 version = "0.3.0";
109103109343 sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh";
109104− revision = "2";
109105− editedCabalFile = "0qjw27y6q1g2yfgg7wijzi0xd9ccz3far4dixs18nd2wqsw8ih51";
109344+ revision = "3";
109345+ editedCabalFile = "1paz90nmir7hrwp9yf2aair14gyiw8ql7f9vj2ry8r7q00xbpfv2";
109106109346 isLibrary = false;
109107109347 isExecutable = true;
109108109348 executableHaskellDepends = [
@@ -110883,6 +111123,8 @@ self: {
110883111123 pname = "hsc2hs";
110884111124 version = "0.68.4";
110885111125 sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6";
111126+ revision = "1";
111127+ editedCabalFile = "1wab9n4wy3bffxly0b0v1ppzf6sfn6aqc8pi1r8jnwb4rzy94c3i";
110886111128 isLibrary = false;
110887111129 isExecutable = true;
110888111130 enableSeparateDataOutput = true;
@@ -113843,25 +114085,29 @@ self: {
113843114085
113844114086 "hstox" = callPackage
113845114087 ({ mkDerivation, async, base, base16-bytestring, binary
113846− , binary-bits, bytestring, containers, data-msgpack, hspec
113847− , integer-gmp, iproute, network, network-msgpack-rpc, process
113848− , QuickCheck, saltine, tagged, text, transformers
114088+ , binary-bits, bytestring, clock, containers, data-msgpack
114089+ , data-msgpack-types, entropy, hspec, integer-gmp, iproute
114090+ , lens-family, MonadRandom, mtl, network, network-msgpack-rpc
114091+ , process, QuickCheck, random, saltine, semigroups, tagged, text
114092+ , transformers
113849114093 }:
113850114094 mkDerivation {
113851114095 pname = "hstox";
113852− version = "0.0.1";
113853− sha256 = "02ifk98jqnfc4dinf8g7zsls6vmb4kys2mw42qgp6grrkw5clqkd";
114096+ version = "0.0.2";
114097+ sha256 = "0dnz2kza50741gkhkclipd73wiqlfh0f40bsx9askl2sbj5zschg";
113854114098 isLibrary = true;
113855114099 isExecutable = true;
113856114100 libraryHaskellDepends = [
113857− base base16-bytestring binary binary-bits bytestring containers
113858− data-msgpack hspec integer-gmp iproute network network-msgpack-rpc
113859− QuickCheck saltine tagged text transformers
114101+ base base16-bytestring binary binary-bits bytestring clock
114102+ containers data-msgpack data-msgpack-types entropy hspec
114103+ integer-gmp iproute lens-family MonadRandom mtl network
114104+ network-msgpack-rpc QuickCheck random saltine semigroups tagged
114105+ text transformers
113860114106 ];
113861114107 executableHaskellDepends = [ base process ];
113862114108 testHaskellDepends = [ async base ];
113863114109 description = "A Tox protocol implementation in Haskell";
113864− license = stdenv.lib.licenses.agpl3;
114110+ license = stdenv.lib.licenses.gpl3;
113865114111 hydraPlatforms = stdenv.lib.platforms.none;
113866114112 }) {};
113867114113
@@ -114519,6 +114765,33 @@ self: {
114519114765 license = stdenv.lib.licenses.bsd3;
114520114766 }) {};
114521114767
114768+ "html-validator-cli" = callPackage
114769+ ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
114770+ , doctest, filepath, hspec, http-conduit, text, utf8-string
114771+ }:
114772+ mkDerivation {
114773+ pname = "html-validator-cli";
114774+ version = "0.1.0.5";
114775+ sha256 = "0f1af2zsg7vmirmdnh3fwvyk3m7gdd34nfgfkdygs4ridhv6hqxs";
114776+ isLibrary = true;
114777+ isExecutable = true;
114778+ enableSeparateDataOutput = true;
114779+ libraryHaskellDepends = [
114780+ aeson ansi-terminal base bytestring directory doctest filepath
114781+ hspec http-conduit text utf8-string
114782+ ];
114783+ executableHaskellDepends = [
114784+ aeson ansi-terminal base bytestring directory doctest filepath
114785+ hspec http-conduit text utf8-string
114786+ ];
114787+ testHaskellDepends = [
114788+ aeson ansi-terminal base bytestring directory doctest filepath
114789+ hspec http-conduit text utf8-string
114790+ ];
114791+ description = "A command-line interface for https://validator.w3.org/";
114792+ license = stdenv.lib.licenses.bsd3;
114793+ }) {};
114794+
114522114795 "html2hamlet" = callPackage
114523114796 ({ mkDerivation, base, bytestring, containers, hamlet, html-conduit
114524114797 , http-conduit, mtl, optparse-declarative, regex-tdfa, text
@@ -116718,14 +116991,14 @@ self: {
116718116991 license = stdenv.lib.licenses.bsd3;
116719116992 }) {};
116720116993
116721− "hw-ip_0_2_1_1" = callPackage
116994+ "hw-ip_0_4_1" = callPackage
116722116995 ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec
116723116996 , hw-bits, hw-hspec-hedgehog, text
116724116997 }:
116725116998 mkDerivation {
116726116999 pname = "hw-ip";
116727− version = "0.2.1.1";
116728− sha256 = "1vcg2n0ar5j5w02caswjxi549qfkgy7p63vfasbq3a8w3d109931";
117000+ version = "0.4.1";
117001+ sha256 = "0kql3qvav2r0fsppiqa40s95938gfzkal5bkli3rhjiknj3vhbg7";
116729117002 libraryHaskellDepends = [
116730117003 attoparsec base generic-lens hw-bits text
116731117004 ];
@@ -121642,6 +121915,24 @@ self: {
121642121915 license = stdenv.lib.licenses.publicDomain;
121643121916 }) {};
121644121917
121918+ "interpolatedstring-perl6_1_0_1" = callPackage
121919+ ({ mkDerivation, base, bytestring, Cabal, haskell-src-meta, process
121920+ , template-haskell, text
121921+ }:
121922+ mkDerivation {
121923+ pname = "interpolatedstring-perl6";
121924+ version = "1.0.1";
121925+ sha256 = "0n3j6qvzp6as5ji93rn0sy873w5hdsplik51lkrah42cl95vmbay";
121926+ enableSeparateDataOutput = true;
121927+ setupHaskellDepends = [ base Cabal process ];
121928+ libraryHaskellDepends = [
121929+ base bytestring haskell-src-meta template-haskell text
121930+ ];
121931+ description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
121932+ license = stdenv.lib.licenses.publicDomain;
121933+ hydraPlatforms = stdenv.lib.platforms.none;
121934+ }) {};
121935+
121645121936 "interpolatedstring-qq" = callPackage
121646121937 ({ mkDerivation, base, haskell-src-meta-mwotton, template-haskell
121647121938 }:
@@ -122186,8 +122477,8 @@ self: {
122186122477 pname = "io-streams-haproxy";
122187122478 version = "1.0.0.2";
122188122479 sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp";
122189− revision = "2";
122190− editedCabalFile = "0jrasbn4s6ac0691bf88fbflpha2vn24bd45gk0s3znvl395dxgr";
122480+ revision = "3";
122481+ editedCabalFile = "03pwnb66mlx1b8z2d4mn262i2s5mprfr49m0crnssd2nlvm82ifa";
122191122482 libraryHaskellDepends = [
122192122483 attoparsec base bytestring io-streams network transformers
122193122484 ];
@@ -122515,6 +122806,26 @@ self: {
122515122806 license = stdenv.lib.licenses.bsd3;
122516122807 }) {};
122517122808
122809+ "iproute_1_7_6" = callPackage
122810+ ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
122811+ , network, QuickCheck, safe
122812+ }:
122813+ mkDerivation {
122814+ pname = "iproute";
122815+ version = "1.7.6";
122816+ sha256 = "1svczhzy126w7pa5vyfg90xrvi2ym34f47nj4hhcpx13dv06g5wi";
122817+ libraryHaskellDepends = [
122818+ appar base byteorder containers network
122819+ ];
122820+ testHaskellDepends = [
122821+ appar base byteorder containers doctest hspec network QuickCheck
122822+ safe
122823+ ];
122824+ description = "IP Routing Table";
122825+ license = stdenv.lib.licenses.bsd3;
122826+ hydraPlatforms = stdenv.lib.platforms.none;
122827+ }) {};
122828+
122518122829 "iptables-helpers" = callPackage
122519122830 ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
122520122831 , syb, utf8-string
@@ -125080,6 +125391,8 @@ self: {
125080125391 pname = "json-autotype";
125081125392 version = "2.0.0";
125082125393 sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68";
125394+ revision = "1";
125395+ editedCabalFile = "00wbcq9bx6sq6i5756ja6pf016xbpk2kflq20ncdv76zycxdkqnm";
125083125396 isLibrary = true;
125084125397 isExecutable = true;
125085125398 libraryHaskellDepends = [
@@ -131084,6 +131397,19 @@ self: {
131084131397 license = stdenv.lib.licenses.bsd3;
131085131398 }) {};
131086131399
131400+ "leancheck_0_7_7" = callPackage
131401+ ({ mkDerivation, base, template-haskell }:
131402+ mkDerivation {
131403+ pname = "leancheck";
131404+ version = "0.7.7";
131405+ sha256 = "0ymzs3w7nfagpcyh4f57f1wi1gr72k7pbkh729jrxxqgqhd84bvd";
131406+ libraryHaskellDepends = [ base template-haskell ];
131407+ testHaskellDepends = [ base ];
131408+ description = "Enumerative property-based testing";
131409+ license = stdenv.lib.licenses.bsd3;
131410+ hydraPlatforms = stdenv.lib.platforms.none;
131411+ }) {};
131412+
131087131413 "leankit-api" = callPackage
131088131414 ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
131089131415 mkDerivation {
@@ -139739,22 +140065,21 @@ self: {
139739140065
139740140066 "matrix-static" = callPackage
139741140067 ({ mkDerivation, base, deepseq, ghc-typelits-knownnat
139742− , ghc-typelits-natnormalise, matrix, semigroups, tasty, tasty-hunit
139743− , vector
140068+ , ghc-typelits-natnormalise, matrix, tasty, tasty-hunit, vector
139744140069 }:
139745140070 mkDerivation {
139746140071 pname = "matrix-static";
139747− version = "0.1";
139748− sha256 = "0l4p0ahlpgf39wjwrvr6ibxpj5b6kmyn2li6yjbddi0af137ii4q";
140072+ version = "0.2";
140073+ sha256 = "0g4vkzc6jw4sx2an86d20fv9b23jzly8dxsan7ygih1mp8rn5r07";
139749140074 libraryHaskellDepends = [
139750140075 base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
139751− semigroups vector
140076+ vector
139752140077 ];
139753140078 testHaskellDepends = [
139754140079 base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
139755− semigroups tasty tasty-hunit vector
140080+ tasty tasty-hunit vector
139756140081 ];
139757− description = "Wrapper around matrix that adds matrix sizes to the type-level";
140082+ description = "Type-safe matrix operations";
139758140083 license = stdenv.lib.licenses.bsd3;
139759140084 }) {};
139760140085
@@ -145814,6 +146139,28 @@ self: {
145814146139 license = stdenv.lib.licenses.bsd3;
145815146140 }) {inherit (pkgs) mpg123;};
145816146141
146142+ "mpi-hs" = callPackage
146143+ ({ mkDerivation, base, c2hs, criterion, monad-loops, openmpi, tasty
146144+ , tasty-hspec, tasty-hunit, unix
146145+ }:
146146+ mkDerivation {
146147+ pname = "mpi-hs";
146148+ version = "0.1.0.1";
146149+ sha256 = "19by906z7ccfai23dr61ckzcvv3ccd8l1slf21r7g07zlmjkdrvf";
146150+ isLibrary = true;
146151+ isExecutable = true;
146152+ libraryHaskellDepends = [ base ];
146153+ librarySystemDepends = [ openmpi ];
146154+ libraryToolDepends = [ c2hs ];
146155+ executableHaskellDepends = [ base ];
146156+ testHaskellDepends = [
146157+ base monad-loops tasty tasty-hspec tasty-hunit unix
146158+ ];
146159+ benchmarkHaskellDepends = [ base criterion ];
146160+ description = "MPI bindings for Haskell";
146161+ license = stdenv.lib.licenses.asl20;
146162+ }) {inherit (pkgs) openmpi;};
146163+
145817146164 "mpppc" = callPackage
145818146165 ({ mkDerivation, ansi-terminal, base, bytestring, split, text }:
145819146166 mkDerivation {
@@ -151082,8 +151429,8 @@ self: {
151082151429 }:
151083151430 mkDerivation {
151084151431 pname = "ngx-export";
151085− version = "1.4.2";
151086− sha256 = "10rfhx29b5l43i4fw7inp38i9a296gb0dsjs6jsm6g4d09pfjljs";
151432+ version = "1.5.0";
151433+ sha256 = "1lw1hf2xy86n6c8426zdvk1qbm43gsk5zxjrbfqcy28qlnvwcdpa";
151087151434 libraryHaskellDepends = [
151088151435 async base binary bytestring deepseq monad-loops template-haskell
151089151436 unix
@@ -151092,6 +151439,21 @@ self: {
151092151439 license = stdenv.lib.licenses.bsd3;
151093151440 }) {};
151094151441
151442+ "ngx-export-tools" = callPackage
151443+ ({ mkDerivation, aeson, base, binary, bytestring, ngx-export, safe
151444+ , template-haskell
151445+ }:
151446+ mkDerivation {
151447+ pname = "ngx-export-tools";
151448+ version = "0.1.2.0";
151449+ sha256 = "0vkcgj8y4jh63nwh0djxfjvkbpa66zpf32y5912lwj7xf6rm769q";
151450+ libraryHaskellDepends = [
151451+ aeson base binary bytestring ngx-export safe template-haskell
151452+ ];
151453+ description = "Extra tools for Nginx haskell module";
151454+ license = stdenv.lib.licenses.bsd3;
151455+ }) {};
151456+
151095151457 "niagra" = callPackage
151096151458 ({ mkDerivation, base, ghc-prim, HUnit, mtl, primitive, QuickCheck
151097151459 , text, transformers
@@ -154661,8 +155023,8 @@ self: {
154661155023 pname = "openssl-streams";
154662155024 version = "1.2.1.3";
154663155025 sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw";
154664− revision = "1";
154665− editedCabalFile = "0kvbb0sgli3h1yw229cllfrs2w1maapmvj1i472ywhpsgpz83362";
155026+ revision = "2";
155027+ editedCabalFile = "1004kgdryflpkp19dv4ikilhcn0xbfc5dsp6v3ib34580pcfj7wy";
154666155028 libraryHaskellDepends = [
154667155029 base bytestring HsOpenSSL io-streams network
154668155030 ];
@@ -160527,6 +160889,8 @@ self: {
160527160889 pname = "persistent-postgresql";
160528160890 version = "2.9.0";
160529160891 sha256 = "1rqlbdz7wwjl1d3xqp01sz5xnn8hff35hgkhx6c66lzrfyl9q0mx";
160892+ revision = "1";
160893+ editedCabalFile = "0xrnww7n6kwr2371fj5xklslbx0114yj3pxcpdzwalmin5wm8vah";
160530160894 libraryHaskellDepends = [
160531160895 aeson base blaze-builder bytestring conduit containers monad-logger
160532160896 persistent postgresql-libpq postgresql-simple resource-pool
@@ -161443,6 +161807,17 @@ self: {
161443161807 hydraPlatforms = stdenv.lib.platforms.none;
161444161808 }) {};
161445161809
161810+ "physics" = callPackage
161811+ ({ mkDerivation, base }:
161812+ mkDerivation {
161813+ pname = "physics";
161814+ version = "0.1.2.1";
161815+ sha256 = "07ysi2xq73g29pv4c3zvwq9zf1yjl2aszb1zkim49n00f5bxfnqc";
161816+ libraryHaskellDepends = [ base ];
161817+ description = "dimensions, quantities and constants";
161818+ license = stdenv.lib.licenses.bsd3;
161819+ }) {};
161820+
161446161821 "pi-calculus" = callPackage
161447161822 ({ mkDerivation, AES, base, binary, byteable, bytestring
161448161823 , containers, cryptohash, HTTP, io-streams, mtl, network, parsec
@@ -165424,6 +165799,34 @@ self: {
165424165799 license = stdenv.lib.licenses.bsd3;
165425165800 }) {};
165426165801
165802+ "postgresql-simple_0_6" = callPackage
165803+ ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
165804+ , bytestring, bytestring-builder, case-insensitive, containers
165805+ , cryptohash, filepath, hashable, HUnit, Only, postgresql-libpq
165806+ , scientific, tasty, tasty-golden, tasty-hunit, template-haskell
165807+ , text, time, transformers, uuid-types, vector
165808+ }:
165809+ mkDerivation {
165810+ pname = "postgresql-simple";
165811+ version = "0.6";
165812+ sha256 = "1jp08vg040p2qbgy2hldkac1qy1m2k1r6r67hh6dziw5ak1kjs69";
165813+ libraryHaskellDepends = [
165814+ aeson attoparsec base bytestring bytestring-builder
165815+ case-insensitive containers hashable Only postgresql-libpq
165816+ scientific template-haskell text time transformers uuid-types
165817+ vector
165818+ ];
165819+ testHaskellDepends = [
165820+ aeson base base16-bytestring bytestring case-insensitive containers
165821+ cryptohash filepath HUnit tasty tasty-golden tasty-hunit text time
165822+ vector
165823+ ];
165824+ benchmarkHaskellDepends = [ base vector ];
165825+ description = "Mid-Level PostgreSQL client library";
165826+ license = stdenv.lib.licenses.bsd3;
165827+ hydraPlatforms = stdenv.lib.platforms.none;
165828+ }) {};
165829+
165427165830 "postgresql-simple-bind" = callPackage
165428165831 ({ mkDerivation, attoparsec, base, bytestring, data-default
165429165832 , exceptions, heredoc, hspec, postgresql-simple, template-haskell
@@ -165554,6 +165957,8 @@ self: {
165554165957 pname = "postgresql-simple-url";
165555165958 version = "0.2.1.0";
165556165959 sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk";
165960+ revision = "1";
165961+ editedCabalFile = "0ck0vrlsyj3vm8sk59jnyyqpvnv1l9mciifdnrzwr981pha147qp";
165557165962 libraryHaskellDepends = [
165558165963 base network-uri postgresql-simple split
165559165964 ];
@@ -167020,6 +167425,8 @@ self: {
167020167425 pname = "prettyprinter-vty";
167021167426 version = "0.1.0.0";
167022167427 sha256 = "12nj0v9p5bjbhwmkknc2ybdw52m5hngnf7c53qfi3crbrx4maxrd";
167428+ revision = "1";
167429+ editedCabalFile = "120lhr6g3grsybq5bp0vg38cdb78dysq8nwa206ghzigaxs34vcd";
167023167430 libraryHaskellDepends = [ base prettyprinter vty ];
167024167431 description = "prettyprinter backend for vty";
167025167432 license = stdenv.lib.licenses.isc;
@@ -167265,13 +167672,18 @@ self: {
167265167672 }) {};
167266167673
167267167674 "primitive-maybe" = callPackage
167268− ({ mkDerivation, base, primitive }:
167675+ ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
167676+ , tagged, tasty, tasty-quickcheck
167677+ }:
167269167678 mkDerivation {
167270167679 pname = "primitive-maybe";
167271− version = "0.1.0";
167272− sha256 = "0pxkgkwlpphk5x38f2jv9gl3n74l1spnfs15sb34hxgyggrz4k6j";
167680+ version = "0.1.1";
167681+ sha256 = "00p9xrvv32wcj3ln9z1dk31bb47r95y4w4ny4y28wl6vyc6vl0ln";
167273167682 libraryHaskellDepends = [ base primitive ];
167274− testHaskellDepends = [ base ];
167683+ testHaskellDepends = [
167684+ base primitive QuickCheck quickcheck-classes tagged tasty
167685+ tasty-quickcheck
167686+ ];
167275167687 description = "Arrays of Maybes";
167276167688 license = stdenv.lib.licenses.bsd3;
167277167689 hydraPlatforms = stdenv.lib.platforms.none;
@@ -178799,6 +179211,20 @@ self: {
178799179211 license = stdenv.lib.licenses.bsd3;
178800179212 }) {};
178801179213
179214+ "rfc5051_0_1_0_4" = callPackage
179215+ ({ mkDerivation, base, bytestring, containers }:
179216+ mkDerivation {
179217+ pname = "rfc5051";
179218+ version = "0.1.0.4";
179219+ sha256 = "1lxkq414ni986ciml4gbvf463fn55z299knky7pq3ixb1qislpb1";
179220+ isLibrary = true;
179221+ isExecutable = true;
179222+ libraryHaskellDepends = [ base bytestring containers ];
179223+ description = "Simple unicode collation as per RFC5051";
179224+ license = stdenv.lib.licenses.bsd3;
179225+ hydraPlatforms = stdenv.lib.platforms.none;
179226+ }) {};
179227+
178802179228 "rgb-color-model" = callPackage
178803179229 ({ mkDerivation, base }:
178804179230 mkDerivation {
@@ -184521,6 +184947,8 @@ self: {
184521184947 pname = "semiring-num";
184522184948 version = "1.6.0.1";
184523184949 sha256 = "1l9j59r0ph34fqkjw1gdf3yzyzk8p6362cznixzx6qnhphbkqjsi";
184950+ revision = "1";
184951+ editedCabalFile = "123jk59i4ziv6ghmy8349icpvzgw90xjd6dxzlnayf0qg01adzsr";
184524184952 libraryHaskellDepends = [
184525184953 base containers deepseq hashable log-domain scientific
184526184954 template-haskell time unordered-containers vector
@@ -185198,6 +185626,8 @@ self: {
185198185626 pname = "servant";
185199185627 version = "0.14.1";
185200185628 sha256 = "083layvq76llq3y49k27cdqzxka6mjgw541jhzndxx4avlcjzym7";
185629+ revision = "1";
185630+ editedCabalFile = "1n9lwm77w0xi6jzqrhyn6akf71z140wngj4s5x2zkndq8wmg4rg4";
185201185631 setupHaskellDepends = [ base Cabal cabal-doctest ];
185202185632 libraryHaskellDepends = [
185203185633 aeson attoparsec base base-compat bytestring case-insensitive
@@ -185691,8 +186121,8 @@ self: {
185691186121 pname = "servant-client";
185692186122 version = "0.14";
185693186123 sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6";
185694− revision = "1";
185695− editedCabalFile = "1ywyb3mycpfcvv7dfgd72ajnkqr8cyiyp84hsfxcfvppq8cigmms";
186124+ revision = "2";
186125+ editedCabalFile = "087ja0xbwm1yg38i5pc26fxsjx4pfdcgqmw0h1lvf0z1alz8rq05";
185696186126 libraryHaskellDepends = [
185697186127 base base-compat bytestring containers exceptions http-client
185698186128 http-media http-types monad-control mtl semigroupoids
@@ -185721,6 +186151,8 @@ self: {
185721186151 pname = "servant-client-core";
185722186152 version = "0.14.1";
185723186153 sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2";
186154+ revision = "1";
186155+ editedCabalFile = "04xr6zpslw7pyzxp22qd8k2w9azc3pds5gplnwni12waqahf410i";
185724186156 libraryHaskellDepends = [
185725186157 base base-compat base64-bytestring bytestring containers exceptions
185726186158 free generics-sop http-api-data http-media http-types network-uri
@@ -185823,8 +186255,8 @@ self: {
185823186255 pname = "servant-docs";
185824186256 version = "0.11.2";
185825186257 sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
185826− revision = "5";
185827− editedCabalFile = "10b463waaa75aawjdag52yjv2bhkpnp3xygb39zyifpaf6iix100";
186258+ revision = "6";
186259+ editedCabalFile = "0w9yi4rmfq4irmnia9rl9pb66ix086ic9nd0grspnk54ib7970cl";
185828186260 isLibrary = true;
185829186261 isExecutable = true;
185830186262 libraryHaskellDepends = [
@@ -185974,8 +186406,8 @@ self: {
185974186406 pname = "servant-foreign";
185975186407 version = "0.11.1";
185976186408 sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735";
185977− revision = "3";
185978− editedCabalFile = "1ln18qi2bb9xfk3phydci5r2x0mf6dbgc9lc8k8qpx08bkid65x4";
186409+ revision = "4";
186410+ editedCabalFile = "1alal6ps1lwl8yd2vwkpmkn4a69blr1ws2cba7mc7a2w63lg1pyz";
185979186411 libraryHaskellDepends = [
185980186412 base base-compat http-types lens servant text
185981186413 ];
@@ -185991,8 +186423,8 @@ self: {
185991186423 pname = "servant-generate";
185992186424 version = "0.1";
185993186425 sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw";
185994− revision = "2";
185995− editedCabalFile = "00y5ji53sz59wys4nk2xcdpggydvkkqdxnm0aqj5raxzmakqnraq";
186426+ revision = "3";
186427+ editedCabalFile = "11hmn45fsl78kq6lladgz29yjycmr7lxmkswc8f41zbcb4m8rzyk";
185996186428 libraryHaskellDepends = [ base servant servant-server ];
185997186429 description = "Utilities for generating mock server implementations";
185998186430 license = stdenv.lib.licenses.bsd3;
@@ -186161,8 +186593,8 @@ self: {
186161186593 pname = "servant-js";
186162186594 version = "0.9.3.2";
186163186595 sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02";
186164− revision = "2";
186165− editedCabalFile = "1mz21yf77nzfb30hlqncyx3jwr50ab7qh0m0cv8pds6s76s6k9sj";
186596+ revision = "3";
186597+ editedCabalFile = "0j5kmqzhkyb1wmvyxz0r20473myzp9bqcdgjbi8i4k1lfvcjsigq";
186166186598 isLibrary = true;
186167186599 isExecutable = true;
186168186600 libraryHaskellDepends = [
@@ -186264,8 +186696,8 @@ self: {
186264186696 pname = "servant-mock";
186265186697 version = "0.8.4";
186266186698 sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr";
186267− revision = "2";
186268− editedCabalFile = "0brnvssfcg105kkkj646wih8apnhd5gvy25c576i93x0nxb0n39j";
186699+ revision = "3";
186700+ editedCabalFile = "13sbgnzr0yfrbrbvzc6v66lxrgvg3pb7h9alvmg77kmm95gmx8mm";
186269186701 isLibrary = true;
186270186702 isExecutable = true;
186271186703 libraryHaskellDepends = [
@@ -186658,6 +187090,8 @@ self: {
186658187090 pname = "servant-server";
186659187091 version = "0.14.1";
186660187092 sha256 = "1fnxmy6k0ml11035ac4x2knvpraxpc0g076wx3a9k013xyqi0h02";
187093+ revision = "1";
187094+ editedCabalFile = "028vqbmqkc9gjsk34n74ssi0xfn085v26zdvpixgfi5yd7cvfg03";
186661187095 isLibrary = true;
186662187096 isExecutable = true;
186663187097 setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -186922,6 +187356,33 @@ self: {
186922187356 license = stdenv.lib.licenses.bsd3;
186923187357 }) {};
186924187358
187359+ "servant-swagger_1_1_6" = callPackage
187360+ ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
187361+ , Cabal, cabal-doctest, directory, doctest, filepath, hspec
187362+ , hspec-discover, http-media, insert-ordered-containers, lens
187363+ , QuickCheck, servant, singleton-bool, swagger2, template-haskell
187364+ , text, time, unordered-containers, utf8-string
187365+ }:
187366+ mkDerivation {
187367+ pname = "servant-swagger";
187368+ version = "1.1.6";
187369+ sha256 = "1gx61328ciprc6ps8xzawfj483s28h5z21zmqczqqh3wfvc8h77w";
187370+ setupHaskellDepends = [ base Cabal cabal-doctest ];
187371+ libraryHaskellDepends = [
187372+ aeson aeson-pretty base bytestring hspec http-media
187373+ insert-ordered-containers lens QuickCheck servant singleton-bool
187374+ swagger2 text unordered-containers
187375+ ];
187376+ testHaskellDepends = [
187377+ aeson base base-compat directory doctest filepath hspec lens
187378+ QuickCheck servant swagger2 template-haskell text time utf8-string
187379+ ];
187380+ testToolDepends = [ hspec-discover ];
187381+ description = "Generate Swagger specification for your servant API";
187382+ license = stdenv.lib.licenses.bsd3;
187383+ hydraPlatforms = stdenv.lib.platforms.none;
187384+ }) {};
187385+
186925187386 "servant-swagger-ui" = callPackage
186926187387 ({ mkDerivation, base, bytestring, file-embed-lzma, servant
186927187388 , servant-server, servant-swagger-ui-core, swagger2, text
@@ -186940,6 +187401,23 @@ self: {
186940187401 license = stdenv.lib.licenses.bsd3;
186941187402 }) {};
186942187403
187404+ "servant-swagger-ui_0_3_2_3_19_3" = callPackage
187405+ ({ mkDerivation, base, bytestring, file-embed-lzma, servant
187406+ , servant-server, servant-swagger-ui-core, swagger2, text
187407+ }:
187408+ mkDerivation {
187409+ pname = "servant-swagger-ui";
187410+ version = "0.3.2.3.19.3";
187411+ sha256 = "0s2y6fhm26gzs344ig86nh6d1sy2dxfqpwpgz6c2dcg65jcbbpc7";
187412+ libraryHaskellDepends = [
187413+ base bytestring file-embed-lzma servant servant-server
187414+ servant-swagger-ui-core swagger2 text
187415+ ];
187416+ description = "Servant swagger ui";
187417+ license = stdenv.lib.licenses.bsd3;
187418+ hydraPlatforms = stdenv.lib.platforms.none;
187419+ }) {};
187420+
186943187421 "servant-swagger-ui-core" = callPackage
186944187422 ({ mkDerivation, base, blaze-markup, bytestring, http-media
186945187423 , servant, servant-blaze, servant-server, swagger2, text
@@ -186960,16 +187438,33 @@ self: {
186960187438 license = stdenv.lib.licenses.bsd3;
186961187439 }) {};
186962187440
187441+ "servant-swagger-ui-core_0_3_2" = callPackage
187442+ ({ mkDerivation, base, blaze-markup, bytestring, http-media
187443+ , servant, servant-blaze, servant-server, swagger2, text
187444+ , transformers, transformers-compat, wai-app-static
187445+ }:
187446+ mkDerivation {
187447+ pname = "servant-swagger-ui-core";
187448+ version = "0.3.2";
187449+ sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2";
187450+ libraryHaskellDepends = [
187451+ base blaze-markup bytestring http-media servant servant-blaze
187452+ servant-server swagger2 text transformers transformers-compat
187453+ wai-app-static
187454+ ];
187455+ description = "Servant swagger ui core components";
187456+ license = stdenv.lib.licenses.bsd3;
187457+ hydraPlatforms = stdenv.lib.platforms.none;
187458+ }) {};
187459+
186963187460 "servant-swagger-ui-jensoleg" = callPackage
186964187461 ({ mkDerivation, base, bytestring, file-embed-lzma, servant
186965187462 , servant-server, servant-swagger-ui-core, swagger2, text
186966187463 }:
186967187464 mkDerivation {
186968187465 pname = "servant-swagger-ui-jensoleg";
186969− version = "0.3";
186970− sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik";
186971− revision = "2";
186972− editedCabalFile = "1rghdc3gbwcrp2iz8xaw82y48asbb84fxj574p38pwsb3lwfxrw4";
187466+ version = "0.3.2";
187467+ sha256 = "1ybkwa6dyi9v1rcqd0gzl1hqkinkmsqwz0ang0cmsa6d8ym3zmii";
186973187468 libraryHaskellDepends = [
186974187469 base bytestring file-embed-lzma servant servant-server
186975187470 servant-swagger-ui-core swagger2 text
@@ -186984,10 +187479,8 @@ self: {
186984187479 }:
186985187480 mkDerivation {
186986187481 pname = "servant-swagger-ui-redoc";
186987− version = "0.3.0.1.21.2";
186988− sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl";
186989− revision = "2";
186990− editedCabalFile = "0am6kh3r8av69n5778rr84k92xifi9gfgsrpfnw2vs9krq94gph8";
187482+ version = "0.3.2.1.22.2";
187483+ sha256 = "0d4r6rp48lkgd4903hfja14mlar1h17hrb4fhq05p3wga7kik6g0";
186991187484 libraryHaskellDepends = [
186992187485 base bytestring file-embed-lzma servant servant-server
186993187486 servant-swagger-ui-core swagger2 text
@@ -187072,8 +187565,8 @@ self: {
187072187565 pname = "servant-yaml";
187073187566 version = "0.1.0.0";
187074187567 sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
187075− revision = "21";
187076− editedCabalFile = "1xrlhbgh54ny4xiqcdbka7i86wkyyqndwwv3r3k47xdr5683iyc1";
187568+ revision = "22";
187569+ editedCabalFile = "1mi52j2c7960k0qmxqd7238yxgbccb0xgfj3ahh0zfckficn9bk7";
187077187570 libraryHaskellDepends = [
187078187571 base bytestring http-media servant yaml
187079187572 ];
@@ -188414,6 +188907,32 @@ self: {
188414188907 maintainers = with stdenv.lib.maintainers; [ psibi ];
188415188908 }) {};
188416188909
188910+ "shakespeare_2_0_19" = callPackage
188911+ ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
188912+ , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
188913+ , process, scientific, template-haskell, text, time, transformers
188914+ , unordered-containers, vector
188915+ }:
188916+ mkDerivation {
188917+ pname = "shakespeare";
188918+ version = "2.0.19";
188919+ sha256 = "0h1nmdpizw4bvpkxlnrwq02r3wnk01z4jqid12hp30bi577yqd5l";
188920+ libraryHaskellDepends = [
188921+ aeson base blaze-html blaze-markup bytestring containers directory
188922+ exceptions ghc-prim parsec process scientific template-haskell text
188923+ time transformers unordered-containers vector
188924+ ];
188925+ testHaskellDepends = [
188926+ aeson base blaze-html blaze-markup bytestring containers directory
188927+ exceptions ghc-prim hspec HUnit parsec process template-haskell
188928+ text time transformers
188929+ ];
188930+ description = "A toolkit for making compile-time interpolated templates";
188931+ license = stdenv.lib.licenses.mit;
188932+ hydraPlatforms = stdenv.lib.platforms.none;
188933+ maintainers = with stdenv.lib.maintainers; [ psibi ];
188934+ }) {};
188935+
188417188936 "shakespeare-babel" = callPackage
188418188937 ({ mkDerivation, base, classy-prelude, data-default, directory
188419188938 , process, shakespeare, template-haskell
@@ -189956,8 +190475,8 @@ self: {
189956190475 }:
189957190476 mkDerivation {
189958190477 pname = "simple-logging";
189959− version = "0.2.0.4";
189960− sha256 = "13f6562rhk5bb5b2rmn0zsw2pil6qis463kx9d684j2m0qnqifdm";
190478+ version = "0.2.0.5";
190479+ sha256 = "1xli7ypsqbqv0yx58z0g7fbg5i83rkwwgv65hlx5cpfip4ks3qnn";
189961190480 libraryHaskellDepends = [
189962190481 aeson base bytestring directory exceptions filepath hscolour
189963190482 iso8601-time lens mtl simple-effects string-conv text time uuid
@@ -190866,6 +191385,8 @@ self: {
190866191385 pname = "size-based";
190867191386 version = "0.1.1.0";
190868191387 sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki";
191388+ revision = "1";
191389+ editedCabalFile = "1rw9ddw1vyv9k47p0d79qbvngym005fmz00hqrg3p1rq2vlfjdv2";
190869191390 libraryHaskellDepends = [
190870191391 base dictionary-sharing template-haskell testing-type-modifiers
190871191392 ];
@@ -190873,6 +191394,22 @@ self: {
190873191394 license = stdenv.lib.licenses.bsd3;
190874191395 }) {};
190875191396
191397+ "size-based_0_1_2_0" = callPackage
191398+ ({ mkDerivation, base, dictionary-sharing, template-haskell
191399+ , testing-type-modifiers
191400+ }:
191401+ mkDerivation {
191402+ pname = "size-based";
191403+ version = "0.1.2.0";
191404+ sha256 = "06hmlic0n73ncwlkpx49xlv09bzsrr27ncnp5byhzlknak2gd7vp";
191405+ libraryHaskellDepends = [
191406+ base dictionary-sharing template-haskell testing-type-modifiers
191407+ ];
191408+ description = "Sized functors, for size-based enumerations";
191409+ license = stdenv.lib.licenses.bsd3;
191410+ hydraPlatforms = stdenv.lib.platforms.none;
191411+ }) {};
191412+
190876191413 "sized" = callPackage
190877191414 ({ mkDerivation, base, constraints, containers, deepseq
190878191415 , equational-reasoning, ghc-typelits-presburger, hashable, lens
@@ -191112,6 +191649,8 @@ self: {
191112191649 pname = "skews";
191113191650 version = "0.1.0.1";
191114191651 sha256 = "03dn42hj50g4if1biln8m9rzf54iccqivkdciw06yrvx7q64hi5m";
191652+ revision = "1";
191653+ editedCabalFile = "0zvqfr9dfcap3ljpkq5hq95npmhrmndlh0gs4pa2zm8bwrh1nl66";
191115191654 libraryHaskellDepends = [ base bytestring deque websockets ];
191116191655 testHaskellDepends = [
191117191656 async base bytestring deque envy hspec network websockets
@@ -191347,6 +191886,30 @@ self: {
191347191886 hydraPlatforms = stdenv.lib.platforms.none;
191348191887 }) {};
191349191888
191889+ "slack-web_0_2_0_7" = callPackage
191890+ ({ mkDerivation, aeson, base, containers, errors, hspec
191891+ , http-api-data, http-client, http-client-tls, megaparsec, mtl
191892+ , servant, servant-client, servant-client-core, text, time
191893+ , transformers
191894+ }:
191895+ mkDerivation {
191896+ pname = "slack-web";
191897+ version = "0.2.0.7";
191898+ sha256 = "1jd8ca2d4bhq08ddqv87bnj2wqad89cqmsawvffl8mqki3hrca9x";
191899+ libraryHaskellDepends = [
191900+ aeson base containers errors http-api-data http-client
191901+ http-client-tls megaparsec mtl servant servant-client
191902+ servant-client-core text time transformers
191903+ ];
191904+ testHaskellDepends = [
191905+ aeson base containers errors hspec http-api-data megaparsec text
191906+ time
191907+ ];
191908+ description = "Bindings for the Slack web API";
191909+ license = stdenv.lib.licenses.mit;
191910+ hydraPlatforms = stdenv.lib.platforms.none;
191911+ }) {};
191912+
191350191913 "slate" = callPackage
191351191914 ({ mkDerivation, base, directory, filepath, htoml
191352191915 , optparse-applicative, process, string-conversions
@@ -192260,8 +192823,8 @@ self: {
192260192823 pname = "snap-core";
192261192824 version = "1.0.3.2";
192262192825 sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc";
192263− revision = "1";
192264− editedCabalFile = "08ll71h3rv9bppr7xrflg4y627vnmxgfhby1kli9cj0a7ryspam1";
192826+ revision = "2";
192827+ editedCabalFile = "0m0rjsgv0lkd0y9ragn478ibw98c9iys4mrj26x8ihasdnzgkqxq";
192265192828 libraryHaskellDepends = [
192266192829 attoparsec base bytestring bytestring-builder case-insensitive
192267192830 containers directory filepath hashable HUnit io-streams lifted-base
@@ -192464,8 +193027,8 @@ self: {
192464193027 pname = "snap-server";
192465193028 version = "1.1.0.0";
192466193029 sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4";
192467− revision = "1";
192468− editedCabalFile = "1lyx51zr1cmjyvsfplxpzv87agvvv83v3ww8m01fdh7x31np1chc";
193030+ revision = "2";
193031+ editedCabalFile = "03jmxbz9bf0yr3vzf3xa7ajbz3q9i6cn7bzqan4vy5f26c0n6xld";
192469193032 configureFlags = [ "-fopenssl" ];
192470193033 isLibrary = true;
192471193034 isExecutable = true;
@@ -195372,48 +195935,47 @@ self: {
195372195935 }) {};
195373195936
195374195937 "sprinkles" = callPackage
195375− ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
195376− , Cabal, case-insensitive, cereal, classy-prelude, containers, curl
195377− , data-default, directory, filepath, ginger, Glob, hashable, HDBC
195938+ ({ mkDerivation, aeson, aeson-pretty, array, async, base
195939+ , base64-bytestring, bcrypt, bytestring, Cabal, case-insensitive
195940+ , cereal, containers, css-syntax, curl, data-default, directory
195941+ , extra, file-embed, filepath, ginger, Glob, hashable, HDBC
195378195942 , HDBC-mysql, HDBC-postgresql, HDBC-sqlite3, heredoc, hsyslog, HTTP
195379− , http-types, memcached-binary, mime-types, mtl, network-uri
195380− , pandoc, pandoc-creole, pandoc-types, parsec, process
195381− , random-shuffle, regex-base, regex-pcre, safe, scientific
195382− , system-locale, tasty, tasty-hunit, tasty-quickcheck
195943+ , http-types, lens, memcache, mime-types, mtl, network-uri, nonce
195944+ , pandoc, pandoc-types, parsec, process, random, random-shuffle
195945+ , regex-base, regex-pcre, safe, scientific, SHA, split, stm
195946+ , system-locale, tagsoup, tasty, tasty-hunit, tasty-quickcheck
195383195947 , template-haskell, temporary, text, time, transformers
195384− , unix-compat, unordered-containers, utf8-string, vector, wai
195385− , wai-extra, wai-handler-fastcgi, warp, yaml
195948+ , unix-compat, unix-time, unordered-containers, utf8-string, vector
195949+ , wai, wai-extra, wai-handler-fastcgi, warp, yaml, yeshql-hdbc
195386195950 }:
195387195951 mkDerivation {
195388195952 pname = "sprinkles";
195389− version = "0.3.5.0";
195390− sha256 = "1xsq4rxslz53ki9ivjs7chfyqnrdy6q1yn1sb1bf4bcd09255rxn";
195953+ version = "0.6.0.0";
195954+ sha256 = "0kc4zg3brys6w7ccih74k4drsrahkbr66islgv1kjqpbkjfh5bk7";
195391195955 isLibrary = true;
195392195956 isExecutable = true;
195393195957 libraryHaskellDepends = [
195394− aeson aeson-pretty array base bytestring Cabal case-insensitive
195395− cereal classy-prelude containers curl data-default directory
195396− filepath ginger Glob hashable HDBC HDBC-mysql HDBC-postgresql
195397− HDBC-sqlite3 hsyslog HTTP http-types memcached-binary mime-types
195398− mtl network-uri pandoc pandoc-creole pandoc-types parsec process
195399− random-shuffle regex-base regex-pcre safe scientific system-locale
195400− template-haskell text time transformers unix-compat
195401− unordered-containers utf8-string vector wai wai-extra
195402− wai-handler-fastcgi warp yaml
195958+ aeson aeson-pretty array base base64-bytestring bcrypt bytestring
195959+ Cabal case-insensitive cereal containers css-syntax curl
195960+ data-default directory extra file-embed filepath ginger Glob
195961+ hashable HDBC HDBC-mysql HDBC-postgresql HDBC-sqlite3 heredoc
195962+ hsyslog HTTP http-types lens memcache mime-types mtl network-uri
195963+ nonce pandoc pandoc-types parsec process random random-shuffle
195964+ regex-base regex-pcre safe scientific SHA split stm system-locale
195965+ tagsoup template-haskell text time transformers unix-compat
195966+ unix-time unordered-containers utf8-string vector wai wai-extra
195967+ wai-handler-fastcgi warp yaml yeshql-hdbc
195403195968 ];
195404195969 executableHaskellDepends = [
195405− base classy-prelude data-default parsec safe
195970+ async base data-default parsec safe text
195406195971 ];
195407195972 testHaskellDepends = [
195408− base classy-prelude data-default directory filepath heredoc
195409− regex-base regex-pcre tasty tasty-hunit tasty-quickcheck temporary
195410− wai-extra
195973+ base data-default directory filepath heredoc regex-base regex-pcre
195974+ tasty tasty-hunit tasty-quickcheck temporary wai-extra
195411195975 ];
195412195976 description = "JSON API to HTML website wrapper";
195413195977 license = stdenv.lib.licenses.bsd3;
195414− hydraPlatforms = stdenv.lib.platforms.none;
195415− broken = true;
195416− }) {pandoc-creole = null;};
195978+ }) {};
195417195979
195418195980 "spritz" = callPackage
195419195981 ({ mkDerivation, base, lens, mtl, vector }:
@@ -196305,11 +196867,11 @@ self: {
196305196867 , Cabal, conduit, conduit-extra, containers, cryptonite
196306196868 , cryptonite-conduit, deepseq, directory, echo, exceptions, extra
196307196869 , file-embed, filelock, filepath, fsnotify, generic-deriving
196308− , gitrev, hackage-security, hashable, hpack, hpc, hspec
196309− , http-client, http-client-tls, http-conduit, http-types, memory
196310− , microlens, mintty, monad-logger, mono-traversable, mtl, mustache
196870+ , hackage-security, hashable, hpack, hpc, hspec, http-client
196871+ , http-client-tls, http-conduit, http-types, memory, microlens
196872+ , mintty, monad-logger, mono-traversable, mtl, mustache
196311196873 , neat-interpolation, network-uri, open-browser
196312− , optparse-applicative, optparse-simple, path, path-io, persistent
196874+ , optparse-applicative, path, path-io, persistent
196313196875 , persistent-sqlite, persistent-template, pretty, primitive
196314196876 , process, project-template, QuickCheck, regex-applicative-text
196315196877 , resourcet, retry, rio, semigroups, smallcheck, split, stm, store
@@ -196320,10 +196882,14 @@ self: {
196320196882 }:
196321196883 mkDerivation {
196322196884 pname = "stack";
196323− version = "1.7.1";
196324− sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
196325− revision = "10";
196326− editedCabalFile = "1985lm9m6pm9mi4h4m2nrn9v2rnnfh14slcnqgyxy6k934xqvg35";
196885+ version = "1.9.1";
196886+ sha256 = "0s4n7as8zfs1k1ay0h5rzw6r3q1fhf5fa9w7xrzh4a4p1k09ldhk";
196887+ revision = "2";
196888+ editedCabalFile = "0vl61spx2jmq2hzjvvw7a270s3lhg1m7faxlxpd4zkyabpwba9ky";
196889+ configureFlags = [
196890+ "-fdisable-git-info" "-fhide-dependency-versions"
196891+ "-fsupported-build"
196892+ ];
196327196893 isLibrary = true;
196328196894 isExecutable = true;
196329196895 setupHaskellDepends = [ base Cabal filepath ];
@@ -196349,15 +196915,15 @@ self: {
196349196915 base64-bytestring bindings-uname bytestring Cabal conduit
196350196916 conduit-extra containers cryptonite cryptonite-conduit deepseq
196351196917 directory echo exceptions extra file-embed filelock filepath
196352− fsnotify generic-deriving gitrev hackage-security hashable hpack
196353− hpc http-client http-client-tls http-conduit http-types memory
196918+ fsnotify generic-deriving hackage-security hashable hpack hpc
196919+ http-client http-client-tls http-conduit http-types memory
196354196920 microlens mintty monad-logger mono-traversable mtl mustache
196355196921 neat-interpolation network-uri open-browser optparse-applicative
196356− optparse-simple path path-io persistent persistent-sqlite
196357− persistent-template pretty primitive process project-template
196358− regex-applicative-text resourcet retry rio semigroups split stm
196359− store store-core streaming-commons tar template-haskell temporary
196360− text text-metrics th-reify-many time tls transformers typed-process
196922+ path path-io persistent persistent-sqlite persistent-template
196923+ pretty primitive process project-template regex-applicative-text
196924+ resourcet retry rio semigroups split stm store store-core
196925+ streaming-commons tar template-haskell temporary text text-metrics
196926+ th-reify-many time tls transformers typed-process
196361196927 unicode-transforms unix unix-compat unliftio unordered-containers
196362196928 vector yaml zip-archive zlib
196363196929 ];
@@ -200102,8 +200668,8 @@ self: {
200102200668 }:
200103200669 mkDerivation {
200104200670 pname = "structured-cli";
200105− version = "0.9.4.1";
200106− sha256 = "15dyr7a122d43ddkadn6syy356yccp0gk087bw5slv80isgp95zi";
200671+ version = "2.0.0.1";
200672+ sha256 = "1xgf49pd1dm80qp1h14f2nyqv71axrijrd8k66jmmqkczf24jah2";
200107200673 isLibrary = true;
200108200674 isExecutable = true;
200109200675 libraryHaskellDepends = [
@@ -201469,6 +202035,8 @@ self: {
201469202035 pname = "swagger2";
201470202036 version = "2.3.0.1";
201471202037 sha256 = "1l8piv2phl8kq3rgna8wld80b569vazqk2ll1rgs5iakm42lxr1f";
202038+ revision = "1";
202039+ editedCabalFile = "12w7bsld9wp2nm61vwdwb6ndjd3g99i0g4hjr32mrycmf41yvs1a";
201472202040 setupHaskellDepends = [ base Cabal cabal-doctest ];
201473202041 libraryHaskellDepends = [
201474202042 aeson base base-compat-batteries bytestring containers generics-sop
@@ -206557,6 +207125,8 @@ self: {
206557207125 pname = "texrunner";
206558207126 version = "0.0.1.2";
206559207127 sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy";
207128+ revision = "1";
207129+ editedCabalFile = "137bbyxrrg9yn1060aqkamdk1mb7x12nwndradwp57057ix79fp4";
206560207130 libraryHaskellDepends = [
206561207131 attoparsec base bytestring directory filepath io-streams mtl
206562207132 process semigroups temporary
@@ -210840,8 +211410,8 @@ self: {
210840211410 }:
210841211411 mkDerivation {
210842211412 pname = "toodles";
210843− version = "0.1.0.6";
210844− sha256 = "18i8y9bmpysyz8mbjc1wksw1m35z78ljv0b3k5qxjav8fswfv0la";
211413+ version = "0.1.0.9";
211414+ sha256 = "01gjxd4pclilm19iw7nkr23pmyavd7d9k0wa1c63hwhdzm1591f7";
210845211415 isLibrary = false;
210846211416 isExecutable = true;
210847211417 enableSeparateDataOutput = true;
@@ -210987,12 +211557,12 @@ self: {
210987211557 }) {};
210988211558
210989211559 "total-map" = callPackage
210990− ({ mkDerivation, base, containers }:
211560+ ({ mkDerivation, base, containers, semiring-num }:
210991211561 mkDerivation {
210992211562 pname = "total-map";
210993− version = "0.0.7";
210994− sha256 = "0chcnvsn3bzjmmp2bq6kxli1c73d477i49jbvnmqwz56an84ink1";
210995− libraryHaskellDepends = [ base containers ];
211563+ version = "0.0.8";
211564+ sha256 = "0qzlpcczj5nh786070qp5ln1l8j5qbzdx7dmx08lmc69gf6dwf4i";
211565+ libraryHaskellDepends = [ base containers semiring-num ];
210996211566 description = "Finitely represented /total/ maps";
210997211567 license = stdenv.lib.licenses.bsd3;
210998211568 hydraPlatforms = stdenv.lib.platforms.none;
@@ -214905,6 +215475,8 @@ self: {
214905215475 pname = "tzdata";
214906215476 version = "0.1.20180501.0";
214907215477 sha256 = "0nnzvkm6r7cq4g14zjxzgxx63sy8pxkg2whfgq6knpzhgran9n45";
215478+ revision = "1";
215479+ editedCabalFile = "19iqfzmh8xvd3cqlr1lp673232gk59z335xqbv18d4yy5qxc2fj0";
214908215480 enableSeparateDataOutput = true;
214909215481 libraryHaskellDepends = [
214910215482 base bytestring containers deepseq vector
@@ -219674,8 +220246,8 @@ self: {
219674220246 ({ mkDerivation, base, containers, doctest, vector-space }:
219675220247 mkDerivation {
219676220248 pname = "vector-space-map";
219677− version = "0.2.0";
219678− sha256 = "092lr61hi8sm0i4302r7zy2s08b4d97k5hyrbnkvnyhfi1529v6f";
220249+ version = "0.2.1.1";
220250+ sha256 = "1sg5jgk0kll0jbi66m70ymr085hgvz4kcbvcbn9427w1imbnjfdq";
219679220251 libraryHaskellDepends = [ base containers vector-space ];
219680220252 testHaskellDepends = [ base doctest ];
219681220253 description = "vector-space operations for finite maps using Data.Map";
@@ -220805,7 +221377,7 @@ self: {
220805221377 license = stdenv.lib.licenses.bsd3;
220806221378 }) {};
220807221379
220808− "vty_5_24_1" = callPackage
221380+ "vty_5_25" = callPackage
220809221381 ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
220810221382 , deepseq, directory, filepath, hashable, HUnit, microlens
220811221383 , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -220816,8 +221388,8 @@ self: {
220816221388 }:
220817221389 mkDerivation {
220818221390 pname = "vty";
220819− version = "5.24.1";
220820− sha256 = "0xd9p9p1bfma5mvn9k4hv4h7sji2hq27b4lg6czgiwf97dmdw3yc";
221391+ version = "5.25";
221392+ sha256 = "1m37q8l4ynnhyln1hkwxrmgysslb5d6nvnvx667q4q004dhrcr91";
220821221393 isLibrary = true;
220822221394 isExecutable = true;
220823221395 libraryHaskellDepends = [
@@ -222130,21 +222702,23 @@ self: {
222130222702 }) {};
222131222703
222132222704 "wai-middleware-throttle" = callPackage
222133− ({ mkDerivation, base, bytestring, bytestring-builder, containers
222134− , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm
222135− , text, token-bucket, transformers, wai, wai-extra
222705+ ({ mkDerivation, base, bytestring, bytestring-builder, cache, clock
222706+ , containers, hashable, hspec, http-types, HUnit, mtl, network
222707+ , QuickCheck, safe-exceptions, stm, text, token-bucket
222708+ , transformers, wai, wai-extra
222136222709 }:
222137222710 mkDerivation {
222138222711 pname = "wai-middleware-throttle";
222139− version = "0.2.2.1";
222140− sha256 = "1z4n7ja5kq7cl2117w8wx0kz3fjdzr3mlvx6m76jbgp0504vjgja";
222712+ version = "0.3.0.0";
222713+ sha256 = "16qhfqc0f5ahz2qc04a4by6iw1agxzcf14aqqkf1arf0hknvbvvv";
222141222714 libraryHaskellDepends = [
222142− base bytestring bytestring-builder containers hashable http-types
222143− mtl network stm text token-bucket transformers wai
222715+ base bytestring bytestring-builder cache clock containers hashable
222716+ http-types mtl network safe-exceptions stm text token-bucket
222717+ transformers wai
222144222718 ];
222145222719 testHaskellDepends = [
222146− base bytestring hspec http-types HUnit QuickCheck stm transformers
222147− wai wai-extra
222720+ base bytestring cache clock hspec http-types HUnit QuickCheck stm
222721+ transformers wai wai-extra
222148222722 ];
222149222723 description = "WAI Middleware for Request Throttling";
222150222724 license = stdenv.lib.licenses.bsd3;
@@ -222995,8 +223569,8 @@ self: {
222995223569 }:
222996223570 mkDerivation {
222997223571 pname = "wavefront";
222998− version = "0.7.1.2";
222999− sha256 = "047hdcvrkh4xwyp8i18w45qx7nhd59iii34nrh6ih9k77l6rr4qj";
223572+ version = "0.7.1.3";
223573+ sha256 = "1sly9gxq06n4x262fav0zvfzhgnxca1xwh4q7b4lq6g3gpwld9s5";
223000223574 libraryHaskellDepends = [
223001223575 attoparsec base dlist filepath mtl text transformers vector
223002223576 ];
@@ -225986,6 +226560,8 @@ self: {
225986226560 pname = "wss-client";
225987226561 version = "0.2.1.1";
225988226562 sha256 = "1wgqd8hh22ld72c1ccfr191ydqb5fija6c1l0vbg7n8pldhmi92w";
226563+ revision = "1";
226564+ editedCabalFile = "03q6mpdy93y8kjmjcxpjasg6q1mg64az28z99gm2w2iih3mqa702";
225989226565 isLibrary = true;
225990226566 isExecutable = true;
225991226567 libraryHaskellDepends = [
@@ -230241,6 +230817,43 @@ self: {
230241230817 license = stdenv.lib.licenses.mit;
230242230818 }) {};
230243230819
230820+ "yesod-core_1_6_8_1" = callPackage
230821+ ({ mkDerivation, aeson, async, auto-update, base, blaze-html
230822+ , blaze-markup, byteable, bytestring, case-insensitive, cereal
230823+ , clientsession, conduit, conduit-extra, containers, cookie
230824+ , deepseq, fast-logger, gauge, hspec, hspec-expectations
230825+ , http-types, HUnit, monad-logger, mtl, network, parsec
230826+ , path-pieces, primitive, random, resourcet, rio, shakespeare
230827+ , streaming-commons, template-haskell, text, time, transformers
230828+ , unix-compat, unliftio, unordered-containers, vector, wai
230829+ , wai-extra, wai-logger, warp, word8
230830+ }:
230831+ mkDerivation {
230832+ pname = "yesod-core";
230833+ version = "1.6.8.1";
230834+ sha256 = "0kqgpcz1jihc80haidzx6cm75ak139q41195j8l3gz1vwbf94i9j";
230835+ libraryHaskellDepends = [
230836+ aeson auto-update base blaze-html blaze-markup byteable bytestring
230837+ case-insensitive cereal clientsession conduit conduit-extra
230838+ containers cookie deepseq fast-logger http-types monad-logger mtl
230839+ parsec path-pieces primitive random resourcet rio shakespeare
230840+ template-haskell text time transformers unix-compat unliftio
230841+ unordered-containers vector wai wai-extra wai-logger warp word8
230842+ ];
230843+ testHaskellDepends = [
230844+ async base bytestring clientsession conduit conduit-extra
230845+ containers cookie hspec hspec-expectations http-types HUnit network
230846+ path-pieces random resourcet shakespeare streaming-commons
230847+ template-haskell text transformers unliftio wai wai-extra warp
230848+ ];
230849+ benchmarkHaskellDepends = [
230850+ base blaze-html bytestring gauge shakespeare text
230851+ ];
230852+ description = "Creation of type-safe, RESTful web applications";
230853+ license = stdenv.lib.licenses.mit;
230854+ hydraPlatforms = stdenv.lib.platforms.none;
230855+ }) {};
230856+
230244230857 "yesod-crud" = callPackage
230245230858 ({ mkDerivation, base, classy-prelude, containers, MissingH
230246230859 , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -230447,8 +231060,8 @@ self: {
230447231060 }:
230448231061 mkDerivation {
230449231062 pname = "yesod-fay";
230450− version = "0.8.0";
230451− sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf";
231063+ version = "0.9.0";
231064+ sha256 = "186mxq6b5hl0ylsx9lajisywkc9klvbfbhq39pq497wk519ppc8s";
230452231065 libraryHaskellDepends = [
230453231066 aeson base bytestring data-default directory fay fay-dom filepath
230454231067 monad-loops process pureMD5 shakespeare template-haskell text
pkgs/development/interpreters/ruby/default.nix+11−11
@@ -111,8 +111,8 @@ let
111111
112112 postPatch = if isRuby25 then ''
113113 sed -i configure.ac -e '/config.guess/d'
114− cp ${config}/config.guess tool/
115− cp ${config}/config.sub tool/
114+ cp --remove-destination ${config}/config.guess tool/
115+ cp --remove-destination ${config}/config.sub tool/
116116 ''
117117 else opString useRailsExpress ''
118118 sed -i configure.in -e '/config.guess/d'
@@ -202,26 +202,26 @@ let
202202
203203in {
204204 ruby_2_3 = generic {
205− version = rubyVersion "2" "3" "7" "";
205+ version = rubyVersion "2" "3" "8" "";
206206 sha256 = {
207− src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m";
208− git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk";
207+ src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm";
208+ git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f";
209209 };
210210 };
211211
212212 ruby_2_4 = generic {
213− version = rubyVersion "2" "4" "4" "";
213+ version = rubyVersion "2" "4" "5" "";
214214 sha256 = {
215− src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5";
216− git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5";
215+ src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7";
216+ git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43";
217217 };
218218 };
219219
220220 ruby_2_5 = generic {
221− version = rubyVersion "2" "5" "1" "";
221+ version = rubyVersion "2" "5" "2" "";
222222 sha256 = {
223− src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s";
224− git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj";
223+ src = "0wgl1697sdiqh6ksgv40v627jp5557j1zi462krwnzhc9bk408xk";
224+ git = "00xy323q2f2v102hfgsj9k20vggvvmyhd6byfhbc1qwz2vyrvc47";
225225 };
226226 };
227227}
pkgs/development/interpreters/ruby/patchsets.nix+3−3
@@ -1,17 +1,17 @@
11{ patchSet, useRailsExpress, ops, patchLevel }:
22
33rec {
4− "2.3.7" = ops useRailsExpress [
4+ "2.3.8" = ops useRailsExpress [
55 "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
66 "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
77 "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
88 ];
9− "2.4.4" = ops useRailsExpress [
9+ "2.4.5" = ops useRailsExpress [
1010 "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
1111 "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
1212 "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
1313 ];
14− "2.5.1" = ops useRailsExpress [
14+ "2.5.2" = ops useRailsExpress [
1515 "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
1616 "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
1717 "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
pkgs/development/libraries/boost/generic.nix+6−9
@@ -101,21 +101,17 @@ stdenv.mkDerivation {
101101
102102 inherit src;
103103
104− patchFlags = optionalString (stdenv.hostPlatform.libc == "msvcrt") "-p0";
104+ patchFlags = "";
105+
105106 patches = patches
106− ++ optional stdenv.isDarwin ./darwin-no-system-python.patch
107− ++ optional (stdenv.hostPlatform.libc == "msvcrt") (fetchurl {
108− url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
109− + "boost-mingw.patch";
110− sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
111− });
107+ ++ optional stdenv.isDarwin ./darwin-no-system-python.patch;
112108
113109 meta = {
114110 homepage = http://boost.org/;
115111 description = "Collection of C++ libraries";
116112 license = stdenv.lib.licenses.boost;
117113
118− platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) platforms.unix;
114+ platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows);
119115 maintainers = with maintainers; [ peti wkennington ];
120116 };
121117
@@ -139,7 +135,8 @@ stdenv.mkDerivation {
139135
140136 enableParallelBuilding = true;
141137
142− nativeBuildInputs = [ which buildPackages.stdenv.cc ];
138+ nativeBuildInputs = [ which ];
139+ depsBuildBuild = [ buildPackages.stdenv.cc ];
143140 buildInputs = [ expat zlib bzip2 libiconv ]
144141 ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu
145142 ++ optional stdenv.isDarwin fixDarwinDylibNames
pkgs/development/libraries/c-ares/default.nix+2
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
1010 };
1111
12+ configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null;
13+
1214 # ares_android.h header is missing
1315 # see issue https://github.com/c-ares/c-ares/issues/216
1416 postPatch = if stdenv.hostPlatform.isAndroid then ''
pkgs/development/libraries/gpgme/default.nix+4−4
@@ -1,10 +1,10 @@
11{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
2−, file, which
2+, file, which, ncurses
33, autoreconfHook
44, git
55, texinfo
66, qtbase ? null
7−, withPython ? false, swig2 ? null, python ? null
7+, pythonSupport ? false, swig2 ? null, python ? null
88}:
99
1010let
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 ++ lib.optional (qtbase != null) qtbase;
3030
3131 nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
32− ++ lib.optionals withPython [ python swig2 which ];
32+ ++ lib.optionals pythonSupport [ python swig2 which ncurses ];
3333
3434 postPatch =''
3535 substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 configureFlags = [
3939 "--enable-fixed-path=${gnupg}/bin"
4040 "--with-libgpg-error-prefix=${libgpgerror.dev}"
41− ] ++ lib.optional withPython "--enable-languages=python";
41+ ] ++ lib.optional pythonSupport "--enable-languages=python";
4242
4343 NIX_CFLAGS_COMPILE =
4444 # qgpgme uses Q_ASSERT which retains build inputs at runtime unless
pkgs/development/libraries/libdbusmenu-qt/default.nix+1−1
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
2424 description = "Provides a Qt implementation of the DBusMenu spec";
2525 inherit homepage;
2626 inherit (qt4.meta) platforms;
27− license = licenses.gpl2;
27+ license = licenses.lgpl2;
2828 };
2929}
pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix+9−8
@@ -1,12 +1,13 @@
1−{ stdenv, fetchbzr, cmake, qtbase }:
1+{ stdenv, fetchgit, cmake, qtbase }:
22
3−stdenv.mkDerivation {
4− name = "libdbusmenu-qt-0.9.3+14";
3+stdenv.mkDerivation rec {
4+ name = "libdbusmenu-qt-${version}";
5+ version = "0.9.3+16";
56
6− src = fetchbzr {
7− url = "https://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk";
8− rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2";
9− sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd";
7+ src = fetchgit {
8+ url = https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt;
9+ rev = "import/${version}.04.20160218-1";
10+ sha256 = "039yvklhbmfbcynrbqq9n5ywmj8bjfslnkzcnwpzyhnxdzb6yxlx";
1011 };
1112
1213 buildInputs = [ qtbase ];
@@ -19,6 +20,6 @@ stdenv.mkDerivation {
1920 description = "Provides a Qt implementation of the DBusMenu spec";
2021 maintainers = [ maintainers.ttuegel ];
2122 inherit (qtbase.meta) platforms;
22− license = licenses.gpl2;
23+ license = licenses.lgpl2;
2324 };
2425}
pkgs/development/libraries/libgnome-keyring/default.nix+1−1
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
1616
1717 meta = {
1818 inherit (glib.meta) platforms maintainers;
19− license = stdenv.lib.licenses.gpl2;
19+ license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
2020 };
2121}
pkgs/development/libraries/libite/default.nix+1−1
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 '';
3232 platforms = platforms.unix;
3333 maintainers = with maintainers; [ fpletz ];
34− license = with licenses; [ mit isc ];
34+ license = with licenses; [ mit isc bsd2 bsd3 ];
3535 };
3636}
3737
pkgs/development/libraries/libjson/default.nix+10−3
@@ -11,10 +11,17 @@ in stdenv.mkDerivation rec {
1111 buildInputs = [ unzip ];
1212 makeFlags = [ "prefix=$(out)" ];
1313 preInstall = "mkdir -p $out/lib";
14− meta = {
14+
15+ meta = with stdenv.lib; {
1516 homepage = http://libjson.sourceforge.net/;
1617 description = "A JSON reader and writer";
17− 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.";
18− platforms = stdenv.lib.platforms.unix;
18+ longDescription = ''
19+ A JSON reader and writer which is super-efficient and
20+ usually runs circles around other JSON libraries.
21+ It's highly customizable to optimize for your particular project, and
22+ very lightweight. For Windows, OSX, or Linux. Works in any language.
23+ '';
24+ platforms = platforms.unix;
25+ license = licenses.bsd2;
1926 };
2027}
pkgs/development/libraries/libkate/default.nix+3−3
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 buildInputs = [ libogg libpng ];
1212
13− meta = {
13+ meta = with stdenv.lib; {
1414 description = "A library for encoding and decoding Kate streams";
1515 longDescription = ''
1616 This is libkate, the reference implementation of a codec for the Kate
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 in an Ogg container. It can carry Unicode text, images, and animate
1919 them.'';
2020 homepage = https://code.google.com/archive/p/libkate/;
21− maintainers = [ ];
22− platforms = stdenv.lib.platforms.unix;
21+ platforms = platforms.unix;
22+ license = licenses.bsd3;
2323 };
2424}
pkgs/development/libraries/liblastfm/default.nix+3−2
@@ -18,11 +18,12 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ pkgconfig which cmake ];
1919 buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
2020
21− meta = {
21+ meta = with stdenv.lib; {
2222 homepage = https://github.com/lastfm/liblastfm;
2323 repositories.git = git://github.com/lastfm/liblastfm.git;
2424 description = "Official LastFM library";
2525 inherit (qt4.meta) platforms;
26− maintainers = with stdenv.lib.maintainers; [ phreedom ];
26+ maintainers = [ maintainers.phreedom ];
27+ license = licenses.gpl3;
2728 };
2829}
pkgs/development/libraries/liblastfmSF/default.nix+1
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
1515 meta = {
1616 homepage = http://liblastfm.sourceforge.net;
1717 description = "Unofficial C lastfm library";
18+ license = stdenv.lib.licenses.gpl3;
1819 };
1920}
pkgs/development/libraries/liblqr-1/default.nix+1−1
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
1515 homepage = http://liblqr.wikidot.com;
1616 description = "Seam-carving C/C++ library called Liquid Rescaling";
1717 platforms = platforms.all;
18− maintainers = [ ];
18+ license = with licenses; [ gpl3 lgpl3 ];
1919 };
2020}
pkgs/development/libraries/libmilter/default.nix+1
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
3737 description = "Sendmail Milter mail filtering API library";
3838 platforms = platforms.unix;
3939 maintainers = with maintainers; [ fpletz ];
40+ license = licenses.sendmail;
4041 };
4142}
pkgs/development/libraries/libmms/default.nix+4−3
@@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ pkgconfig ];
1414
15− meta = {
15+ meta = with stdenv.lib; {
16+ description = "Library for downloading (streaming) media files using the mmst and mmsh protocols";
1617 homepage = http://libmms.sourceforge.net;
17− maintainers = [ ];
18− platforms = stdenv.lib.platforms.all;
18+ platforms = platforms.all;
19+ license = licenses.lgpl21;
1920 };
2021}
pkgs/development/libraries/libmp3splt/default.nix+1
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
1919 description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
2020 maintainers = with maintainers; [ bosu ];
2121 platforms = platforms.unix;
22+ license = licenses.gpl2;
2223 };
2324}
pkgs/development/libraries/libmtp/default.nix+3−3
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # tried to install files to /lib/udev, hopefully OK
1818 configureFlags = [ "--with-udev=$$bin/lib/udev" ];
1919
20− meta = {
20+ meta = with stdenv.lib; {
2121 homepage = http://libmtp.sourceforge.net;
2222 description = "An implementation of Microsoft's Media Transfer Protocol";
2323 longDescription = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 in the form of a library suitable primarily for POSIX compliant operating
2626 systems. We implement MTP Basic, the stuff proposed for standardization.
2727 '';
28− platforms = stdenv.lib.platforms.unix;
29− maintainers = [ ];
28+ platforms = platforms.unix;
29+ license = licenses.lgpl21;
3030 };
3131}
pkgs/development/libraries/libmusicbrainz/5.x.nix+3−3
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
1616
1717 dontUseCmakeBuildDir=true;
1818
19− meta = {
19+ meta = with stdenv.lib; {
2020 homepage = http://musicbrainz.org/doc/libmusicbrainz;
2121 description = "MusicBrainz Client Library (5.x version)";
2222 longDescription = ''
2323 The libmusicbrainz (also known as mb_client or MusicBrainz Client
2424 Library) is a development library geared towards developers who wish to
2525 add MusicBrainz lookup capabilities to their applications.'';
26− maintainers = [ ];
27− platforms = stdenv.lib.platforms.all;
26+ platforms = platforms.all;
27+ license = licenses.lgpl21;
2828 };
2929}
pkgs/development/libraries/libmusicbrainz/default.nix+3−3
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
1010 sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z";
1111 };
1212
13− meta = {
13+ meta = with stdenv.lib; {
1414 homepage = http://musicbrainz.org/doc/libmusicbrainz;
1515 description = "MusicBrainz Client Library (3.x version)";
1616 longDescription = ''
1717 The libmusicbrainz (also known as mb_client or MusicBrainz Client
1818 Library) is a development library geared towards developers who wish to
1919 add MusicBrainz lookup capabilities to their applications.'';
20− maintainers = [ ];
21− platforms = stdenv.lib.platforms.all;
20+ platforms = platforms.all;
21+ license = licenses.lgpl21;
2222 };
2323}
pkgs/development/libraries/libnatspec/default.nix+3−3
@@ -12,11 +12,11 @@ stdenv.mkDerivation (rec {
1212
1313 buildInputs = [ popt ];
1414
15− meta = {
15+ meta = with stdenv.lib; {
1616 homepage = http://natspec.sourceforge.net/ ;
1717 description = "A library intended to smooth national specificities in using of programs";
18− platforms = stdenv.lib.platforms.unix;
19− maintainers = [ ];
18+ platforms = platforms.unix;
19+ license = licenses.lgpl21;
2020 };
2121} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
2222 propagatedBuildInputs = [ libiconv ];
pkgs/development/libraries/libnetfilter_queue/default.nix+3−3
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
1212 nativeBuildInputs = [ pkgconfig ];
1313 buildInputs = [ libmnl libnfnetlink ];
1414
15− meta = {
15+ meta = with stdenv.lib; {
1616 homepage = http://www.netfilter.org/projects/libnetfilter_queue/;
1717 description = "Userspace API to packets queued by the kernel packet filter";
18−
19− platforms = stdenv.lib.platforms.linux;
18+ license = licenses.gpl2;
19+ platforms = platforms.linux;
2020 };
2121}
pkgs/development/libraries/libnice/default.nix+3−2
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory"
1616
17− meta = {
17+ meta = with stdenv.lib; {
1818 homepage = https://nice.freedesktop.org/wiki/;
1919 description = "The GLib ICE implementation";
2020 longDescription = ''
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 It provides a GLib-based library, libnice and a Glib-free library,
2626 libstun as well as GStreamer elements.'';
27− platforms = stdenv.lib.platforms.linux;
27+ platforms = platforms.linux;
28+ license = with licenses; [ lgpl21 mpl11 ];
2829 };
2930}
pkgs/development/libraries/libnotify/default.nix+3−2
@@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ];
1818 buildInputs = [ glib gdk_pixbuf ];
1919
20− meta = {
20+ meta = with stdenv.lib; {
2121 homepage = https://developer.gnome.org/notification-spec/;
2222 description = "A library that sends desktop notifications to a notification daemon";
23− platforms = stdenv.lib.platforms.unix;
23+ platforms = platforms.unix;
24+ license = licenses.lgpl21;
2425 };
2526}
pkgs/development/libraries/libnova/default.nix+5−4
@@ -2,15 +2,16 @@
22
33stdenv.mkDerivation rec {
44 name = "libnova-0.12.3";
5−
5+
66 src = fetchurl {
77 url = "mirror://sourceforge/libnova/${name}.tar.gz";
88 sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc";
99 };
10−
11− meta = {
10+
11+ meta = with stdenv.lib; {
1212 description = "Celestial Mechanics, Astrometry and Astrodynamics Library";
1313 homepage = http://libnova.sf.net;
14− platforms = stdenv.lib.platforms.unix;
14+ platforms = platforms.unix;
15+ license = licenses.gpl2;
1516 };
1617}
pkgs/development/libraries/liboauth/default.nix+1
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
2525 description = "C library implementing the OAuth secure authentication protocol";
2626 homepage = http://liboauth.sourceforge.net/;
2727 repositories.git = https://github.com/x42/liboauth.git;
28+ license = licenses.mit;
2829 };
2930
3031}
pkgs/development/libraries/libofa/default.nix+3−2
@@ -27,12 +27,13 @@ stdenv.mkDerivation rec {
2727
2828 propagatedBuildInputs = [ expat curl fftw ];
2929
30− meta = {
30+ meta = with stdenv.lib; {
3131 homepage = https://code.google.com/archive/p/musicip-libofa/;
3232 description = "Library Open Fingerprint Architecture";
3333 longDescription = ''
3434 LibOFA (Library Open Fingerprint Architecture) is an open-source audio
3535 fingerprint created and provided by MusicIP'';
36− platforms = stdenv.lib.platforms.linux;
36+ platforms = platforms.linux;
37+ license = licenses.gpl2;
3738 };
3839}
pkgs/development/libraries/liboggz/default.nix+3−3
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ pkgconfig ];
1414
15− meta = {
15+ meta = with stdenv.lib; {
1616 homepage = https://xiph.org/oggz/;
1717 description = "A C library and tools for manipulating with Ogg files and streams";
1818 longDescription = ''
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 interleaving data container developed by Monty at Xiph.Org, originally to
2828 support the Ogg Vorbis audio format but now used for many free codecs
2929 including Dirac, FLAC, Speex and Theora.'';
30− maintainers = [ ];
31− platforms = stdenv.lib.platforms.unix;
30+ platforms = platforms.unix;
31+ license = licenses.bsd3;
3232 };
3333}
pkgs/development/libraries/libpcap/default.nix+1
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
5050 description = "Packet Capture Library";
5151 platforms = platforms.unix;
5252 maintainers = with maintainers; [ fpletz ];
53+ license = licenses.bsd3;
5354 };
5455}
pkgs/development/libraries/librdf/redland.nix+4−2
@@ -38,8 +38,10 @@ stdenv.mkDerivation rec {
3838
3939 doCheck = false; # fails 1 out of 17 tests with a segmentation fault
4040
41− meta = {
41+ meta = with stdenv.lib; {
42+ description = "C libraries that provide support for the Resource Description Framework (RDF)";
4243 homepage = http://librdf.org/;
43− platforms = stdenv.lib.platforms.unix;
44+ platforms = platforms.unix;
45+ license = licenses.asl20;
4446 };
4547}
pkgs/development/libraries/msgpack/generic.nix−2
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
1515 cmakeFlags = []
1616 ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
1717 "-DMSGPACK_BUILD_EXAMPLES=OFF"
18− ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "msvcrt")
19− "-DCMAKE_SYSTEM_NAME=Windows"
2018 ;
2119
2220 meta = with stdenv.lib; {
pkgs/development/libraries/nghttp2/default.nix+7−2
@@ -6,6 +6,7 @@
66, enableAsioLib ? false, boost ? null
77, enableGetAssets ? false, libxml2 ? null
88, enableJemalloc ? false, jemalloc ? null
9+, enableApp ? !stdenv.hostPlatform.isWindows
910}:
1011
1112assert enableHpack -> jansson != null;
@@ -35,8 +36,12 @@ stdenv.mkDerivation rec {
3536
3637 enableParallelBuilding = true;
3738
38− configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" "--enable-app" ]
39− ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib";
39+ configureFlags = [
40+ "--with-spdylay=no"
41+ "--disable-examples"
42+ "--disable-python-bindings"
43+ (stdenv.lib.enableFeature enableApp "app")
44+ ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib";
4045
4146 #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
4247
pkgs/development/libraries/nlohmann_json/default.nix−2
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
1818
1919 cmakeFlags = [
2020 "-DBuildTests=${if doCheck then "ON" else "OFF"}"
21− ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
22− "-DCMAKE_SYSTEM_NAME=Windows"
2321 ];
2422
2523 doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
pkgs/development/libraries/range-v3/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "range-v3-${version}";
5− version = "0.3.7";
5+ version = "0.4.0";
66
77 src = fetchFromGitHub {
88 owner = "ericniebler";
99 repo = "range-v3";
1010 rev = version;
11− sha256 = "1zhsz1i4jy97idydg7ay3wazp7v2353vckkli5w9g51jka43h5x2";
11+ sha256 = "1s5gj799aa94nfg3r24whq7ck69g0zypf70w14wx64pgwg0424vf";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/sqlite/default.nix+1−1
@@ -79,6 +79,6 @@ stdenv.mkDerivation rec {
7979 homepage = http://www.sqlite.org/;
8080 license = licenses.publicDomain;
8181 maintainers = with maintainers; [ eelco np ];
82− platforms = platforms.unix;
82+ platforms = platforms.unix ++ platforms.windows;
8383 };
8484}
pkgs/development/libraries/wcslib/default.nix+2−2
@@ -1,14 +1,14 @@
11{ fetchurl, stdenv, flex }:
22
33stdenv.mkDerivation rec {
4− version = "5.19.1";
4+ version = "5.20";
55 name = "wcslib-${version}";
66
77 buildInputs = [ flex ];
88
99 src = fetchurl {
1010 url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
11− sha256 ="160gvz9xk4hvliwb75ry770qdf899kc89ij6r0y7fh60lbjz1far";
11+ sha256 ="1c8g9kv4dxrnawnqi4spi2p10s2xs7x75pdfxhbqxgcc97dkgh0b";
1212 };
1313
1414 prePatch = ''
pkgs/development/libraries/zlib/default.nix+2
@@ -82,4 +82,6 @@ stdenv.mkDerivation (rec {
8282 preConfigure = ''
8383 export CHOST=${stdenv.hostPlatform.config}
8484 '';
85+} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") {
86+ configurePhase = ":";
8587})
pkgs/development/python-modules/paho-mqtt/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
2+, pytestrunner, pytest, mock }:
3+
4+buildPythonPackage rec {
5+ pname = "paho-mqtt";
6+ version = "1.4.0";
7+
8+ # No tests in PyPI tarball
9+ src = fetchFromGitHub {
10+ owner = "eclipse";
11+ repo = "paho.mqtt.python";
12+ rev = "v${version}";
13+ sha256 = "1xg9ppz2lqacd9prsrx93q2wfkjjyla03xlfw74aj1alz9ki5hrs";
14+ };
15+
16+ postPatch = ''
17+ substituteInPlace setup.py --replace "pylama" ""
18+ substituteInPlace setup.cfg --replace "--pylama" ""
19+ '';
20+
21+ checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock;
22+
23+ meta = with lib; {
24+ homepage = https://eclipse.org/paho;
25+ description = "MQTT version 3.1.1 client class";
26+ license = licenses.epl10;
27+ maintainers = with maintainers; [ mog dotlambda ];
28+ };
29+}
pkgs/development/python-modules/sasmodels/default.nix+4−4
@@ -3,14 +3,14 @@
33}:
44
55buildPythonPackage rec {
6− pname = "sasmodels-unstable";
7− version = "2018-04-27";
6+ pname = "sasmodels";
7+ version = "0.98";
88
99 src = fetchFromGitHub {
1010 owner = "SasView";
1111 repo = "sasmodels";
12− rev = "33969b656596e8b6cc8ce934cd1f8062f7b11cf2";
13− sha256 = "00rvhafg08qvx0k9mzn1ppdkc9i5yfn2gr3hidrf416srf8zgb85";
12+ rev = "v${version}";
13+ sha256 = "02y4lpjwaa73pr46ylk0pw0kbill4nfzqgnfv16v5m0z9smd76ir";
1414 };
1515
1616 buildInputs = [ opencl-headers ];
pkgs/development/python-modules/voluptuous-serialize/default.nix+8−8
@@ -1,17 +1,14 @@
1−{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, voluptuous, pytest }:
1+{ stdenv, buildPythonPackage, isPy3k, fetchPypi, voluptuous, pytest }:
22
33buildPythonPackage rec {
44 pname = "voluptuous-serialize";
5− version = "2018-03-10";
5+ version = "2.0.0";
66
77 disabled = !isPy3k;
88
9− # no tests in PyPI tarball
10− src = fetchFromGitHub {
11− owner = "balloob";
12− repo = pname;
13− rev = "567f0d96f928cf6c30c9f1b8bdee729e651aac82";
14− sha256 = "0b16f1bxlqyvi1hy8wmzp2k0rzqcycmdhs8zwsyx0swnvkgwnv50";
9+ src = fetchPypi {
10+ inherit pname version;
11+ sha256 = "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41";
1512 };
1613
1714 propagatedBuildInputs = [
@@ -26,6 +23,9 @@ buildPythonPackage rec {
2623 py.test
2724 '';
2825
26+ # no tests in PyPI tarball
27+ doCheck = false;
28+
2929 meta = with stdenv.lib; {
3030 homepage = https://github.com/balloob/voluptuous-serialize;
3131 license = licenses.asl20;
pkgs/development/tools/analysis/snowman/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "snowman-${version}";
5− version = "0.1.2";
5+ version = "0.1.3";
66
77 src = fetchFromGitHub {
88 owner = "yegord";
99 repo = "snowman";
1010 rev = "v${version}";
11− sha256 = "1ry14n8jydg6rzl52gyn0qhmv6bvivk7iwssp89lq5qk8k183x3k";
11+ sha256 = "1mrmhj2nddi0d47c266vsg5vbapbqbcpj5ld4v1qcwnnk6z2zn0j";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/development/tools/global-platform-pro/default.nix+6−37
@@ -3,50 +3,20 @@
33# TODO: This is quite a bit of duplicated logic with gephi. Factor it out?
44stdenv.mkDerivation rec {
55 pname = "global-platform-pro";
6− version = "0.3.10-rc11"; # Waiting for release https://github.com/martinpaljak/GlobalPlatformPro/issues/128
7− describeVersion = "v0.3.10-rc11-0-g8923747"; # git describe --tags --always --long --dirty
6+ version = "18.09.14";
7+ GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty
88 name = "${pname}-${version}";
99
1010 src = fetchFromGitHub {
1111 owner = "martinpaljak";
1212 repo = "GlobalPlatformPro";
13− rev = "v${version}";
14− sha256 = "0rk81x2y7vx1caxm6wa59fjrfxmjn7s8yxaxm764p8m2qxk3m4y2";
13+ rev = "${version}";
14+ sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg";
1515 };
1616
17− # This patch hardcodes the return of a git command the build system tries to
18− # run. As `fetchFromGitHub` doesn't fetch a full-fledged git repository,
19− # this command can only fail at build-time. As a consequence, we include the
20− # `describeVersion` variable defined above here.
21− #
22− # See upstream issue https://github.com/martinpaljak/GlobalPlatformPro/issues/129
23− patches = [ (writeText "${name}-version.patch" ''
24− diff --git a/pom.xml b/pom.xml
25− index 1e5a82d..1aa01fe 100644
26− --- a/pom.xml
27− +++ b/pom.xml
28− @@ -121,14 +121,10 @@
29− </execution>
30− </executions>
31− <configuration>
32− - <executable>git</executable>
33− + <executable>echo</executable>
34− <outputFile>target/generated-resources/pro/javacard/gp/pro_version.txt</outputFile>
35− <arguments>
36− - <argument>describe</argument>
37− - <argument>--tags</argument>
38− - <argument>--always</argument>
39− - <argument>--long</argument>
40− - <argument>--dirty</argument>
41− + <argument>${describeVersion}</argument>
42− </arguments>
43− </configuration>
44− </plugin>
45− '') ];
46−
4717 deps = stdenv.mkDerivation {
4818 name = "${name}-deps";
49− inherit src patches;
19+ inherit src;
5020 nativeBuildInputs = [ jdk maven ];
5121 installPhase = ''
5222 # Download the dependencies
@@ -62,7 +32,7 @@ stdenv.mkDerivation rec {
6232 '';
6333 outputHashAlgo = "sha256";
6434 outputHashMode = "recursive";
65− outputHash = "15bbi7z9v601all9vr2azh8nk8rpz2vd91yvvw8id6birnbhn3if";
35+ outputHash = "1qwgvz6l5wia8q5824c9f3iwyapfskljhqf1z09fw6jjj1jy3b15";
6636 };
6737
6838 nativeBuildInputs = [ jdk maven makeWrapper ];
@@ -75,7 +45,6 @@ stdenv.mkDerivation rec {
7545
7646 installPhase = ''
7747 mkdir -p "$out/lib/java" "$out/share/java"
78− cp -R target/apidocs "$out/doc"
7948 cp target/gp.jar "$out/share/java"
8049 makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \
8150 --add-flags "-jar '$out/share/java/gp.jar'" \
pkgs/development/tools/go2nix/default.nix+2−2
@@ -3,7 +3,7 @@
33
44buildGoPackage rec {
55 name = "go2nix-${version}";
6− version = "1.2.1";
6+ version = "1.3.0";
77 rev = "v${version}";
88
99 goPackagePath = "github.com/kamilchm/go2nix";
@@ -12,7 +12,7 @@ buildGoPackage rec {
1212 inherit rev;
1313 owner = "kamilchm";
1414 repo = "go2nix";
15− sha256 = "0fr9aa50yvchfhv6h6zqblx8ynxk41i2hmv87b344zr2rz6rms72";
15+ sha256 = "1q61mgngvyl2bnmrqahh3bji402n76c7xwv29lwk007gymzgff0n";
1616 };
1717
1818 goDeps = ./deps.nix;
pkgs/development/tools/hcloud/default.nix+5−2
@@ -2,16 +2,19 @@
22
33buildGoPackage rec {
44 name = "hcloud-${version}";
5− version = "1.6.1";
5+ version = "1.9.1";
6+
67 goPackagePath = "github.com/hetznercloud/cli";
78
89 src = fetchFromGitHub {
910 owner = "hetznercloud";
1011 repo = "cli";
1112 rev = "v${version}";
12− sha256 = "0v5n7y8vb23iva51kb15da198yk7glc1fix193icrk3pvcbj5bjr";
13+ sha256 = "0qc4mzjd1q3xv1j0dxv5qvk443bdhh5hlbv3i3444v36wycj3171";
1314 };
1415
16+ goDeps = ./deps.nix;
17+
1518 buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
1619
1720 postInstall = ''
pkgs/development/tools/hcloud/deps.nixnew file+102
@@ -0,0 +1,102 @@
1+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
2+[
3+ {
4+ goPackagePath = "github.com/dustin/go-humanize";
5+ fetch = {
6+ type = "git";
7+ url = "https://github.com/dustin/go-humanize";
8+ rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
9+ sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
10+ };
11+ }
12+ {
13+ goPackagePath = "github.com/fatih/structs";
14+ fetch = {
15+ type = "git";
16+ url = "https://github.com/fatih/structs";
17+ rev = "878a968ab22548362a09bdb3322f98b00f470d46";
18+ sha256 = "15nkffa8ylr5kkv52gyry675l8bzv3c0xx39j0fzz0vp2kcjyy8x";
19+ };
20+ }
21+ {
22+ goPackagePath = "github.com/gosuri/uilive";
23+ fetch = {
24+ type = "git";
25+ url = "https://github.com/gosuri/uilive";
26+ rev = "ac356e6e42cd31fcef8e6aec13ae9ed6fe87713e";
27+ sha256 = "1k28zbc14p1yqzhamp9rcagjdw6wsdb55m08nx758jwlr31az6jy";
28+ };
29+ }
30+ {
31+ goPackagePath = "github.com/gosuri/uiprogress";
32+ fetch = {
33+ type = "git";
34+ url = "https://github.com/gosuri/uiprogress";
35+ rev = "d0567a9d84a1c40dd7568115ea66f4887bf57b33";
36+ sha256 = "1m7rxf71mn8w2yysc8wmf2703avhci6f4nkiijjl1f2cx4kzykck";
37+ };
38+ }
39+ {
40+ goPackagePath = "github.com/hetznercloud/hcloud-go";
41+ fetch = {
42+ type = "git";
43+ url = "https://github.com/hetznercloud/hcloud-go";
44+ rev = "eaf050e4f37028d2ca5f99a2fb38ead2c9b293d3";
45+ sha256 = "0ki4vk02da4dj6prx3gz8cvrfkj6xb72sjkwqcrbdp4n4klasngi";
46+ };
47+ }
48+ {
49+ goPackagePath = "github.com/pelletier/go-toml";
50+ fetch = {
51+ type = "git";
52+ url = "https://github.com/pelletier/go-toml";
53+ rev = "81a861c69d25a841d0c4394f0e6f84bc8c5afae0";
54+ sha256 = "1sk301rm7rm5hfcx7z7vgask5i80wx3mhyxjr3xnm5q1rvdj6vsl";
55+ };
56+ }
57+ {
58+ goPackagePath = "github.com/spf13/cobra";
59+ fetch = {
60+ type = "git";
61+ url = "https://github.com/spf13/cobra";
62+ rev = "8d114be902bc9f08717804830a55c48378108a28";
63+ sha256 = "1ipmdjwqxyvj6cv33xm1m4ngyx49jsnp8n9jd8fjbkng8aw3q4al";
64+ };
65+ }
66+ {
67+ goPackagePath = "github.com/spf13/pflag";
68+ fetch = {
69+ type = "git";
70+ url = "https://github.com/spf13/pflag";
71+ rev = "298182f68c66c05229eb03ac171abe6e309ee79a";
72+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
73+ };
74+ }
75+ {
76+ goPackagePath = "github.com/thcyron/uiprogress";
77+ fetch = {
78+ type = "git";
79+ url = "https://github.com/thcyron/uiprogress";
80+ rev = "25e98ffb0e98b5192b475d8f2fd78083bfe9a67e";
81+ sha256 = "1avb0jykn3qbjrvhc8i50ahisf9rsfy74ysrwfqbqqkpvhdxv12i";
82+ };
83+ }
84+ {
85+ goPackagePath = "golang.org/x/crypto";
86+ fetch = {
87+ type = "git";
88+ url = "https://go.googlesource.com/crypto";
89+ rev = "0c41d7ab0a0ee717d4590a44bcb987dfd9e183eb";
90+ sha256 = "1mff9l49dffsak7vxg3dzxlzkgm5nqfksh9cbsjpmngpc5pk0fbc";
91+ };
92+ }
93+ {
94+ goPackagePath = "golang.org/x/sys";
95+ fetch = {
96+ type = "git";
97+ url = "https://go.googlesource.com/sys";
98+ rev = "fa43e7bc11baaae89f3f902b2b4d832b68234844";
99+ sha256 = "1z96xhgw930jpd53g1sy9x6wiijgz751czbvr2zzgc55y0md1mfw";
100+ };
101+ }
102+]
pkgs/development/tools/misc/awf/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 name = "awf-${version}";
6− version = "1.3.1";
6+ version = "1.4.0";
77
88 src = fetchFromGitHub {
99 owner = "valr";
1010 repo = "awf";
1111 rev = "v${version}";
12− sha256 = "18dqa2269cwr0hrn67vp0ifwbv8vc2xn6mg145pbnc038hicql8m";
12+ sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
1313 };
1414
1515 nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
pkgs/development/tools/misc/cquery/default.nix+4−4
@@ -5,8 +5,8 @@ let
55 src = fetchFromGitHub {
66 owner = "cquery-project";
77 repo = "cquery";
8− rev = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea";
9− sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1";
8+ rev = "a95a6503d68a85baa25465ce147b7fc20f4a552e";
9+ sha256 = "0rxbdln7dqkdw4q8rhclssgwypq16g9flkwmaabsr8knckbszxrx";
1010 fetchSubmodules = true;
1111 };
1212
@@ -15,7 +15,7 @@ let
1515in
1616stdenv.mkDerivation rec {
1717 name = "cquery-${version}";
18− version = "2018-08-08";
18+ version = "2018-10-14";
1919
2020 inherit src;
2121
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 postFixup = ''
3333 # We need to tell cquery where to find the standard library headers.
3434
35− standard_library_includes="\\\"-isystem\\\", \\\"${if (stdenv.hostPlatform.libc == "glibc") then stdenv.cc.libc.dev else stdenv.cc.libc}/include\\\""
35+ standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\""
3636 standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\""
3737 export standard_library_includes
3838
pkgs/development/tools/ocaml/dune/default.nix+2−2
@@ -2,10 +2,10 @@
22
33stdenv.mkDerivation rec {
44 name = "dune-${version}";
5− version = "1.3.0";
5+ version = "1.4.0";
66 src = fetchurl {
77 url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
8− sha256 = "15bzakiclipsyjgcfrj83xdpwwww3aaijyw01bn5cx96cmcqyjad";
8+ sha256 = "1fz1jx1d48yb40qan4hw25h8ia55vs7mp94a3rr7cf5gb5ap2zkj";
99 };
1010
1111 buildInputs = with ocamlPackages; [ ocaml findlib ];
pkgs/development/tools/rust/cbindgen/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 name = "rust-cbindgen-${version}";
5− version = "0.6.2";
5+ version = "0.6.3";
66
77 src = fetchFromGitHub {
88 owner = "eqrion";
99 repo = "cbindgen";
1010 rev = "v${version}";
11− sha256 = "0hifmn9578cf1r5m4ajazg3rhld2ybd2v48xz04vfhappkarv4w2";
11+ sha256 = "18lvvzksc7gfx8fffpil41phjzwdc67xfh0mijkkv4zchwlqkpq2";
1212 };
1313
14− cargoSha256 = "0c3xpzff8jldqbn5a25yy6c2hlz5xy636ml6sj5d24wzcgwg5a2i";
14+ cargoSha256 = "1m1chwmfgj74xrmn4gb9yz5kx8c408a1hlqmpcq780kqj0k927i9";
1515
1616 meta = with stdenv.lib; {
1717 description = "A project for generating C bindings from Rust code";
pkgs/development/tools/unity3d/default.nix+52−59
@@ -1,31 +1,23 @@
1−{ stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt
2−, gtk2, gdk_pixbuf, glib, libGLU, postgresql, nss, nspr, udev
1+{ stdenv, lib, fetchurl, makeWrapper, file, getopt
2+, gtk2, gdk_pixbuf, glib, libGLU, nss, nspr, udev, tbb
33, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
44, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
55, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
6−, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb
7−, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp-2_0, chromium
6+, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium
87}:
98
109let
1110 libPath64 = lib.makeLibraryPath [
12− gcc.cc gtk2 gdk_pixbuf glib libGLU postgresql nss nspr
11+ gcc.cc gtk2 gdk_pixbuf glib libGLU nss nspr
1312 alsaLib GConf cups libcap fontconfig freetype pango
14− cairo dbus expat zlib libpng12 udev
13+ cairo dbus expat zlib libpng12 udev tbb
1514 libX11 libXcursor libXdamage libXfixes libXrender libXi
1615 libXcomposite libXext libXrandr libXtst libSM libICE libxcb
1716 ];
1817 libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ];
1918 binPath = lib.makeBinPath [ nodejs gnutar ];
20− developBinPath = lib.makeBinPath [ mono ];
21− developLibPath = lib.makeLibraryPath [
22− glib libgnomeui gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk
23− ];
24− developDotnetPath = lib.concatStringsSep ":" [
25− gnome-sharp gtk-sharp-2_0
26− ];
2719
28− ver = "5.6.1";
20+ ver = "2017.4.10";
2921 build = "f1";
3022
3123in stdenv.mkDerivation rec {
@@ -33,24 +25,19 @@ in stdenv.mkDerivation rec {
3325 version = "${ver}x${build}";
3426
3527 src = fetchurl {
36− url = "http://beta.unity3d.com/download/6a86e542cf5c/unity-editor-installer-${version}Linux.sh";
37− sha256 = "10z4h94c9h967gx4b3gwb268zn7bnrb7ylnqnmnqhx6byac7cf4m";
28+ url = "https://beta.unity3d.com/download/14396d76537e/LinuxEditorInstaller/Unity.tar.xz";
29+ sha256 = "e1b4fe41c0ff793f7a9146c49a8eca8c71d30abdfa3e81922bd69699810b3f67";
3830 };
3931
4032 nosuidLib = ./unity-nosuid.c;
4133
42− nativeBuildInputs = [ makeWrapper fakeroot file getopt ];
34+ nativeBuildInputs = [ makeWrapper file getopt ];
4335
44− outputs = [ "out" "monodevelop" ];
36+ outputs = [ "out" ];
4537
46− sourceRoot = "unity-editor-${version}Linux";
47−
48− unpackPhase = ''
49− echo -e 'q\ny' | fakeroot sh $src
50− '';
38+ sourceRoot = ".";
5139
5240 buildPhase = ''
53−
5441 cd Editor
5542
5643 $CC -fPIC -shared -o libunity-nosuid.so $nosuidLib -ldl
@@ -65,32 +52,10 @@ in stdenv.mkDerivation rec {
6552 mv Editor/* $unitydir
6653 ln -sf /run/wrappers/bin/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
6754
68− mkdir -p $out/share/applications
69− sed "/^Exec=/c\Exec=$out/bin/unity-editor" \
70− < unity-editor.desktop \
71− > $out/share/applications/unity-editor.desktop
72−
73− install -D unity-editor-icon.png $out/share/icons/hicolor/256x256/apps/unity-editor-icon.png
74−
7555 mkdir -p $out/bin
7656 makeWrapper $unitydir/Unity $out/bin/unity-editor \
7757 --prefix LD_PRELOAD : "$unitydir/libunity-nosuid.so" \
7858 --prefix PATH : "${binPath}"
79−
80− developdir="$monodevelop/opt/Unity/MonoDevelop"
81− mkdir -p $developdir
82− mv MonoDevelop/* $developdir
83−
84− mkdir -p $monodevelop/share/applications
85− sed "/^Exec=/c\Exec=$monodevelop/bin/unity-monodevelop" \
86− < unity-monodevelop.desktop \
87− > $monodevelop/share/applications/unity-monodevelop.desktop
88−
89− mkdir -p $monodevelop/bin
90− makeWrapper $developdir/bin/monodevelop $monodevelop/bin/unity-monodevelop \
91− --prefix PATH : "${developBinPath}" \
92− --prefix LD_LIBRARY_PATH : "${developLibPath}" \
93− --prefix MONO_GAC_PREFIX : "${developDotnetPath}"
9459 '';
9560
9661 preFixup = ''
@@ -105,26 +70,54 @@ in stdenv.mkDerivation rec {
10570 intp="$(cat $NIX_CC/nix-support/dynamic-linker)"
10671 fi
10772
108− oldRpath="$(patchelf --print-rpath "$1")"
109− # Always search at least for libraries in origin directory.
110− rpath="''${oldRpath:-\$ORIGIN}:$rpath"
111− if [[ "$ftype" =~ LSB\ shared ]]; then
112− patchelf \
113− --set-rpath "$rpath" \
114− "$1"
115− elif [[ "$ftype" =~ LSB\ executable ]]; then
116− patchelf \
117− --set-rpath "$rpath" \
118− --interpreter "$intp" \
119− "$1"
120− fi
73+ # Save origin-relative parts of rpath.
74+ originRpath="$(patchelf --print-rpath "$1" | sed "s/:/\n/g" | grep "^\$ORIGIN" | paste -sd ":" - || echo "")"
75+ rpath="$originRpath:$rpath"
76+
77+ patchelf --set-rpath "$rpath" "$1"
78+ patchelf --set-interpreter "$intp" "$1" 2> /dev/null || true
12179 fi
12280 }
12381
82+ upm_linux=$unitydir/Data/Resources/Upm/upm-linux
83+
84+ orig_size=$(stat --printf=%s $upm_linux)
85+
12486 # Exclude PlaybackEngines to build something that can be run on FHS-compliant Linuxes
12587 find $unitydir -name PlaybackEngines -prune -o -type f -print | while read path; do
12688 patchFile "$path"
12789 done
90+
91+ new_size=$(stat --printf=%s $upm_linux)
92+
93+ ###### zeit-pkg fixing starts here.
94+ # we're replacing plaintext js code that looks like
95+ # PAYLOAD_POSITION = '1234 ' | 0
96+ # [...]
97+ # PRELUDE_POSITION = '1234 ' | 0
98+ # ^-----20-chars-----^^------22-chars------^
99+ # ^-- grep points here
100+ #
101+ # var_* are as described above
102+ # shift_by seems to be safe so long as all patchelf adjustments occur
103+ # before any locations pointed to by hardcoded offsets
104+
105+ var_skip=20
106+ var_select=22
107+ shift_by=$(expr $new_size - $orig_size)
108+
109+ function fix_offset {
110+ # $1 = name of variable to adjust
111+ location=$(grep -obUam1 "$1" $upm_linux | cut -d: -f1)
112+ location=$(expr $location + $var_skip)
113+ value=$(dd if=$upm_linux iflag=count_bytes,skip_bytes skip=$location \
114+ bs=1 count=$var_select status=none)
115+ value=$(expr $shift_by + $value)
116+ echo -n $value | dd of=$upm_linux bs=1 seek=$location conv=notrunc
117+ }
118+
119+ fix_offset PAYLOAD_POSITION
120+ fix_offset PRELUDE_POSITION
128121 '';
129122
130123 dontStrip = true;
pkgs/games/anki/default.nix+7−7
@@ -16,6 +16,7 @@
1616, pytest
1717, glibcLocales
1818, nose
19+, send2trash
1920# This little flag adds a huge number of dependencies, but we assume that
2021# everyone wants Anki to draw plots with statistics by default.
2122, plotsSupport ? true
@@ -40,7 +41,7 @@ in buildPythonApplication rec {
4041 sha256 = "0yjyxgpk79rplz9z2r93kmlk09ari6xxfrz1cfm2yl9v8zfw1n6l";
4142 };
4243
43− propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]
44+ propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 send2trash ]
4445 ++ lib.optional plotsSupport matplotlib;
4546
4647 checkInputs = [ pytest glibcLocales nose ];
@@ -108,16 +109,14 @@ in buildPythonApplication rec {
108109 cp -v anki.xml $out/share/mime/packages/
109110 cp -v anki.{png,xpm} $out/share/pixmaps/
110111 cp -rv locale $out/share/
111− cp -rv anki aqt thirdparty/send2trash $pp/
112+ cp -rv anki aqt $pp/
112113
113114 wrapPythonPrograms
114115 '';
115116
116117 meta = with stdenv.lib; {
117− homepage = http://ankisrs.net/;
118+ homepage = "https://apps.ankiweb.net/";
118119 description = "Spaced repetition flashcard program";
119− license = licenses.gpl3;
120−
121120 longDescription = ''
122121 Anki is a program which makes remembering things easy. Because it is a lot
123122 more efficient than traditional study methods, you can either greatly
@@ -130,8 +129,9 @@ in buildPythonApplication rec {
130129 people's names and faces, brushing up on geography, mastering long poems,
131130 or even practicing guitar chords!
132131 '';
133−
134− maintainers = with maintainers; [ the-kenny ];
132+ license = licenses.agpl3Plus;
133+ broken = stdenv.hostPlatform.isAarch64;
135134 platforms = platforms.mesaPlatforms;
135+ maintainers = with maintainers; [ the-kenny ];
136136 };
137137}
pkgs/games/warmux/default.nix+20−19
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ stdenv, fetchFromGitHub, autoconf, automake
22, zlib, curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer
33, SDL_net, SDL_ttf, libunwind, libX11, xproto, libxml2, pkgconfig
44, gettext, intltool, libtool, perl
@@ -6,31 +6,32 @@
66
77stdenv.mkDerivation rec {
88 name = "warmux-${version}";
9− version = "11.04.1";
9+ version = "unstable-2017-10-20";
1010
11− src = fetchurl {
12− url = "http://download.gna.org/warmux/${name}.tar.bz2";
13− sha256 = "1vp44wdpnb1g6cddmn3nphc543pxsdhjis52mfif0p2c7qslz73q";
11+ src = fetchFromGitHub {
12+ owner = "fluxer";
13+ repo = "warmux";
14+ rev = "8f81d4fc309a548ae89a068c2dde27b7e7ef8851";
15+ sha256 = "1hvzglsmp75xiqqb0k75qjz4jwi8kl3fhn8zfsz53hhhqmbw6wkr";
1416 };
1517
16− buildInputs =
17− [ zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer
18− SDL_net SDL_ttf libunwind libX11 xproto libxml2 pkgconfig
19− gettext intltool libtool perl
20− ];
21−
18+ preConfigure = "patchShebangs autogen.sh && ./autogen.sh";
2219 configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h");
2320
24− patches = [ ./gcc-fix.patch ];
21+ nativeBuildInputs = [
22+ autoconf automake gettext intltool libtool pkgconfig
23+ ];
24+ buildInputs = [
25+ zlib curl gnutls fribidi libpng SDL SDL_gfx SDL_image SDL_mixer
26+ SDL_net SDL_ttf libunwind libX11 xproto libxml2 perl
27+ ];
28+ enableParallelBuilding = true;
2529
2630 meta = with stdenv.lib; {
27− description = "Ballistics turn-based battle game between teams";
28− maintainers = with maintainers;
29− [
30− raskin
31− ];
31+ description = "Ballistics turn-based battle game between teams - unofficial copy";
32+ maintainers = with maintainers; [ raskin ];
3233 platforms = platforms.linux;
33− license = licenses.gpl2;
34− downloadPage = "http://download.gna.org/warmux/";
34+ license = with licenses; [ gpl2 ufl ];
35+ homepage = https://github.com/fluxer/warmux;
3536 };
3637}
pkgs/games/warmux/gcc-fix.patchdeleted−51
@@ -1,51 +0,0 @@
1−## i-love-you-lordheavy.patch [diff]
2−diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
3−--- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200
4−+++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100
5−@@ -81,7 +81,7 @@
6− }
7−
8− // Build an action from a network packet
9−-Action::Action(const char *buffer, DistantComputer* _creator)
10−+Action::Action(char *buffer, DistantComputer* _creator)
11− {
12− m_creator = _creator;
13−
14−diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
15−--- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200
16−+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100
17−@@ -168,7 +168,7 @@
18− Action(Action_t type, Double value1, Double value2);
19−
20− // Build an action from a network packet
21−- Action(const char* buffer, DistantComputer* _creator);
22−+ Action(char* buffer, DistantComputer* _creator);
23−
24− ~Action();
25−
26−Description: Fix FTBFS with gcc 4.7.
27−Author: Felix Geyer <debfx-pkg@fobos.de>
28−
29−--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
30−+++ warmux-11.04.1+repack/tools/list_games/main.cpp
31−@@ -1,4 +1,5 @@
32− #include <stdio.h>
33−+#include <unistd.h>
34− #include <WARMUX_types.h>
35− #include <WARMUX_network.h>
36− #include <WARMUX_index_server.h>
37−
38−Description: Fix conversion error in gcc 6.
39−Author: Robin Gloster <mail@glob.in>
40−
41−--- warmux-11.04.1.orig/src/interface/weapon_menu.cpp 2017-01-19 23:06:32.401035923 +0100
42−+++ warmux-11.04.1/src/interface/weapon_menu.cpp 2017-01-19 23:07:14.245866593 +0100
43−@@ -391,7 +391,7 @@
44− Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
45− {
46− if (!show)
47−- return false;
48−+ return nullptr;
49− const std::vector<PolygonItem *>& items = poly->GetItem();
50− WeaponMenuItem * tmp;
51− Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix+4−4
@@ -2,12 +2,12 @@
22
33stdenv.mkDerivation rec {
44 name = "firmware-linux-nonfree-${version}";
5− version = "2018-08-25";
5+ version = "2018-10-17";
66
77 src = fetchgit {
88 url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
9− rev = "fea76a04f25fd0a217c0d566ff5ff8f23ad3e648";
10− sha256 = "1xy1s9vd7jny4hf4f1hzhlbnm0l4pnw7xycky0v6kfwlg5nnjii5";
9+ rev = "de9cefa74bba6fce3834144460868a468b8818f2";
10+ sha256 = "101j4jk3ixl8r3mxbkcrr5ybhb44ij3l52js4dqfxpylpiaw2cgk";
1111 };
1212
1313 installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 outputHashMode = "recursive";
1919 outputHashAlgo = "sha256";
20− outputHash = "1p1dkzclj718w7di81s6486dn5zw77c4i2qn63bvp9q4vid452hn";
20+ outputHash = "1ndwp9yhpmx0kzayddy9i93mpv3d8gxypqm85069ic13lrjz1gdf";
2121
2222 meta = with stdenv.lib; {
2323 description = "Binary firmware collection packaged by kernel.org";
pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.14.76";
6+ version = "4.14.77";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1gl2wkq4sazvpr0xnn4vrajj3j7w6hfiwdiy34y7jhlazyj1jgzf";
16+ sha256 = "1y567wkr4p7hywq3pdw06yc4hi16rp1vkx764wzy5nyajkhz95h4";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.18.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.18.14";
6+ version = "4.18.15";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1lv2hpxzlk1yzr5dcjb0q0ylvlwx4ln2jvfvf01b9smr1lvd3iin";
16+ sha256 = "0cr9ash165yimwf8742c9cshfnjvmnzibyfrii9cnfig9m8m3hwg";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.9.133";
4+ version = "4.9.134";
55 extraMeta.branch = "4.9";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9− sha256 = "0qv5n8vipkqcd0hpf5l41h023n46rgja39h895phlcxs4p00ywsk";
9+ sha256 = "0xvsk5q4w4sa3vk0rhckxn7faj12rvmfpwn08m4qf7024b8yiyvd";
1010 };
1111} // (args.argsOverride or {}))
pkgs/servers/home-assistant/component-packages.nix+73−10
@@ -2,7 +2,7 @@
22# Do not edit!
33
44{
5− version = "0.77.3";
5+ version = "0.80.3";
66 components = {
77 "abode" = ps: with ps; [ ];
88 "ads" = ps: with ps; [ ];
@@ -11,6 +11,7 @@
1111 "alarm_control_panel.alarmdecoder" = ps: with ps; [ ];
1212 "alarm_control_panel.alarmdotcom" = ps: with ps; [ ];
1313 "alarm_control_panel.arlo" = ps: with ps; [ ];
14+ "alarm_control_panel.blink" = ps: with ps; [ ];
1415 "alarm_control_panel.canary" = ps: with ps; [ ];
1516 "alarm_control_panel.concord232" = ps: with ps; [ ];
1617 "alarm_control_panel.demo" = ps: with ps; [ ];
@@ -18,7 +19,7 @@
1819 "alarm_control_panel.envisalink" = ps: with ps; [ ];
1920 "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ];
2021 "alarm_control_panel.ialarm" = ps: with ps; [ ];
21− "alarm_control_panel.ifttt" = ps: with ps; [ ];
22+ "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors ];
2223 "alarm_control_panel.manual" = ps: with ps; [ ];
2324 "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ];
2425 "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ];
@@ -29,6 +30,7 @@
2930 "alarm_control_panel.totalconnect" = ps: with ps; [ ];
3031 "alarm_control_panel.verisure" = ps: with ps; [ ];
3132 "alarm_control_panel.wink" = ps: with ps; [ ];
33+ "alarm_control_panel.yale_smart_alarm" = ps: with ps; [ ];
3234 "alarmdecoder" = ps: with ps; [ ];
3335 "alert" = ps: with ps; [ ];
3436 "alexa" = ps: with ps; [ aiohttp-cors ];
@@ -41,6 +43,7 @@
4143 "apcupsd" = ps: with ps; [ ];
4244 "api" = ps: with ps; [ aiohttp-cors ];
4345 "apple_tv" = ps: with ps; [ ];
46+ "aqualogic" = ps: with ps; [ ];
4447 "arduino" = ps: with ps; [ ];
4548 "arlo" = ps: with ps; [ ];
4649 "asterisk_mbox" = ps: with ps; [ ];
@@ -59,6 +62,7 @@
5962 "automation.sun" = ps: with ps; [ ];
6063 "automation.template" = ps: with ps; [ ];
6164 "automation.time" = ps: with ps; [ ];
65+ "automation.webhook" = ps: with ps; [ aiohttp-cors ];
6266 "automation.zone" = ps: with ps; [ ];
6367 "axis" = ps: with ps; [ ];
6468 "bbb_gpio" = ps: with ps; [ ];
@@ -90,6 +94,7 @@
9094 "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
9195 "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
9296 "binary_sensor.flic" = ps: with ps; [ ];
97+ "binary_sensor.fritzbox" = ps: with ps; [ ];
9398 "binary_sensor.gc100" = ps: with ps; [ ];
9499 "binary_sensor.hikvision" = ps: with ps; [ ];
95100 "binary_sensor.hive" = ps: with ps; [ ];
@@ -179,6 +184,7 @@
179184 "camera.foscam" = ps: with ps; [ ];
180185 "camera.generic" = ps: with ps; [ ];
181186 "camera.local_file" = ps: with ps; [ ];
187+ "camera.logi_circle" = ps: with ps; [ ];
182188 "camera.mjpeg" = ps: with ps; [ ];
183189 "camera.mqtt" = ps: with ps; [ paho-mqtt ];
184190 "camera.neato" = ps: with ps; [ ];
@@ -207,6 +213,7 @@
207213 "climate.econet" = ps: with ps; [ ];
208214 "climate.ephember" = ps: with ps; [ ];
209215 "climate.eq3btsmart" = ps: with ps; [ construct ];
216+ "climate.evohome" = ps: with ps; [ ];
210217 "climate.flexit" = ps: with ps; [ ];
211218 "climate.fritzbox" = ps: with ps; [ ];
212219 "climate.generic_thermostat" = ps: with ps; [ ];
@@ -226,6 +233,7 @@
226233 "climate.netatmo" = ps: with ps; [ ];
227234 "climate.nuheat" = ps: with ps; [ ];
228235 "climate.oem" = ps: with ps; [ ];
236+ "climate.opentherm_gw" = ps: with ps; [ ];
229237 "climate.proliphix" = ps: with ps; [ ];
230238 "climate.radiotherm" = ps: with ps; [ ];
231239 "climate.sensibo" = ps: with ps; [ ];
@@ -251,9 +259,10 @@
251259 "config" = ps: with ps; [ aiohttp-cors ];
252260 "config.auth" = ps: with ps; [ ];
253261 "config.automation" = ps: with ps; [ ];
254− "config.config_entries" = ps: with ps; [ voluptuous-serialize ];
262+ "config.config_entries" = ps: with ps; [ ];
255263 "config.core" = ps: with ps; [ ];
256264 "config.customize" = ps: with ps; [ ];
265+ "config.device_registry" = ps: with ps; [ aiohttp-cors ];
257266 "config.entity_registry" = ps: with ps; [ aiohttp-cors ];
258267 "config.group" = ps: with ps; [ ];
259268 "config.hassbian" = ps: with ps; [ ];
@@ -268,11 +277,13 @@
268277 "cover.aladdin_connect" = ps: with ps; [ ];
269278 "cover.brunt" = ps: with ps; [ ];
270279 "cover.command_line" = ps: with ps; [ ];
280+ "cover.deconz" = ps: with ps; [ ];
271281 "cover.demo" = ps: with ps; [ ];
272282 "cover.garadget" = ps: with ps; [ ];
273283 "cover.gogogate2" = ps: with ps; [ ];
274284 "cover.group" = ps: with ps; [ ];
275285 "cover.homematic" = ps: with ps; [ pyhomematic ];
286+ "cover.insteon" = ps: with ps; [ ];
276287 "cover.isy994" = ps: with ps; [ ];
277288 "cover.knx" = ps: with ps; [ ];
278289 "cover.lutron" = ps: with ps; [ ];
@@ -322,6 +333,7 @@
322333 "device_tracker.google_maps" = ps: with ps; [ ];
323334 "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ];
324335 "device_tracker.hitron_coda" = ps: with ps; [ ];
336+ "device_tracker.huawei_lte" = ps: with ps; [ ];
325337 "device_tracker.huawei_router" = ps: with ps; [ ];
326338 "device_tracker.icloud" = ps: with ps; [ ];
327339 "device_tracker.keenetic_ndms2" = ps: with ps; [ ];
@@ -368,6 +380,7 @@
368380 "dyson" = ps: with ps; [ ];
369381 "ecobee" = ps: with ps; [ ];
370382 "ecovacs" = ps: with ps; [ ];
383+ "edp_redy" = ps: with ps; [ ];
371384 "egardia" = ps: with ps; [ ];
372385 "eight_sleep" = ps: with ps; [ ];
373386 "emoncms_history" = ps: with ps; [ ];
@@ -377,6 +390,7 @@
377390 "enocean" = ps: with ps; [ ];
378391 "envisalink" = ps: with ps; [ ];
379392 "eufy" = ps: with ps; [ ];
393+ "evohome" = ps: with ps; [ ];
380394 "fan" = ps: with ps; [ ];
381395 "fan.comfoconnect" = ps: with ps; [ ];
382396 "fan.demo" = ps: with ps; [ ];
@@ -398,10 +412,12 @@
398412 "fritzbox" = ps: with ps; [ ];
399413 "frontend" = ps: with ps; [ aiohttp-cors ];
400414 "gc100" = ps: with ps; [ ];
415+ "geo_location" = ps: with ps; [ ];
416+ "geo_location.demo" = ps: with ps; [ ];
417+ "geo_location.geo_json_events" = ps: with ps; [ ];
401418 "goalfeed" = ps: with ps; [ ];
402419 "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
403420 "google_assistant" = ps: with ps; [ aiohttp-cors ];
404− "google_assistant.auth" = ps: with ps; [ ];
405421 "google_assistant.const" = ps: with ps; [ ];
406422 "google_assistant.helpers" = ps: with ps; [ ];
407423 "google_assistant.http" = ps: with ps; [ ];
@@ -410,11 +426,16 @@
410426 "google_domains" = ps: with ps; [ ];
411427 "graphite" = ps: with ps; [ ];
412428 "group" = ps: with ps; [ ];
429+ "habitica" = ps: with ps; [ ];
413430 "hangouts" = ps: with ps; [ ];
414431 "hangouts.config_flow" = ps: with ps; [ ];
415432 "hangouts.const" = ps: with ps; [ ];
416433 "hangouts.hangouts_bot" = ps: with ps; [ ];
434+ "hangouts.intents" = ps: with ps; [ ];
417435 "hassio" = ps: with ps; [ aiohttp-cors ];
436+ "hassio.auth" = ps: with ps; [ ];
437+ "hassio.const" = ps: with ps; [ ];
438+ "hassio.discovery" = ps: with ps; [ ];
418439 "hassio.handler" = ps: with ps; [ ];
419440 "hassio.http" = ps: with ps; [ ];
420441 "hdmi_cec" = ps: with ps; [ ];
@@ -441,13 +462,14 @@
441462 "http.real_ip" = ps: with ps; [ ];
442463 "http.static" = ps: with ps; [ ];
443464 "http.view" = ps: with ps; [ ];
465+ "huawei_lte" = ps: with ps; [ ];
444466 "hue" = ps: with ps; [ aiohue ];
445467 "hue.bridge" = ps: with ps; [ ];
446468 "hue.config_flow" = ps: with ps; [ ];
447469 "hue.const" = ps: with ps; [ ];
448470 "hue.errors" = ps: with ps; [ ];
449471 "hydrawise" = ps: with ps; [ ];
450− "ifttt" = ps: with ps; [ ];
472+ "ifttt" = ps: with ps; [ aiohttp-cors ];
451473 "ihc" = ps: with ps; [ ];
452474 "ihc.const" = ps: with ps; [ ];
453475 "ihc.ihcdevice" = ps: with ps; [ ];
@@ -525,6 +547,7 @@
525547 "light.mysensors" = ps: with ps; [ ];
526548 "light.mystrom" = ps: with ps; [ ];
527549 "light.nanoleaf_aurora" = ps: with ps; [ ];
550+ "light.opple" = ps: with ps; [ ];
528551 "light.osramlightify" = ps: with ps; [ ];
529552 "light.piglow" = ps: with ps; [ ];
530553 "light.qwikswitch" = ps: with ps; [ ];
@@ -580,9 +603,12 @@
580603 "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ];
581604 "logentries" = ps: with ps; [ ];
582605 "logger" = ps: with ps; [ ];
606+ "logi_circle" = ps: with ps; [ ];
607+ "lovelace" = ps: with ps; [ ];
583608 "lutron" = ps: with ps; [ ];
584609 "lutron_caseta" = ps: with ps; [ ];
585610 "mailbox" = ps: with ps; [ aiohttp-cors ];
611+ "mailbox.asterisk_cdr" = ps: with ps; [ ];
586612 "mailbox.asterisk_mbox" = ps: with ps; [ ];
587613 "mailbox.demo" = ps: with ps; [ ];
588614 "mailgun" = ps: with ps; [ aiohttp-cors ];
@@ -640,7 +666,7 @@
640666 "media_player.sisyphus" = ps: with ps; [ ];
641667 "media_player.snapcast" = ps: with ps; [ ];
642668 "media_player.songpal" = ps: with ps; [ ];
643− "media_player.sonos" = ps: with ps; [ soco ];
669+ "media_player.sonos" = ps: with ps; [ ];
644670 "media_player.soundtouch" = ps: with ps; [ libsoundtouch ];
645671 "media_player.spotify" = ps: with ps; [ aiohttp-cors ];
646672 "media_player.squeezebox" = ps: with ps; [ ];
@@ -659,6 +685,8 @@
659685 "mochad" = ps: with ps; [ ];
660686 "modbus" = ps: with ps; [ ];
661687 "mqtt" = ps: with ps; [ paho-mqtt ];
688+ "mqtt.config_flow" = ps: with ps; [ ];
689+ "mqtt.const" = ps: with ps; [ ];
662690 "mqtt.discovery" = ps: with ps; [ ];
663691 "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ];
664692 "mqtt_eventstream" = ps: with ps; [ paho-mqtt ];
@@ -731,6 +759,7 @@
731759 "notify.synology_chat" = ps: with ps; [ ];
732760 "notify.syslog" = ps: with ps; [ ];
733761 "notify.telegram" = ps: with ps; [ python-telegram-bot ];
762+ "notify.tibber" = ps: with ps; [ ];
734763 "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
735764 "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
736765 "notify.twitter" = ps: with ps; [ ];
@@ -744,6 +773,8 @@
744773 "onboarding.const" = ps: with ps; [ ];
745774 "onboarding.views" = ps: with ps; [ ];
746775 "openuv" = ps: with ps; [ ];
776+ "openuv.config_flow" = ps: with ps; [ ];
777+ "openuv.const" = ps: with ps; [ ];
747778 "panel_custom" = ps: with ps; [ aiohttp-cors ];
748779 "panel_iframe" = ps: with ps; [ aiohttp-cors ];
749780 "persistent_notification" = ps: with ps; [ ];
@@ -805,6 +836,7 @@
805836 "sensor.android_ip_webcam" = ps: with ps; [ ];
806837 "sensor.apcupsd" = ps: with ps; [ ];
807838 "sensor.api_streams" = ps: with ps; [ ];
839+ "sensor.aqualogic" = ps: with ps; [ ];
808840 "sensor.arduino" = ps: with ps; [ ];
809841 "sensor.arest" = ps: with ps; [ ];
810842 "sensor.arlo" = ps: with ps; [ ];
@@ -853,6 +885,7 @@
853885 "sensor.ebox" = ps: with ps; [ ];
854886 "sensor.ecobee" = ps: with ps; [ ];
855887 "sensor.eddystone_temperature" = ps: with ps; [ construct ];
888+ "sensor.edp_redy" = ps: with ps; [ ];
856889 "sensor.efergy" = ps: with ps; [ ];
857890 "sensor.eight_sleep" = ps: with ps; [ ];
858891 "sensor.eliqonline" = ps: with ps; [ ];
@@ -877,14 +910,16 @@
877910 "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
878911 "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
879912 "sensor.gearbest" = ps: with ps; [ ];
880− "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ];
881− "sensor.geo_rss_events" = ps: with ps; [ feedparser ];
913+ "sensor.geizhals" = ps: with ps; [ ];
914+ "sensor.geo_rss_events" = ps: with ps; [ ];
915+ "sensor.gitlab_ci" = ps: with ps; [ ];
882916 "sensor.gitter" = ps: with ps; [ ];
883917 "sensor.glances" = ps: with ps; [ ];
884918 "sensor.google_travel_time" = ps: with ps; [ ];
885919 "sensor.google_wifi" = ps: with ps; [ ];
886920 "sensor.gpsd" = ps: with ps; [ ];
887921 "sensor.gtfs" = ps: with ps; [ ];
922+ "sensor.habitica" = ps: with ps; [ ];
888923 "sensor.haveibeenpwned" = ps: with ps; [ ];
889924 "sensor.hddtemp" = ps: with ps; [ ];
890925 "sensor.history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ];
@@ -893,6 +928,7 @@
893928 "sensor.homematicip_cloud" = ps: with ps; [ ];
894929 "sensor.hp_ilo" = ps: with ps; [ ];
895930 "sensor.htu21d" = ps: with ps; [ ];
931+ "sensor.huawei_lte" = ps: with ps; [ ];
896932 "sensor.hydrawise" = ps: with ps; [ ];
897933 "sensor.hydroquebec" = ps: with ps; [ ];
898934 "sensor.ihc" = ps: with ps; [ ];
@@ -905,13 +941,16 @@
905941 "sensor.iperf3" = ps: with ps; [ ];
906942 "sensor.irish_rail_transport" = ps: with ps; [ ];
907943 "sensor.isy994" = ps: with ps; [ ];
944+ "sensor.jewish_calendar" = ps: with ps; [ ];
908945 "sensor.juicenet" = ps: with ps; [ ];
909946 "sensor.kira" = ps: with ps; [ ];
910947 "sensor.knx" = ps: with ps; [ ];
911948 "sensor.kwb" = ps: with ps; [ ];
912949 "sensor.lacrosse" = ps: with ps; [ ];
913950 "sensor.lastfm" = ps: with ps; [ pylast ];
951+ "sensor.linky" = ps: with ps; [ ];
914952 "sensor.linux_battery" = ps: with ps; [ batinfo ];
953+ "sensor.logi_circle" = ps: with ps; [ ];
915954 "sensor.london_air" = ps: with ps; [ ];
916955 "sensor.london_underground" = ps: with ps; [ ];
917956 "sensor.loopenergy" = ps: with ps; [ ];
@@ -1001,6 +1040,7 @@
10011040 "sensor.speedtest" = ps: with ps; [ speedtest-cli ];
10021041 "sensor.spotcrime" = ps: with ps; [ ];
10031042 "sensor.sql" = ps: with ps; [ sqlalchemy ];
1043+ "sensor.starlingbank" = ps: with ps; [ ];
10041044 "sensor.startca" = ps: with ps; [ xmltodict ];
10051045 "sensor.statistics" = ps: with ps; [ ];
10061046 "sensor.steam_online" = ps: with ps; [ ];
@@ -1041,10 +1081,12 @@
10411081 "sensor.uscis" = ps: with ps; [ ];
10421082 "sensor.usps" = ps: with ps; [ ];
10431083 "sensor.vasttrafik" = ps: with ps; [ ];
1084+ "sensor.velbus" = ps: with ps; [ ];
10441085 "sensor.vera" = ps: with ps; [ ];
10451086 "sensor.verisure" = ps: with ps; [ ];
10461087 "sensor.version" = ps: with ps; [ ];
10471088 "sensor.viaggiatreno" = ps: with ps; [ ];
1089+ "sensor.volkszaehler" = ps: with ps; [ ];
10481090 "sensor.volvooncall" = ps: with ps; [ ];
10491091 "sensor.vultr" = ps: with ps; [ vultr ];
10501092 "sensor.waqi" = ps: with ps; [ ];
@@ -1079,9 +1121,9 @@
10791121 "sleepiq" = ps: with ps; [ ];
10801122 "smappee" = ps: with ps; [ ];
10811123 "snips" = ps: with ps; [ paho-mqtt ];
1082− "sonos" = ps: with ps; [ soco ];
1124+ "sonos" = ps: with ps; [ ];
10831125 "spaceapi" = ps: with ps; [ aiohttp-cors ];
1084− "spc" = ps: with ps; [ websockets ];
1126+ "spc" = ps: with ps; [ ];
10851127 "spider" = ps: with ps; [ ];
10861128 "splunk" = ps: with ps; [ ];
10871129 "statsd" = ps: with ps; [ statsd ];
@@ -1093,6 +1135,7 @@
10931135 "switch.amcrest" = ps: with ps; [ ha-ffmpeg ];
10941136 "switch.android_ip_webcam" = ps: with ps; [ ];
10951137 "switch.anel_pwrctrl" = ps: with ps; [ ];
1138+ "switch.aqualogic" = ps: with ps; [ ];
10961139 "switch.arduino" = ps: with ps; [ ];
10971140 "switch.arest" = ps: with ps; [ ];
10981141 "switch.bbb_gpio" = ps: with ps; [ ];
@@ -1106,6 +1149,7 @@
11061149 "switch.dlink" = ps: with ps; [ ];
11071150 "switch.doorbird" = ps: with ps; [ ];
11081151 "switch.edimax" = ps: with ps; [ ];
1152+ "switch.edp_redy" = ps: with ps; [ ];
11091153 "switch.enocean" = ps: with ps; [ ];
11101154 "switch.eufy" = ps: with ps; [ ];
11111155 "switch.flux" = ps: with ps; [ ];
@@ -1157,6 +1201,8 @@
11571201 "switch.smappee" = ps: with ps; [ ];
11581202 "switch.snmp" = ps: with ps; [ pysnmp ];
11591203 "switch.spider" = ps: with ps; [ ];
1204+ "switch.switchbot" = ps: with ps; [ ];
1205+ "switch.switchmate" = ps: with ps; [ ];
11601206 "switch.tahoma" = ps: with ps; [ ];
11611207 "switch.tellduslive" = ps: with ps; [ ];
11621208 "switch.tellstick" = ps: with ps; [ ];
@@ -1166,6 +1212,7 @@
11661212 "switch.thinkingcleaner" = ps: with ps; [ ];
11671213 "switch.toon" = ps: with ps; [ ];
11681214 "switch.tplink" = ps: with ps; [ ];
1215+ "switch.tradfri" = ps: with ps; [ ];
11691216 "switch.transmission" = ps: with ps; [ transmissionrpc ];
11701217 "switch.tuya" = ps: with ps; [ ];
11711218 "switch.upcloud" = ps: with ps; [ ];
@@ -1197,9 +1244,12 @@
11971244 "tesla" = ps: with ps; [ ];
11981245 "thethingsnetwork" = ps: with ps; [ ];
11991246 "thingspeak" = ps: with ps; [ ];
1247+ "tibber" = ps: with ps; [ ];
12001248 "timer" = ps: with ps; [ ];
12011249 "toon" = ps: with ps; [ ];
12021250 "tradfri" = ps: with ps; [ ];
1251+ "tradfri.config_flow" = ps: with ps; [ ];
1252+ "tradfri.const" = ps: with ps; [ ];
12031253 "tts" = ps: with ps; [ aiohttp-cors mutagen ];
12041254 "tts.amazon_polly" = ps: with ps; [ boto3 ];
12051255 "tts.baidu" = ps: with ps; [ ];
@@ -1215,6 +1265,9 @@
12151265 "upcloud" = ps: with ps; [ ];
12161266 "updater" = ps: with ps; [ distro ];
12171267 "upnp" = ps: with ps; [ aiohttp-cors ];
1268+ "upnp.config_flow" = ps: with ps; [ ];
1269+ "upnp.const" = ps: with ps; [ ];
1270+ "upnp.device" = ps: with ps; [ ];
12181271 "usps" = ps: with ps; [ ];
12191272 "vacuum" = ps: with ps; [ ];
12201273 "vacuum.demo" = ps: with ps; [ ];
@@ -1240,12 +1293,22 @@
12401293 "weather.demo" = ps: with ps; [ ];
12411294 "weather.ecobee" = ps: with ps; [ ];
12421295 "weather.ipma" = ps: with ps; [ ];
1296+ "weather.met" = ps: with ps; [ ];
12431297 "weather.metoffice" = ps: with ps; [ ];
12441298 "weather.openweathermap" = ps: with ps; [ pyowm ];
12451299 "weather.yweather" = ps: with ps; [ yahooweather ];
12461300 "weather.zamg" = ps: with ps; [ ];
1301+ "webhook" = ps: with ps; [ aiohttp-cors ];
12471302 "weblink" = ps: with ps; [ ];
12481303 "websocket_api" = ps: with ps; [ aiohttp-cors ];
1304+ "websocket_api.auth" = ps: with ps; [ ];
1305+ "websocket_api.commands" = ps: with ps; [ ];
1306+ "websocket_api.connection" = ps: with ps; [ ];
1307+ "websocket_api.const" = ps: with ps; [ ];
1308+ "websocket_api.decorators" = ps: with ps; [ ];
1309+ "websocket_api.error" = ps: with ps; [ ];
1310+ "websocket_api.http" = ps: with ps; [ ];
1311+ "websocket_api.messages" = ps: with ps; [ ];
12491312 "wemo" = ps: with ps; [ ];
12501313 "wink" = ps: with ps; [ ];
12511314 "wirelesstag" = ps: with ps; [ ];
pkgs/servers/home-assistant/default.nix+13−11
@@ -18,12 +18,12 @@ let
1818
1919 defaultOverrides = [
2020 # Override the version of some packages pinned in Home Assistant's setup.py
21− (mkOverride "aiohttp" "3.4.0"
22− "9b15efa7411dcf3b59c1f4766eb16ba1aba4531a33e54d469ee22106eabce460")
21+ (mkOverride "aiohttp" "3.4.4"
22+ "51afec6ffa50a9da4cdef188971a802beb1ca8e8edb40fa429e5e529db3475fa")
2323 (mkOverride "astral" "1.6.1"
2424 "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d")
25− (mkOverride "attrs" "18.1.0"
26− "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b")
25+ (mkOverride "attrs" "18.2.0"
26+ "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69")
2727 (mkOverride "bcrypt" "3.1.4"
2828 "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d")
2929 (mkOverride "pyjwt" "1.6.4"
@@ -36,6 +36,8 @@ let
3636 "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a")
3737 (mkOverride "voluptuous" "0.11.5"
3838 "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
39+ (mkOverride "voluptuous-serialize" "2.0.0"
40+ "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41")
3941
4042 # used by check_config script
4143 # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved
@@ -75,7 +77,7 @@ let
7577 extraBuildInputs = extraPackages py.pkgs;
7678
7779 # Don't forget to run parse-requirements.py after updating
78− hassVersion = "0.77.3";
80+ hassVersion = "0.80.3";
7981
8082in with py.pkgs; buildPythonApplication rec {
8183 pname = "homeassistant";
@@ -90,14 +92,14 @@ in with py.pkgs; buildPythonApplication rec {
9092 owner = "home-assistant";
9193 repo = "home-assistant";
9294 rev = version;
93− sha256 = "1c459iqbkhs6dv563zld6qb9avpx3h0fnxng476zahj9x9m5rzk6";
95+ sha256 = "0fjkw8kg0vsyrkcrx9jhqrh5nzxx5wphj6zglqgai2d635m8j2dg";
9496 };
9597
9698 propagatedBuildInputs = [
9799 # From setup.py
98− aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous
99− # From http, frontend, recorder and config.config_entries components and auth.mfa_modules.totp
100− sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize pyotp pyqrcode
100+ aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous voluptuous-serialize
101+ # From http, frontend and recorder components and auth.mfa_modules.totp
102+ sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode
101103 ] ++ componentBuildInputs ++ extraBuildInputs;
102104
103105 checkInputs = [
@@ -109,8 +111,8 @@ in with py.pkgs; buildPythonApplication rec {
109111 py.test --ignore tests/components
110112 # Some basic components should be tested however
111113 py.test \
112− tests/components/{group,http,frontend} \
113− tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log,websocket_api}.py
114+ tests/components/{group,http,frontend,config,websocket_api} \
115+ tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log}.py
114116 '';
115117
116118 makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
pkgs/servers/home-assistant/frontend.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "home-assistant-frontend";
5− version = "20180903.0";
5+ version = "20181018.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "54ba2ad2d1043952885f432d900025bd3eb11de180ac5147342cff585f44d4f9";
9+ sha256 = "83f52421056acda8297f174a7c4e3c540109673c2f2c25720638d171c6bc2653";
1010 };
1111
1212 propagatedBuildInputs = [ user-agents ];
pkgs/servers/http/jetty/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "jetty-${version}";
5− version = "9.4.8.v20171121";
5+ version = "9.4.12.v20180830";
66 src = fetchurl {
77 url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
88 name = "jetty-distribution-${version}.tar.gz";
9− sha256 = "0bvwi70vdk468yqgvgq99lwrpy2y5znrl0b1cr8j6ygmsgnvvmjh";
9+ sha256 = "1z498cxvp1llp4ii8g52rhicypay1v2b6mmdmxrj3d82az6biiq3";
1010 };
1111
1212 phases = [ "unpackPhase" "installPhase" ];
pkgs/servers/openafs/1.6/module.nix+3−3
@@ -8,7 +8,7 @@ let
88 kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
99
1010in stdenv.mkDerivation rec {
11− name = "openafs-${version}-${kernel.version}";
11+ name = "openafs-${version}-${kernel.modDirVersion}";
1212 inherit version src;
1313
1414 nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies;
@@ -51,8 +51,8 @@ in stdenv.mkDerivation rec {
5151 license = licenses.ipl10;
5252 platforms = platforms.linux;
5353 maintainers = [ maintainers.z77z maintainers.spacefrogg ];
54− broken = versionOlder kernel.version "3.18" ||
55− versionAtLeast kernel.version "4.18";
54+ broken = versionOlder kernel.version "3.18"
55+ || stdenv.targetPlatform.isAarch64;
5656 };
5757
5858}
pkgs/servers/openafs/1.6/srcs.nix+3−3
@@ -1,14 +1,14 @@
11{ fetchurl }:
22rec {
3− version = "1.6.22.2";
3+ version = "1.6.23";
44 src = fetchurl {
55 url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
6− sha256 = "15j17igignsfzv5jb47ryczsrz3zsmiqwnj38dx9gzz95807rkyf";
6+ sha256 = "1gy7a0jhagxif8av540xb1aa6cl7id08nsgjbgady54bnmb0viga";
77 };
88
99 srcs = [ src
1010 (fetchurl {
1111 url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
12− sha256 = "1lpydca95nx5pmqvplb9n3akmxbzvhhypswh0s589ywxpv3zynxm";
12+ sha256 = "18my71s9mddy0k835852ksjzkza7xs73kyxavmdqflh5vkywb6y0";
1313 })];
1414}
pkgs/servers/openafs/1.8/cross-build.patchnew file+223
@@ -0,0 +1,223 @@
1+diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac
2+--- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200
3++++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200
4+@@ -23,6 +23,7 @@
5+
6+ AC_PROG_CC
7+ AC_PROG_LIBTOOL
8++AX_PROG_CC_FOR_BUILD
9+
10+ AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
11+ AC_SUBST([PATH_CPP])
12+diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4
13+--- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 1970-01-01 01:00:00.000000000 +0100
14++++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 2018-10-16 16:20:40.278641658 +0200
15+@@ -0,0 +1,125 @@
16++# ===========================================================================
17++# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
18++# ===========================================================================
19++#
20++# SYNOPSIS
21++#
22++# AX_PROG_CC_FOR_BUILD
23++#
24++# DESCRIPTION
25++#
26++# This macro searches for a C compiler that generates native executables,
27++# that is a C compiler that surely is not a cross-compiler. This can be
28++# useful if you have to generate source code at compile-time like for
29++# example GCC does.
30++#
31++# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
32++# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
33++# The value of these variables can be overridden by the user by specifying
34++# a compiler with an environment variable (like you do for standard CC).
35++#
36++# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
37++# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
38++# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
39++# substituted in the Makefile.
40++#
41++# LICENSE
42++#
43++# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
44++#
45++# Copying and distribution of this file, with or without modification, are
46++# permitted in any medium without royalty provided the copyright notice
47++# and this notice are preserved. This file is offered as-is, without any
48++# warranty.
49++
50++#serial 9
51++
52++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
53++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
54++AC_REQUIRE([AC_PROG_CC])dnl
55++AC_REQUIRE([AC_PROG_CPP])dnl
56++AC_REQUIRE([AC_EXEEXT])dnl
57++AC_REQUIRE([AC_CANONICAL_HOST])dnl
58++
59++dnl Use the standard macros, but make them use other variable names
60++dnl
61++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
62++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
63++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
64++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
65++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
66++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
67++pushdef([ac_cv_objext], ac_cv_build_objext)dnl
68++pushdef([ac_exeext], ac_build_exeext)dnl
69++pushdef([ac_objext], ac_build_objext)dnl
70++pushdef([CC], CC_FOR_BUILD)dnl
71++pushdef([CPP], CPP_FOR_BUILD)dnl
72++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
73++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
74++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
75++pushdef([host], build)dnl
76++pushdef([host_alias], build_alias)dnl
77++pushdef([host_cpu], build_cpu)dnl
78++pushdef([host_vendor], build_vendor)dnl
79++pushdef([host_os], build_os)dnl
80++pushdef([ac_cv_host], ac_cv_build)dnl
81++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
82++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
83++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
84++pushdef([ac_cv_host_os], ac_cv_build_os)dnl
85++pushdef([ac_cpp], ac_build_cpp)dnl
86++pushdef([ac_compile], ac_build_compile)dnl
87++pushdef([ac_link], ac_build_link)dnl
88++
89++save_cross_compiling=$cross_compiling
90++save_ac_tool_prefix=$ac_tool_prefix
91++cross_compiling=no
92++ac_tool_prefix=
93++
94++AC_PROG_CC
95++AC_PROG_CPP
96++AC_EXEEXT
97++
98++ac_tool_prefix=$save_ac_tool_prefix
99++cross_compiling=$save_cross_compiling
100++
101++dnl Restore the old definitions
102++dnl
103++popdef([ac_link])dnl
104++popdef([ac_compile])dnl
105++popdef([ac_cpp])dnl
106++popdef([ac_cv_host_os])dnl
107++popdef([ac_cv_host_vendor])dnl
108++popdef([ac_cv_host_cpu])dnl
109++popdef([ac_cv_host_alias])dnl
110++popdef([ac_cv_host])dnl
111++popdef([host_os])dnl
112++popdef([host_vendor])dnl
113++popdef([host_cpu])dnl
114++popdef([host_alias])dnl
115++popdef([host])dnl
116++popdef([LDFLAGS])dnl
117++popdef([CPPFLAGS])dnl
118++popdef([CFLAGS])dnl
119++popdef([CPP])dnl
120++popdef([CC])dnl
121++popdef([ac_objext])dnl
122++popdef([ac_exeext])dnl
123++popdef([ac_cv_objext])dnl
124++popdef([ac_cv_exeext])dnl
125++popdef([ac_cv_prog_cc_g])dnl
126++popdef([ac_cv_prog_cc_cross])dnl
127++popdef([ac_cv_prog_cc_works])dnl
128++popdef([ac_cv_prog_gcc])dnl
129++popdef([ac_cv_prog_CPP])dnl
130++
131++dnl Finally, set Makefile variables
132++dnl
133++BUILD_EXEEXT=$ac_build_exeext
134++BUILD_OBJEXT=$ac_build_objext
135++AC_SUBST(BUILD_EXEEXT)dnl
136++AC_SUBST(BUILD_OBJEXT)dnl
137++AC_SUBST([CFLAGS_FOR_BUILD])dnl
138++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
139++AC_SUBST([LDFLAGS_FOR_BUILD])dnl
140++])
141+diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in
142+--- openafs-1.8.2/src/comerr/Makefile.in 2018-09-11 17:52:48.000000000 +0200
143++++ openafs-1.8.2.new/src/comerr/Makefile.in 2018-10-16 15:48:19.678898925 +0200
144+@@ -38,11 +38,14 @@
145+ compile_et: compile_et.o error_table.o
146+ $(Q)case $(SYS_NAME) in \
147+ *_linux* | *_umlinux* | *_darwin* ) \
148+- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \
149++ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \
150+ * ) \
151+- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \
152++ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \
153+ esac
154+
155++compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD)
156++compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD)
157++
158+ libafscom_err.a: $(LT_objs)
159+ $(LT_LDLIB_lwp) $(LT_objs)
160+
161+diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in
162+--- openafs-1.8.2/src/config/Makefile.in 2018-09-11 17:52:48.000000000 +0200
163++++ openafs-1.8.2.new/src/config/Makefile.in 2018-10-16 15:48:19.677898926 +0200
164+@@ -54,6 +54,8 @@
165+
166+ config.o: config.c AFS_component_version_number.c
167+
168++config mkvers config.o mc.o: CC=$(CC_FOR_BUILD)
169++
170+ #
171+ # Include installation targets
172+ #
173+diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in
174+--- openafs-1.8.2/src/opr/Makefile.in 2018-09-11 17:52:48.000000000 +0200
175++++ openafs-1.8.2.new/src/opr/Makefile.in 2018-10-16 15:48:19.678898925 +0200
176+@@ -21,7 +21,7 @@
177+ $(TOP_INCDIR)/opr/time.h \
178+ $(TOP_INCDIR)/opr/uuid.h
179+
180+-all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a
181++all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a
182+
183+ liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps)
184+ $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
185+@@ -29,12 +29,26 @@
186+ libopr.a: $(LT_objs)
187+ $(LT_LDLIB_static) $(LT_objs)
188+
189++LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs))
190++
191++%_build.lo: %.c
192++ $(LT_CCRULE) $<
193++
194++libopr_build.a: $(LT_objs_build)
195++ $(LT_LDLIB_static) $(LT_objs_build)
196++
197++libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD)
198++libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD)
199++
200+ libopr_pic.la: $(LT_objs)
201+ $(LT_LDLIB_pic) $(LT_objs)
202+
203+ $(TOP_LIBDIR)/libopr.a: libopr.a
204+ $(INSTALL_DATA) libopr.a $@
205+
206++$(TOP_LIBDIR)/libopr_build.a: libopr_build.a
207++ $(INSTALL_DATA) libopr_build.a $@
208++
209+ $(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la
210+ $(INSTALL_DATA) .libs/libopr_pic.a $@
211+
212+diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in
213+--- openafs-1.8.2/src/rxgen/Makefile.in 2018-09-11 17:52:48.000000000 +0200
214++++ openafs-1.8.2.new/src/rxgen/Makefile.in 2018-10-16 15:48:19.677898926 +0200
215+@@ -25,6 +25,8 @@
216+
217+ CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\""
218+
219++rxgen $(OBJS): CC=$(CC_FOR_BUILD)
220++
221+ #
222+ # Install targets
223+ #
pkgs/servers/openafs/1.8/default.nix+8−4
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
2−, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
3−, libtool_2, removeReferencesTo
1+{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
2+, yacc , glibc, perl, kerberos, libxslt, docbook_xsl
3+, docbook_xml_dtd_43 , libtool_2, removeReferencesTo
44, ncurses # Extra ncurses utilities. Only needed for debugging.
55, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
66}:
@@ -11,12 +11,13 @@ stdenv.mkDerivation rec {
1111 name = "openafs-${version}";
1212 inherit version srcs;
1313
14+ depsBuildBuild = [ buildPackages.stdenv.cc ];
1415 nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
1516 removeReferencesTo which yacc ];
1617
1718 buildInputs = [ kerberos ncurses ];
1819
19− patches = [ ./bosserver.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
20+ patches = [ ./bosserver.patch ./cross-build.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
2021
2122 outputs = [ "out" "dev" "man" "doc" "server" ];
2223
@@ -27,6 +28,9 @@ stdenv.mkDerivation rec {
2728 # Makefiles don't include install targets for all new shared libs, yet.
2829 dontDisableStatic = true;
2930
31+ # Fixes broken format string in 1.8.2
32+ hardeningDisable=[ "format" ];
33+
3034 preConfigure = ''
3135 patchShebangs .
3236 for i in `grep -l -R '/usr/\(include\|src\)' .`; do
pkgs/servers/openafs/1.8/module.nix+2−4
@@ -8,7 +8,7 @@ let
88 kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
99
1010in stdenv.mkDerivation rec {
11− name = "openafs-${version}-${kernel.version}";
11+ name = "openafs-${version}-${kernel.modDirVersion}";
1212 inherit version src;
1313
1414 nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
@@ -54,9 +54,7 @@ in stdenv.mkDerivation rec {
5454 license = licenses.ipl10;
5555 platforms = platforms.linux;
5656 maintainers = [ maintainers.z77z maintainers.spacefrogg ];
57− broken = (versionOlder kernel.version "3.18") ||
58− (versionAtLeast kernel.version "4.18") ||
59− stdenv.targetPlatform.isAarch64;
57+ broken = versionOlder kernel.version "3.18";
6058 };
6159
6260}
pkgs/servers/openafs/1.8/srcs.nix+3−3
@@ -1,14 +1,14 @@
11{ fetchurl }:
22rec {
3− version = "1.8.0";
3+ version = "1.8.2";
44 src = fetchurl {
55 url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
6− sha256 = "63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d";
6+ sha256 = "13hksffp7k5f89c9lc5g5b1q0pc9h7wyarq3sjyjqam7c513xz95";
77 };
88
99 srcs = [ src
1010 (fetchurl {
1111 url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
12− sha256 = "e26f3bb399f524b4978543eb3ec169fd58f2d409cf4bc22c75c65fb9b09f12e8";
12+ sha256 = "09n8nymrhpyb0fhahpln2spzhy9pn48hvry35ccqif2jd4wsxdmr";
1313 })];
1414}
pkgs/servers/trezord/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildGoPackage rec {
44 name = "trezord-go-${version}";
5− version = "2.0.19";
5+ version = "2.0.24";
66
77 # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
88 hardeningDisable = [ "fortify" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
1313 owner = "trezor";
1414 repo = "trezord-go";
1515 rev = "v${version}";
16− sha256 = "19am5zs2mx36w2f8b5001i1sg6v72y1nq5cagnw6rza8qxyw83qs";
16+ sha256 = "1fl2d57qqrrwl995w4b2d57rvl2cxxy6afjmcp648hhb3dnmp7c3";
1717 };
1818
1919 meta = with stdenv.lib; {
pkgs/servers/x11/xorg/default.nix+759−511
@@ -1,2771 +1,3019 @@
11# THIS IS A GENERATED FILE. DO NOT EDIT!
2−args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
3−, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol
4−, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
5−, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
2+{ lib, newScope, pixman }:
63
7−let
8−
9− mkDerivation = name: attrs:
10− let newAttrs = (overrides."${name}" or (x: x)) attrs;
11− stdenv = newAttrs.stdenv or args.stdenv;
12− in stdenv.mkDerivation ((removeAttrs newAttrs [ "stdenv" ]) // {
13− hardeningDisable = [ "bindnow" "relro" ];
14− });
15−
16− overrides = import ./overrides.nix {inherit args xorg;};
17−
18− xorg = rec {
4+lib.makeScope newScope (self: with self; {
195
206 inherit pixman;
217
22− applewmproto = (mkDerivation "applewmproto" {
8+ applewmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
239 name = "applewmproto-1.4.2";
2410 builder = ./builder.sh;
2511 src = fetchurl {
2612 url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2;
2713 sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
2814 };
15+ hardeningDisable = [ "bindnow" "relro" ];
2916 nativeBuildInputs = [ pkgconfig ];
3017 buildInputs = [ ];
3118 meta.platforms = stdenv.lib.platforms.unix;
32− }) // {inherit ;};
19+ }) {};
3320
34− appres = (mkDerivation "appres" {
21+ appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXt }: stdenv.mkDerivation {
3522 name = "appres-1.0.4";
3623 builder = ./builder.sh;
3724 src = fetchurl {
3825 url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2;
3926 sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz";
4027 };
28+ hardeningDisable = [ "bindnow" "relro" ];
4129 nativeBuildInputs = [ pkgconfig ];
4230 buildInputs = [ libX11 xproto libXt ];
4331 meta.platforms = stdenv.lib.platforms.unix;
44− }) // {inherit libX11 xproto libXt ;};
32+ }) {};
4533
46− bdftopcf = (mkDerivation "bdftopcf" {
34+ bdftopcf = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
4735 name = "bdftopcf-1.1";
4836 builder = ./builder.sh;
4937 src = fetchurl {
5038 url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2;
5139 sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab";
5240 };
41+ hardeningDisable = [ "bindnow" "relro" ];
5342 nativeBuildInputs = [ pkgconfig ];
5443 buildInputs = [ ];
5544 meta.platforms = stdenv.lib.platforms.unix;
56− }) // {inherit ;};
45+ }) {};
5746
58− bigreqsproto = (mkDerivation "bigreqsproto" {
47+ bigreqsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
5948 name = "bigreqsproto-1.1.2";
6049 builder = ./builder.sh;
6150 src = fetchurl {
6251 url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2;
6352 sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
6453 };
54+ hardeningDisable = [ "bindnow" "relro" ];
6555 nativeBuildInputs = [ pkgconfig ];
6656 buildInputs = [ ];
6757 meta.platforms = stdenv.lib.platforms.unix;
68− }) // {inherit ;};
58+ }) {};
6959
70− bitmap = (mkDerivation "bitmap" {
60+ bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xproto, libXt }: stdenv.mkDerivation {
7161 name = "bitmap-1.0.8";
7262 builder = ./builder.sh;
7363 src = fetchurl {
7464 url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz;
7565 sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs";
7666 };
67+ hardeningDisable = [ "bindnow" "relro" ];
7768 nativeBuildInputs = [ pkgconfig ];
7869 buildInputs = [ libX11 libXaw xbitmaps libXmu xproto libXt ];
7970 meta.platforms = stdenv.lib.platforms.unix;
80− }) // {inherit libX11 libXaw xbitmaps libXmu xproto libXt ;};
71+ }) {};
8172
82− compositeproto = (mkDerivation "compositeproto" {
73+ compositeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
8374 name = "compositeproto-0.4.2";
8475 builder = ./builder.sh;
8576 src = fetchurl {
8677 url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2;
8778 sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
8879 };
80+ hardeningDisable = [ "bindnow" "relro" ];
8981 nativeBuildInputs = [ pkgconfig ];
9082 buildInputs = [ ];
9183 meta.platforms = stdenv.lib.platforms.unix;
92− }) // {inherit ;};
84+ }) {};
9385
94− damageproto = (mkDerivation "damageproto" {
86+ damageproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
9587 name = "damageproto-1.2.1";
9688 builder = ./builder.sh;
9789 src = fetchurl {
9890 url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2;
9991 sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
10092 };
93+ hardeningDisable = [ "bindnow" "relro" ];
10194 nativeBuildInputs = [ pkgconfig ];
10295 buildInputs = [ ];
10396 meta.platforms = stdenv.lib.platforms.unix;
104− }) // {inherit ;};
97+ }) {};
10598
106− dmxproto = (mkDerivation "dmxproto" {
99+ dmxproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
107100 name = "dmxproto-2.3.1";
108101 builder = ./builder.sh;
109102 src = fetchurl {
110103 url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2;
111104 sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
112105 };
106+ hardeningDisable = [ "bindnow" "relro" ];
113107 nativeBuildInputs = [ pkgconfig ];
114108 buildInputs = [ ];
115109 meta.platforms = stdenv.lib.platforms.unix;
116− }) // {inherit ;};
110+ }) {};
117111
118− dri2proto = (mkDerivation "dri2proto" {
112+ dri2proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
119113 name = "dri2proto-2.8";
120114 builder = ./builder.sh;
121115 src = fetchurl {
122116 url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2;
123117 sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
124118 };
119+ hardeningDisable = [ "bindnow" "relro" ];
125120 nativeBuildInputs = [ pkgconfig ];
126121 buildInputs = [ ];
127122 meta.platforms = stdenv.lib.platforms.unix;
128− }) // {inherit ;};
123+ }) {};
129124
130− dri3proto = (mkDerivation "dri3proto" {
125+ dri3proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
131126 name = "dri3proto-1.0";
132127 builder = ./builder.sh;
133128 src = fetchurl {
134129 url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2;
135130 sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
136131 };
132+ hardeningDisable = [ "bindnow" "relro" ];
137133 nativeBuildInputs = [ pkgconfig ];
138134 buildInputs = [ ];
139135 meta.platforms = stdenv.lib.platforms.unix;
140− }) // {inherit ;};
136+ }) {};
141137
142− encodings = (mkDerivation "encodings" {
138+ encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
143139 name = "encodings-1.0.4";
144140 builder = ./builder.sh;
145141 src = fetchurl {
146142 url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2;
147143 sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
148144 };
145+ hardeningDisable = [ "bindnow" "relro" ];
149146 nativeBuildInputs = [ pkgconfig ];
150147 buildInputs = [ ];
151148 meta.platforms = stdenv.lib.platforms.unix;
152− }) // {inherit ;};
149+ }) {};
153150
154− fixesproto = (mkDerivation "fixesproto" {
151+ fixesproto = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto }: stdenv.mkDerivation {
155152 name = "fixesproto-5.0";
156153 builder = ./builder.sh;
157154 src = fetchurl {
158155 url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2;
159156 sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
160157 };
158+ hardeningDisable = [ "bindnow" "relro" ];
161159 nativeBuildInputs = [ pkgconfig ];
162160 buildInputs = [ xextproto ];
163161 meta.platforms = stdenv.lib.platforms.unix;
164− }) // {inherit xextproto ;};
162+ }) {};
165163
166− fontadobe100dpi = (mkDerivation "fontadobe100dpi" {
164+ fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
167165 name = "font-adobe-100dpi-1.0.3";
168166 builder = ./builder.sh;
169167 src = fetchurl {
170168 url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2;
171169 sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
172170 };
171+ hardeningDisable = [ "bindnow" "relro" ];
173172 nativeBuildInputs = [ pkgconfig ];
174− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
173+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
174+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
175175 meta.platforms = stdenv.lib.platforms.unix;
176− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
176+ }) {};
177177
178− fontadobe75dpi = (mkDerivation "fontadobe75dpi" {
178+ fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
179179 name = "font-adobe-75dpi-1.0.3";
180180 builder = ./builder.sh;
181181 src = fetchurl {
182182 url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2;
183183 sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
184184 };
185+ hardeningDisable = [ "bindnow" "relro" ];
185186 nativeBuildInputs = [ pkgconfig ];
186− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
187+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
188+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
187189 meta.platforms = stdenv.lib.platforms.unix;
188− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
190+ }) {};
189191
190− fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
192+ fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
191193 name = "font-adobe-utopia-100dpi-1.0.4";
192194 builder = ./builder.sh;
193195 src = fetchurl {
194196 url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2;
195197 sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
196198 };
199+ hardeningDisable = [ "bindnow" "relro" ];
197200 nativeBuildInputs = [ pkgconfig ];
198− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
201+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
202+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
199203 meta.platforms = stdenv.lib.platforms.unix;
200− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
204+ }) {};
201205
202− fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
206+ fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
203207 name = "font-adobe-utopia-75dpi-1.0.4";
204208 builder = ./builder.sh;
205209 src = fetchurl {
206210 url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2;
207211 sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
208212 };
213+ hardeningDisable = [ "bindnow" "relro" ];
209214 nativeBuildInputs = [ pkgconfig ];
210− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
215+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
216+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
211217 meta.platforms = stdenv.lib.platforms.unix;
212− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
218+ }) {};
213219
214− fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
220+ fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
215221 name = "font-adobe-utopia-type1-1.0.4";
216222 builder = ./builder.sh;
217223 src = fetchurl {
218224 url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2;
219225 sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
220226 };
227+ hardeningDisable = [ "bindnow" "relro" ];
221228 nativeBuildInputs = [ pkgconfig ];
222− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
229+ buildInputs = [ mkfontdir mkfontscale ];
230+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
223231 meta.platforms = stdenv.lib.platforms.unix;
224− }) // {inherit mkfontdir mkfontscale ;};
232+ }) {};
225233
226− fontalias = (mkDerivation "fontalias" {
234+ fontalias = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
227235 name = "font-alias-1.0.3";
228236 builder = ./builder.sh;
229237 src = fetchurl {
230238 url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2;
231239 sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
232240 };
241+ hardeningDisable = [ "bindnow" "relro" ];
233242 nativeBuildInputs = [ pkgconfig ];
234243 buildInputs = [ ];
235244 meta.platforms = stdenv.lib.platforms.unix;
236− }) // {inherit ;};
245+ }) {};
237246
238− fontarabicmisc = (mkDerivation "fontarabicmisc" {
247+ fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
239248 name = "font-arabic-misc-1.0.3";
240249 builder = ./builder.sh;
241250 src = fetchurl {
242251 url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2;
243252 sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
244253 };
254+ hardeningDisable = [ "bindnow" "relro" ];
245255 nativeBuildInputs = [ pkgconfig ];
246− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
256+ buildInputs = [ bdftopcf mkfontdir ];
257+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
247258 meta.platforms = stdenv.lib.platforms.unix;
248− }) // {inherit bdftopcf mkfontdir ;};
259+ }) {};
249260
250− fontbh100dpi = (mkDerivation "fontbh100dpi" {
261+ fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
251262 name = "font-bh-100dpi-1.0.3";
252263 builder = ./builder.sh;
253264 src = fetchurl {
254265 url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2;
255266 sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
256267 };
268+ hardeningDisable = [ "bindnow" "relro" ];
257269 nativeBuildInputs = [ pkgconfig ];
258− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
270+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
271+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
259272 meta.platforms = stdenv.lib.platforms.unix;
260− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
273+ }) {};
261274
262− fontbh75dpi = (mkDerivation "fontbh75dpi" {
275+ fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
263276 name = "font-bh-75dpi-1.0.3";
264277 builder = ./builder.sh;
265278 src = fetchurl {
266279 url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2;
267280 sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
268281 };
282+ hardeningDisable = [ "bindnow" "relro" ];
269283 nativeBuildInputs = [ pkgconfig ];
270− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
284+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
285+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
271286 meta.platforms = stdenv.lib.platforms.unix;
272− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
287+ }) {};
273288
274− fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" {
289+ fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
275290 name = "font-bh-lucidatypewriter-100dpi-1.0.3";
276291 builder = ./builder.sh;
277292 src = fetchurl {
278293 url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2;
279294 sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
280295 };
296+ hardeningDisable = [ "bindnow" "relro" ];
281297 nativeBuildInputs = [ pkgconfig ];
282− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
298+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
299+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
283300 meta.platforms = stdenv.lib.platforms.unix;
284− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
301+ }) {};
285302
286− fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" {
303+ fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
287304 name = "font-bh-lucidatypewriter-75dpi-1.0.3";
288305 builder = ./builder.sh;
289306 src = fetchurl {
290307 url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2;
291308 sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
292309 };
310+ hardeningDisable = [ "bindnow" "relro" ];
293311 nativeBuildInputs = [ pkgconfig ];
294− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
312+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
313+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
295314 meta.platforms = stdenv.lib.platforms.unix;
296− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
315+ }) {};
297316
298− fontbhttf = (mkDerivation "fontbhttf" {
317+ fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
299318 name = "font-bh-ttf-1.0.3";
300319 builder = ./builder.sh;
301320 src = fetchurl {
302321 url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2;
303322 sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
304323 };
324+ hardeningDisable = [ "bindnow" "relro" ];
305325 nativeBuildInputs = [ pkgconfig ];
306− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
326+ buildInputs = [ mkfontdir mkfontscale ];
327+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
307328 meta.platforms = stdenv.lib.platforms.unix;
308− }) // {inherit mkfontdir mkfontscale ;};
329+ }) {};
309330
310− fontbhtype1 = (mkDerivation "fontbhtype1" {
331+ fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
311332 name = "font-bh-type1-1.0.3";
312333 builder = ./builder.sh;
313334 src = fetchurl {
314335 url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2;
315336 sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
316337 };
338+ hardeningDisable = [ "bindnow" "relro" ];
317339 nativeBuildInputs = [ pkgconfig ];
318− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
340+ buildInputs = [ mkfontdir mkfontscale ];
341+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
319342 meta.platforms = stdenv.lib.platforms.unix;
320− }) // {inherit mkfontdir mkfontscale ;};
343+ }) {};
321344
322− fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" {
345+ fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
323346 name = "font-bitstream-100dpi-1.0.3";
324347 builder = ./builder.sh;
325348 src = fetchurl {
326349 url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2;
327350 sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
328351 };
352+ hardeningDisable = [ "bindnow" "relro" ];
329353 nativeBuildInputs = [ pkgconfig ];
330− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
354+ buildInputs = [ bdftopcf mkfontdir ];
355+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
331356 meta.platforms = stdenv.lib.platforms.unix;
332− }) // {inherit bdftopcf mkfontdir ;};
357+ }) {};
333358
334− fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" {
359+ fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
335360 name = "font-bitstream-75dpi-1.0.3";
336361 builder = ./builder.sh;
337362 src = fetchurl {
338363 url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2;
339364 sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
340365 };
366+ hardeningDisable = [ "bindnow" "relro" ];
341367 nativeBuildInputs = [ pkgconfig ];
342− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
368+ buildInputs = [ bdftopcf mkfontdir ];
369+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
343370 meta.platforms = stdenv.lib.platforms.unix;
344− }) // {inherit bdftopcf mkfontdir ;};
371+ }) {};
345372
346− fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" {
373+ fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
347374 name = "font-bitstream-type1-1.0.3";
348375 builder = ./builder.sh;
349376 src = fetchurl {
350377 url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2;
351378 sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
352379 };
380+ hardeningDisable = [ "bindnow" "relro" ];
353381 nativeBuildInputs = [ pkgconfig ];
354− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
382+ buildInputs = [ mkfontdir mkfontscale ];
383+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
355384 meta.platforms = stdenv.lib.platforms.unix;
356− }) // {inherit mkfontdir mkfontscale ;};
385+ }) {};
357386
358− fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" {
387+ fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
359388 name = "font-cronyx-cyrillic-1.0.3";
360389 builder = ./builder.sh;
361390 src = fetchurl {
362391 url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2;
363392 sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
364393 };
394+ hardeningDisable = [ "bindnow" "relro" ];
365395 nativeBuildInputs = [ pkgconfig ];
366− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
396+ buildInputs = [ bdftopcf mkfontdir ];
397+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
367398 meta.platforms = stdenv.lib.platforms.unix;
368− }) // {inherit bdftopcf mkfontdir ;};
399+ }) {};
369400
370− fontcursormisc = (mkDerivation "fontcursormisc" {
401+ fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
371402 name = "font-cursor-misc-1.0.3";
372403 builder = ./builder.sh;
373404 src = fetchurl {
374405 url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2;
375406 sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
376407 };
408+ hardeningDisable = [ "bindnow" "relro" ];
377409 nativeBuildInputs = [ pkgconfig ];
378− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
410+ buildInputs = [ bdftopcf mkfontdir ];
411+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
379412 meta.platforms = stdenv.lib.platforms.unix;
380− }) // {inherit bdftopcf mkfontdir ;};
413+ }) {};
381414
382− fontdaewoomisc = (mkDerivation "fontdaewoomisc" {
415+ fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
383416 name = "font-daewoo-misc-1.0.3";
384417 builder = ./builder.sh;
385418 src = fetchurl {
386419 url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2;
387420 sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
388421 };
422+ hardeningDisable = [ "bindnow" "relro" ];
389423 nativeBuildInputs = [ pkgconfig ];
390− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
424+ buildInputs = [ bdftopcf mkfontdir ];
425+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
391426 meta.platforms = stdenv.lib.platforms.unix;
392− }) // {inherit bdftopcf mkfontdir ;};
427+ }) {};
393428
394− fontdecmisc = (mkDerivation "fontdecmisc" {
429+ fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
395430 name = "font-dec-misc-1.0.3";
396431 builder = ./builder.sh;
397432 src = fetchurl {
398433 url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2;
399434 sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
400435 };
436+ hardeningDisable = [ "bindnow" "relro" ];
401437 nativeBuildInputs = [ pkgconfig ];
402− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
438+ buildInputs = [ bdftopcf mkfontdir ];
439+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
403440 meta.platforms = stdenv.lib.platforms.unix;
404− }) // {inherit bdftopcf mkfontdir ;};
441+ }) {};
405442
406− fontibmtype1 = (mkDerivation "fontibmtype1" {
443+ fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
407444 name = "font-ibm-type1-1.0.3";
408445 builder = ./builder.sh;
409446 src = fetchurl {
410447 url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2;
411448 sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
412449 };
450+ hardeningDisable = [ "bindnow" "relro" ];
413451 nativeBuildInputs = [ pkgconfig ];
414− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
452+ buildInputs = [ mkfontdir mkfontscale ];
453+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
415454 meta.platforms = stdenv.lib.platforms.unix;
416− }) // {inherit mkfontdir mkfontscale ;};
455+ }) {};
417456
418− fontisasmisc = (mkDerivation "fontisasmisc" {
457+ fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
419458 name = "font-isas-misc-1.0.3";
420459 builder = ./builder.sh;
421460 src = fetchurl {
422461 url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2;
423462 sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
424463 };
464+ hardeningDisable = [ "bindnow" "relro" ];
425465 nativeBuildInputs = [ pkgconfig ];
426− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
466+ buildInputs = [ bdftopcf mkfontdir ];
467+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
427468 meta.platforms = stdenv.lib.platforms.unix;
428− }) // {inherit bdftopcf mkfontdir ;};
469+ }) {};
429470
430− fontjismisc = (mkDerivation "fontjismisc" {
471+ fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
431472 name = "font-jis-misc-1.0.3";
432473 builder = ./builder.sh;
433474 src = fetchurl {
434475 url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2;
435476 sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
436477 };
478+ hardeningDisable = [ "bindnow" "relro" ];
437479 nativeBuildInputs = [ pkgconfig ];
438− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
480+ buildInputs = [ bdftopcf mkfontdir ];
481+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
439482 meta.platforms = stdenv.lib.platforms.unix;
440− }) // {inherit bdftopcf mkfontdir ;};
483+ }) {};
441484
442− fontmicromisc = (mkDerivation "fontmicromisc" {
485+ fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
443486 name = "font-micro-misc-1.0.3";
444487 builder = ./builder.sh;
445488 src = fetchurl {
446489 url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2;
447490 sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
448491 };
492+ hardeningDisable = [ "bindnow" "relro" ];
449493 nativeBuildInputs = [ pkgconfig ];
450− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
494+ buildInputs = [ bdftopcf mkfontdir ];
495+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
451496 meta.platforms = stdenv.lib.platforms.unix;
452− }) // {inherit bdftopcf mkfontdir ;};
497+ }) {};
453498
454− fontmisccyrillic = (mkDerivation "fontmisccyrillic" {
499+ fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
455500 name = "font-misc-cyrillic-1.0.3";
456501 builder = ./builder.sh;
457502 src = fetchurl {
458503 url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2;
459504 sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
460505 };
506+ hardeningDisable = [ "bindnow" "relro" ];
461507 nativeBuildInputs = [ pkgconfig ];
462− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
508+ buildInputs = [ bdftopcf mkfontdir ];
509+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
463510 meta.platforms = stdenv.lib.platforms.unix;
464− }) // {inherit bdftopcf mkfontdir ;};
511+ }) {};
465512
466− fontmiscethiopic = (mkDerivation "fontmiscethiopic" {
513+ fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
467514 name = "font-misc-ethiopic-1.0.3";
468515 builder = ./builder.sh;
469516 src = fetchurl {
470517 url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2;
471518 sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
472519 };
520+ hardeningDisable = [ "bindnow" "relro" ];
473521 nativeBuildInputs = [ pkgconfig ];
474− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
522+ buildInputs = [ mkfontdir mkfontscale ];
523+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
475524 meta.platforms = stdenv.lib.platforms.unix;
476− }) // {inherit mkfontdir mkfontscale ;};
525+ }) {};
477526
478− fontmiscmeltho = (mkDerivation "fontmiscmeltho" {
527+ fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
479528 name = "font-misc-meltho-1.0.3";
480529 builder = ./builder.sh;
481530 src = fetchurl {
482531 url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2;
483532 sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
484533 };
534+ hardeningDisable = [ "bindnow" "relro" ];
485535 nativeBuildInputs = [ pkgconfig ];
486− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
536+ buildInputs = [ mkfontdir mkfontscale ];
537+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
487538 meta.platforms = stdenv.lib.platforms.unix;
488− }) // {inherit mkfontdir mkfontscale ;};
539+ }) {};
489540
490− fontmiscmisc = (mkDerivation "fontmiscmisc" {
541+ fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
491542 name = "font-misc-misc-1.1.2";
492543 builder = ./builder.sh;
493544 src = fetchurl {
494545 url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2;
495546 sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
496547 };
548+ hardeningDisable = [ "bindnow" "relro" ];
497549 nativeBuildInputs = [ pkgconfig ];
498− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
550+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
551+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
499552 meta.platforms = stdenv.lib.platforms.unix;
500− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
553+ }) {};
501554
502− fontmuttmisc = (mkDerivation "fontmuttmisc" {
555+ fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
503556 name = "font-mutt-misc-1.0.3";
504557 builder = ./builder.sh;
505558 src = fetchurl {
506559 url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2;
507560 sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
508561 };
562+ hardeningDisable = [ "bindnow" "relro" ];
509563 nativeBuildInputs = [ pkgconfig ];
510− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
564+ buildInputs = [ bdftopcf mkfontdir ];
565+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
511566 meta.platforms = stdenv.lib.platforms.unix;
512− }) // {inherit bdftopcf mkfontdir ;};
567+ }) {};
513568
514− fontschumachermisc = (mkDerivation "fontschumachermisc" {
569+ fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
515570 name = "font-schumacher-misc-1.1.2";
516571 builder = ./builder.sh;
517572 src = fetchurl {
518573 url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2;
519574 sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
520575 };
576+ hardeningDisable = [ "bindnow" "relro" ];
521577 nativeBuildInputs = [ pkgconfig ];
522− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
578+ buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
579+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
523580 meta.platforms = stdenv.lib.platforms.unix;
524− }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
581+ }) {};
525582
526− fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
583+ fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
527584 name = "font-screen-cyrillic-1.0.4";
528585 builder = ./builder.sh;
529586 src = fetchurl {
530587 url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2;
531588 sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
532589 };
590+ hardeningDisable = [ "bindnow" "relro" ];
533591 nativeBuildInputs = [ pkgconfig ];
534− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
592+ buildInputs = [ bdftopcf mkfontdir ];
593+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
535594 meta.platforms = stdenv.lib.platforms.unix;
536− }) // {inherit bdftopcf mkfontdir ;};
595+ }) {};
537596
538− fontsonymisc = (mkDerivation "fontsonymisc" {
597+ fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
539598 name = "font-sony-misc-1.0.3";
540599 builder = ./builder.sh;
541600 src = fetchurl {
542601 url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2;
543602 sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
544603 };
604+ hardeningDisable = [ "bindnow" "relro" ];
545605 nativeBuildInputs = [ pkgconfig ];
546− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
606+ buildInputs = [ bdftopcf mkfontdir ];
607+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
547608 meta.platforms = stdenv.lib.platforms.unix;
548− }) // {inherit bdftopcf mkfontdir ;};
609+ }) {};
549610
550− fontsproto = (mkDerivation "fontsproto" {
611+ fontsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
551612 name = "fontsproto-2.1.3";
552613 builder = ./builder.sh;
553614 src = fetchurl {
554615 url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2;
555616 sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415";
556617 };
618+ hardeningDisable = [ "bindnow" "relro" ];
557619 nativeBuildInputs = [ pkgconfig ];
558620 buildInputs = [ ];
559621 meta.platforms = stdenv.lib.platforms.unix;
560− }) // {inherit ;};
622+ }) {};
561623
562− fontsunmisc = (mkDerivation "fontsunmisc" {
624+ fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
563625 name = "font-sun-misc-1.0.3";
564626 builder = ./builder.sh;
565627 src = fetchurl {
566628 url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2;
567629 sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
568630 };
631+ hardeningDisable = [ "bindnow" "relro" ];
569632 nativeBuildInputs = [ pkgconfig ];
570− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
633+ buildInputs = [ bdftopcf mkfontdir ];
634+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
571635 meta.platforms = stdenv.lib.platforms.unix;
572− }) // {inherit bdftopcf mkfontdir ;};
636+ }) {};
573637
574− fontutil = (mkDerivation "fontutil" {
638+ fontutil = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
575639 name = "font-util-1.3.1";
576640 builder = ./builder.sh;
577641 src = fetchurl {
578642 url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2;
579643 sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma";
580644 };
645+ hardeningDisable = [ "bindnow" "relro" ];
581646 nativeBuildInputs = [ pkgconfig ];
582647 buildInputs = [ ];
583648 meta.platforms = stdenv.lib.platforms.unix;
584− }) // {inherit ;};
649+ }) {};
585650
586− fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" {
651+ fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
587652 name = "font-winitzki-cyrillic-1.0.3";
588653 builder = ./builder.sh;
589654 src = fetchurl {
590655 url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2;
591656 sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
592657 };
658+ hardeningDisable = [ "bindnow" "relro" ];
593659 nativeBuildInputs = [ pkgconfig ];
594− buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
660+ buildInputs = [ bdftopcf mkfontdir ];
661+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
595662 meta.platforms = stdenv.lib.platforms.unix;
596− }) // {inherit bdftopcf mkfontdir ;};
663+ }) {};
597664
598− fontxfree86type1 = (mkDerivation "fontxfree86type1" {
665+ fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
599666 name = "font-xfree86-type1-1.0.4";
600667 builder = ./builder.sh;
601668 src = fetchurl {
602669 url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2;
603670 sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
604671 };
672+ hardeningDisable = [ "bindnow" "relro" ];
605673 nativeBuildInputs = [ pkgconfig ];
606− buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
674+ buildInputs = [ mkfontdir mkfontscale ];
675+ configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
607676 meta.platforms = stdenv.lib.platforms.unix;
608− }) // {inherit mkfontdir mkfontscale ;};
677+ }) {};
609678
610− gccmakedep = (mkDerivation "gccmakedep" {
679+ gccmakedep = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
611680 name = "gccmakedep-1.0.3";
612681 builder = ./builder.sh;
613682 src = fetchurl {
614683 url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2;
615684 sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
616685 };
686+ hardeningDisable = [ "bindnow" "relro" ];
617687 nativeBuildInputs = [ pkgconfig ];
618688 buildInputs = [ ];
619689 meta.platforms = stdenv.lib.platforms.unix;
620− }) // {inherit ;};
690+ }) {};
621691
622− glproto = (mkDerivation "glproto" {
692+ glproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
623693 name = "glproto-1.4.17";
624694 builder = ./builder.sh;
625695 src = fetchurl {
626696 url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2;
627697 sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
628698 };
699+ hardeningDisable = [ "bindnow" "relro" ];
629700 nativeBuildInputs = [ pkgconfig ];
630701 buildInputs = [ ];
631702 meta.platforms = stdenv.lib.platforms.unix;
632− }) // {inherit ;};
703+ }) {};
633704
634− iceauth = (mkDerivation "iceauth" {
705+ iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xproto }: stdenv.mkDerivation {
635706 name = "iceauth-1.0.7";
636707 builder = ./builder.sh;
637708 src = fetchurl {
638709 url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2;
639710 sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj";
640711 };
712+ hardeningDisable = [ "bindnow" "relro" ];
641713 nativeBuildInputs = [ pkgconfig ];
642714 buildInputs = [ libICE xproto ];
643715 meta.platforms = stdenv.lib.platforms.unix;
644− }) // {inherit libICE xproto ;};
716+ }) {};
645717
646− imake = (mkDerivation "imake" {
718+ imake = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
647719 name = "imake-1.0.7";
648720 builder = ./builder.sh;
649721 src = fetchurl {
650722 url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2;
651723 sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
652724 };
725+ hardeningDisable = [ "bindnow" "relro" ];
653726 nativeBuildInputs = [ pkgconfig ];
654727 buildInputs = [ xproto ];
655728 meta.platforms = stdenv.lib.platforms.unix;
656− }) // {inherit xproto ;};
729+ }) {};
657730
658− inputproto = (mkDerivation "inputproto" {
731+ inputproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
659732 name = "inputproto-2.3.2";
660733 builder = ./builder.sh;
661734 src = fetchurl {
662735 url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2;
663736 sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9";
664737 };
738+ hardeningDisable = [ "bindnow" "relro" ];
665739 nativeBuildInputs = [ pkgconfig ];
666740 buildInputs = [ ];
667741 meta.platforms = stdenv.lib.platforms.unix;
668− }) // {inherit ;};
742+ }) {};
669743
670− kbproto = (mkDerivation "kbproto" {
744+ kbproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
671745 name = "kbproto-1.0.7";
672746 builder = ./builder.sh;
673747 src = fetchurl {
674748 url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2;
675749 sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq";
676750 };
751+ hardeningDisable = [ "bindnow" "relro" ];
677752 nativeBuildInputs = [ pkgconfig ];
678753 buildInputs = [ ];
679754 meta.platforms = stdenv.lib.platforms.unix;
680− }) // {inherit ;};
755+ }) {};
681756
682− libAppleWM = (mkDerivation "libAppleWM" {
757+ libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, applewmproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
683758 name = "libAppleWM-1.4.1";
684759 builder = ./builder.sh;
685760 src = fetchurl {
686761 url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2;
687762 sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
688763 };
764+ hardeningDisable = [ "bindnow" "relro" ];
689765 nativeBuildInputs = [ pkgconfig ];
690766 buildInputs = [ applewmproto libX11 libXext xextproto ];
691767 meta.platforms = stdenv.lib.platforms.unix;
692− }) // {inherit applewmproto libX11 libXext xextproto ;};
768+ }) {};
693769
694− libFS = (mkDerivation "libFS" {
770+ libFS = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, xproto, xtrans }: stdenv.mkDerivation {
695771 name = "libFS-1.0.7";
696772 builder = ./builder.sh;
697773 src = fetchurl {
698774 url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2;
699775 sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f";
700776 };
777+ hardeningDisable = [ "bindnow" "relro" ];
701778 nativeBuildInputs = [ pkgconfig ];
702779 buildInputs = [ fontsproto xproto xtrans ];
703780 meta.platforms = stdenv.lib.platforms.unix;
704− }) // {inherit fontsproto xproto xtrans ;};
781+ }) {};
705782
706− libICE = (mkDerivation "libICE" {
783+ libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, xtrans }: stdenv.mkDerivation {
707784 name = "libICE-1.0.9";
708785 builder = ./builder.sh;
709786 src = fetchurl {
710787 url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2;
711788 sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
712789 };
790+ hardeningDisable = [ "bindnow" "relro" ];
713791 nativeBuildInputs = [ pkgconfig ];
714792 buildInputs = [ xproto xtrans ];
715793 meta.platforms = stdenv.lib.platforms.unix;
716− }) // {inherit xproto xtrans ;};
794+ }) {};
717795
718− libSM = (mkDerivation "libSM" {
796+ libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xproto, xtrans }: stdenv.mkDerivation {
719797 name = "libSM-1.2.2";
720798 builder = ./builder.sh;
721799 src = fetchurl {
722800 url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2;
723801 sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b";
724802 };
803+ hardeningDisable = [ "bindnow" "relro" ];
725804 nativeBuildInputs = [ pkgconfig ];
726805 buildInputs = [ libICE libuuid xproto xtrans ];
727806 meta.platforms = stdenv.lib.platforms.unix;
728− }) // {inherit libICE libuuid xproto xtrans ;};
807+ }) {};
729808
730− libWindowsWM = (mkDerivation "libWindowsWM" {
809+ libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, windowswmproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
731810 name = "libWindowsWM-1.0.1";
732811 builder = ./builder.sh;
733812 src = fetchurl {
734813 url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2;
735814 sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
736815 };
816+ hardeningDisable = [ "bindnow" "relro" ];
737817 nativeBuildInputs = [ pkgconfig ];
738818 buildInputs = [ windowswmproto libX11 libXext xextproto ];
739819 meta.platforms = stdenv.lib.platforms.unix;
740− }) // {inherit windowswmproto libX11 libXext xextproto ;};
820+ }) {};
741821
742− libX11 = (mkDerivation "libX11" {
822+ libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation {
743823 name = "libX11-1.6.6";
744824 builder = ./builder.sh;
745825 src = fetchurl {
746826 url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2;
747827 sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5";
748828 };
829+ hardeningDisable = [ "bindnow" "relro" ];
749830 nativeBuildInputs = [ pkgconfig ];
750831 buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
751832 meta.platforms = stdenv.lib.platforms.unix;
752− }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
833+ }) {};
753834
754− libXScrnSaver = (mkDerivation "libXScrnSaver" {
835+ libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, scrnsaverproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
755836 name = "libXScrnSaver-1.2.2";
756837 builder = ./builder.sh;
757838 src = fetchurl {
758839 url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2;
759840 sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
760841 };
842+ hardeningDisable = [ "bindnow" "relro" ];
761843 nativeBuildInputs = [ pkgconfig ];
762844 buildInputs = [ scrnsaverproto libX11 libXext xextproto ];
763845 meta.platforms = stdenv.lib.platforms.unix;
764− }) // {inherit scrnsaverproto libX11 libXext xextproto ;};
846+ }) {};
765847
766− libXau = (mkDerivation "libXau" {
848+ libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
767849 name = "libXau-1.0.8";
768850 builder = ./builder.sh;
769851 src = fetchurl {
770852 url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2;
771853 sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
772854 };
855+ hardeningDisable = [ "bindnow" "relro" ];
773856 nativeBuildInputs = [ pkgconfig ];
774857 buildInputs = [ xproto ];
775858 meta.platforms = stdenv.lib.platforms.unix;
776− }) // {inherit xproto ;};
859+ }) {};
777860
778− libXaw = (mkDerivation "libXaw" {
861+ libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, libXmu, libXpm, xproto, libXt }: stdenv.mkDerivation {
779862 name = "libXaw-1.0.13";
780863 builder = ./builder.sh;
781864 src = fetchurl {
782865 url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2;
783866 sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f";
784867 };
868+ hardeningDisable = [ "bindnow" "relro" ];
785869 nativeBuildInputs = [ pkgconfig ];
786870 buildInputs = [ libX11 libXext xextproto libXmu libXpm xproto libXt ];
787871 meta.platforms = stdenv.lib.platforms.unix;
788− }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
872+ }) {};
789873
790− libXcomposite = (mkDerivation "libXcomposite" {
874+ libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, compositeproto, libX11, libXfixes, xproto }: stdenv.mkDerivation {
791875 name = "libXcomposite-0.4.4";
792876 builder = ./builder.sh;
793877 src = fetchurl {
794878 url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2;
795879 sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
796880 };
881+ hardeningDisable = [ "bindnow" "relro" ];
797882 nativeBuildInputs = [ pkgconfig ];
798883 buildInputs = [ compositeproto libX11 libXfixes xproto ];
799884 meta.platforms = stdenv.lib.platforms.unix;
800− }) // {inherit compositeproto libX11 libXfixes xproto ;};
885+ }) {};
801886
802− libXcursor = (mkDerivation "libXcursor" {
887+ libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, libXfixes, xproto, libXrender }: stdenv.mkDerivation {
803888 name = "libXcursor-1.1.15";
804889 builder = ./builder.sh;
805890 src = fetchurl {
806891 url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2;
807892 sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9";
808893 };
894+ hardeningDisable = [ "bindnow" "relro" ];
809895 nativeBuildInputs = [ pkgconfig ];
810896 buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ];
811897 meta.platforms = stdenv.lib.platforms.unix;
812− }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
898+ }) {};
813899
814− libXdamage = (mkDerivation "libXdamage" {
900+ libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, damageproto, fixesproto, libX11, xextproto, libXfixes, xproto }: stdenv.mkDerivation {
815901 name = "libXdamage-1.1.4";
816902 builder = ./builder.sh;
817903 src = fetchurl {
818904 url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2;
819905 sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
820906 };
907+ hardeningDisable = [ "bindnow" "relro" ];
821908 nativeBuildInputs = [ pkgconfig ];
822909 buildInputs = [ damageproto fixesproto libX11 xextproto libXfixes xproto ];
823910 meta.platforms = stdenv.lib.platforms.unix;
824− }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
911+ }) {};
825912
826− libXdmcp = (mkDerivation "libXdmcp" {
913+ libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
827914 name = "libXdmcp-1.1.2";
828915 builder = ./builder.sh;
829916 src = fetchurl {
830917 url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2;
831918 sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1";
832919 };
920+ hardeningDisable = [ "bindnow" "relro" ];
833921 nativeBuildInputs = [ pkgconfig ];
834922 buildInputs = [ xproto ];
835923 meta.platforms = stdenv.lib.platforms.unix;
836− }) // {inherit xproto ;};
924+ }) {};
837925
838− libXext = (mkDerivation "libXext" {
926+ libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xextproto, xproto }: stdenv.mkDerivation {
839927 name = "libXext-1.3.3";
840928 builder = ./builder.sh;
841929 src = fetchurl {
842930 url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2;
843931 sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
844932 };
933+ hardeningDisable = [ "bindnow" "relro" ];
845934 nativeBuildInputs = [ pkgconfig ];
846935 buildInputs = [ libX11 xextproto xproto ];
847936 meta.platforms = stdenv.lib.platforms.unix;
848− }) // {inherit libX11 xextproto xproto ;};
937+ }) {};
849938
850− libXfixes = (mkDerivation "libXfixes" {
939+ libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, xextproto, xproto }: stdenv.mkDerivation {
851940 name = "libXfixes-5.0.3";
852941 builder = ./builder.sh;
853942 src = fetchurl {
854943 url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2;
855944 sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y";
856945 };
946+ hardeningDisable = [ "bindnow" "relro" ];
857947 nativeBuildInputs = [ pkgconfig ];
858948 buildInputs = [ fixesproto libX11 xextproto xproto ];
859949 meta.platforms = stdenv.lib.platforms.unix;
860− }) // {inherit fixesproto libX11 xextproto xproto ;};
950+ }) {};
861951
862− libXfont = (mkDerivation "libXfont" {
952+ libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation {
863953 name = "libXfont-1.5.4";
864954 builder = ./builder.sh;
865955 src = fetchurl {
866956 url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2;
867957 sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs";
868958 };
959+ hardeningDisable = [ "bindnow" "relro" ];
869960 nativeBuildInputs = [ pkgconfig ];
870961 buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ];
871962 meta.platforms = stdenv.lib.platforms.unix;
872− }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
963+ }) {};
873964
874− libXfont2 = (mkDerivation "libXfont2" {
965+ libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation {
875966 name = "libXfont2-2.0.3";
876967 builder = ./builder.sh;
877968 src = fetchurl {
878969 url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2;
879970 sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf";
880971 };
972+ hardeningDisable = [ "bindnow" "relro" ];
881973 nativeBuildInputs = [ pkgconfig ];
882974 buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ];
883975 meta.platforms = stdenv.lib.platforms.unix;
884− }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
976+ }) {};
885977
886− libXft = (mkDerivation "libXft" {
978+ libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xproto, libXrender }: stdenv.mkDerivation {
887979 name = "libXft-2.3.2";
888980 builder = ./builder.sh;
889981 src = fetchurl {
890982 url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2;
891983 sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
892984 };
985+ hardeningDisable = [ "bindnow" "relro" ];
893986 nativeBuildInputs = [ pkgconfig ];
894987 buildInputs = [ fontconfig freetype libX11 xproto libXrender ];
895988 meta.platforms = stdenv.lib.platforms.unix;
896− }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
989+ }) {};
897990
898− libXi = (mkDerivation "libXi" {
991+ libXi = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, xextproto, libXfixes, xproto }: stdenv.mkDerivation {
899992 name = "libXi-1.7.9";
900993 builder = ./builder.sh;
901994 src = fetchurl {
902995 url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2;
903996 sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2";
904997 };
998+ hardeningDisable = [ "bindnow" "relro" ];
905999 nativeBuildInputs = [ pkgconfig ];
9061000 buildInputs = [ inputproto libX11 libXext xextproto libXfixes xproto ];
9071001 meta.platforms = stdenv.lib.platforms.unix;
908− }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
1002+ }) {};
9091003
910− libXinerama = (mkDerivation "libXinerama" {
1004+ libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xineramaproto }: stdenv.mkDerivation {
9111005 name = "libXinerama-1.1.4";
9121006 builder = ./builder.sh;
9131007 src = fetchurl {
9141008 url = mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2;
9151009 sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200";
9161010 };
1011+ hardeningDisable = [ "bindnow" "relro" ];
9171012 nativeBuildInputs = [ pkgconfig ];
9181013 buildInputs = [ libX11 libXext xextproto xineramaproto ];
9191014 meta.platforms = stdenv.lib.platforms.unix;
920− }) // {inherit libX11 libXext xextproto xineramaproto ;};
1015+ }) {};
9211016
922− libXmu = (mkDerivation "libXmu" {
1017+ libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation {
9231018 name = "libXmu-1.1.2";
9241019 builder = ./builder.sh;
9251020 src = fetchurl {
9261021 url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2;
9271022 sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
9281023 };
1024+ hardeningDisable = [ "bindnow" "relro" ];
9291025 nativeBuildInputs = [ pkgconfig ];
9301026 buildInputs = [ libX11 libXext xextproto xproto libXt ];
9311027 meta.platforms = stdenv.lib.platforms.unix;
932− }) // {inherit libX11 libXext xextproto xproto libXt ;};
1028+ }) {};
9331029
934− libXp = (mkDerivation "libXp" {
1030+ libXp = callPackage ({ stdenv, pkgconfig, fetchurl, printproto, libX11, libXau, libXext, xextproto }: stdenv.mkDerivation {
9351031 name = "libXp-1.0.3";
9361032 builder = ./builder.sh;
9371033 src = fetchurl {
9381034 url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2;
9391035 sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz";
9401036 };
1037+ hardeningDisable = [ "bindnow" "relro" ];
9411038 nativeBuildInputs = [ pkgconfig ];
9421039 buildInputs = [ printproto libX11 libXau libXext xextproto ];
9431040 meta.platforms = stdenv.lib.platforms.unix;
944− }) // {inherit printproto libX11 libXau libXext xextproto ;};
1041+ }) {};
9451042
946− libXpm = (mkDerivation "libXpm" {
1043+ libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation {
9471044 name = "libXpm-3.5.12";
9481045 builder = ./builder.sh;
9491046 src = fetchurl {
9501047 url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2;
9511048 sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
9521049 };
1050+ hardeningDisable = [ "bindnow" "relro" ];
9531051 nativeBuildInputs = [ pkgconfig ];
9541052 buildInputs = [ libX11 libXext xextproto xproto libXt ];
9551053 meta.platforms = stdenv.lib.platforms.unix;
956− }) // {inherit libX11 libXext xextproto xproto libXt ;};
1054+ }) {};
9571055
958− libXpresent = (mkDerivation "libXpresent" {
1056+ libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, presentproto, libX11, xextproto, xproto }: stdenv.mkDerivation {
9591057 name = "libXpresent-1.0.0";
9601058 builder = ./builder.sh;
9611059 src = fetchurl {
9621060 url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2;
9631061 sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1";
9641062 };
1063+ hardeningDisable = [ "bindnow" "relro" ];
9651064 nativeBuildInputs = [ pkgconfig ];
9661065 buildInputs = [ presentproto libX11 xextproto xproto ];
9671066 meta.platforms = stdenv.lib.platforms.unix;
968− }) // {inherit presentproto libX11 xextproto xproto ;};
1067+ }) {};
9691068
970− libXrandr = (mkDerivation "libXrandr" {
1069+ libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, renderproto, libX11, libXext, xextproto, xproto, libXrender }: stdenv.mkDerivation {
9711070 name = "libXrandr-1.5.1";
9721071 builder = ./builder.sh;
9731072 src = fetchurl {
9741073 url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2;
9751074 sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z";
9761075 };
1076+ hardeningDisable = [ "bindnow" "relro" ];
9771077 nativeBuildInputs = [ pkgconfig ];
9781078 buildInputs = [ randrproto renderproto libX11 libXext xextproto xproto libXrender ];
9791079 meta.platforms = stdenv.lib.platforms.unix;
980− }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
1080+ }) {};
9811081
982− libXrender = (mkDerivation "libXrender" {
1082+ libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, renderproto, libX11, xproto }: stdenv.mkDerivation {
9831083 name = "libXrender-0.9.10";
9841084 builder = ./builder.sh;
9851085 src = fetchurl {
9861086 url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2;
9871087 sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0";
9881088 };
1089+ hardeningDisable = [ "bindnow" "relro" ];
9891090 nativeBuildInputs = [ pkgconfig ];
9901091 buildInputs = [ renderproto libX11 xproto ];
9911092 meta.platforms = stdenv.lib.platforms.unix;
992− }) // {inherit renderproto libX11 xproto ;};
1093+ }) {};
9931094
994− libXres = (mkDerivation "libXres" {
1095+ libXres = callPackage ({ stdenv, pkgconfig, fetchurl, resourceproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation {
9951096 name = "libXres-1.2.0";
9961097 builder = ./builder.sh;
9971098 src = fetchurl {
9981099 url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2;
9991100 sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz";
10001101 };
1102+ hardeningDisable = [ "bindnow" "relro" ];
10011103 nativeBuildInputs = [ pkgconfig ];
10021104 buildInputs = [ resourceproto libX11 libXext xextproto xproto ];
10031105 meta.platforms = stdenv.lib.platforms.unix;
1004− }) // {inherit resourceproto libX11 libXext xextproto xproto ;};
1106+ }) {};
10051107
1006− libXt = (mkDerivation "libXt" {
1108+ libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, kbproto, libSM, libX11, xproto }: stdenv.mkDerivation {
10071109 name = "libXt-1.1.5";
10081110 builder = ./builder.sh;
10091111 src = fetchurl {
10101112 url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2;
10111113 sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6";
10121114 };
1115+ hardeningDisable = [ "bindnow" "relro" ];
10131116 nativeBuildInputs = [ pkgconfig ];
10141117 buildInputs = [ libICE kbproto libSM libX11 xproto ];
10151118 meta.platforms = stdenv.lib.platforms.unix;
1016− }) // {inherit libICE kbproto libSM libX11 xproto ;};
1119+ }) {};
10171120
1018− libXtst = (mkDerivation "libXtst" {
1121+ libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, recordproto, libX11, libXext, xextproto, libXi }: stdenv.mkDerivation {
10191122 name = "libXtst-1.2.3";
10201123 builder = ./builder.sh;
10211124 src = fetchurl {
10221125 url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2;
10231126 sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6";
10241127 };
1128+ hardeningDisable = [ "bindnow" "relro" ];
10251129 nativeBuildInputs = [ pkgconfig ];
10261130 buildInputs = [ inputproto recordproto libX11 libXext xextproto libXi ];
10271131 meta.platforms = stdenv.lib.platforms.unix;
1028− }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
1132+ }) {};
10291133
1030− libXv = (mkDerivation "libXv" {
1134+ libXv = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation {
10311135 name = "libXv-1.0.11";
10321136 builder = ./builder.sh;
10331137 src = fetchurl {
10341138 url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2;
10351139 sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j";
10361140 };
1141+ hardeningDisable = [ "bindnow" "relro" ];
10371142 nativeBuildInputs = [ pkgconfig ];
10381143 buildInputs = [ videoproto libX11 libXext xextproto xproto ];
10391144 meta.platforms = stdenv.lib.platforms.unix;
1040− }) // {inherit videoproto libX11 libXext xextproto xproto ;};
1145+ }) {};
10411146
1042− libXvMC = (mkDerivation "libXvMC" {
1147+ libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto, libXv }: stdenv.mkDerivation {
10431148 name = "libXvMC-1.0.10";
10441149 builder = ./builder.sh;
10451150 src = fetchurl {
10461151 url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2;
10471152 sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5";
10481153 };
1154+ hardeningDisable = [ "bindnow" "relro" ];
10491155 nativeBuildInputs = [ pkgconfig ];
10501156 buildInputs = [ videoproto libX11 libXext xextproto xproto libXv ];
10511157 meta.platforms = stdenv.lib.platforms.unix;
1052− }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
1158+ }) {};
10531159
1054− libXxf86dga = (mkDerivation "libXxf86dga" {
1160+ libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86dgaproto, xproto }: stdenv.mkDerivation {
10551161 name = "libXxf86dga-1.1.4";
10561162 builder = ./builder.sh;
10571163 src = fetchurl {
10581164 url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2;
10591165 sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
10601166 };
1167+ hardeningDisable = [ "bindnow" "relro" ];
10611168 nativeBuildInputs = [ pkgconfig ];
10621169 buildInputs = [ libX11 libXext xextproto xf86dgaproto xproto ];
10631170 meta.platforms = stdenv.lib.platforms.unix;
1064− }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
1171+ }) {};
10651172
1066− libXxf86misc = (mkDerivation "libXxf86misc" {
1173+ libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86miscproto, xproto }: stdenv.mkDerivation {
10671174 name = "libXxf86misc-1.0.3";
10681175 builder = ./builder.sh;
10691176 src = fetchurl {
10701177 url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2;
10711178 sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn";
10721179 };
1180+ hardeningDisable = [ "bindnow" "relro" ];
10731181 nativeBuildInputs = [ pkgconfig ];
10741182 buildInputs = [ libX11 libXext xextproto xf86miscproto xproto ];
10751183 meta.platforms = stdenv.lib.platforms.unix;
1076− }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
1184+ }) {};
10771185
1078− libXxf86vm = (mkDerivation "libXxf86vm" {
1186+ libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86vidmodeproto, xproto }: stdenv.mkDerivation {
10791187 name = "libXxf86vm-1.1.4";
10801188 builder = ./builder.sh;
10811189 src = fetchurl {
10821190 url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2;
10831191 sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg";
10841192 };
1193+ hardeningDisable = [ "bindnow" "relro" ];
10851194 nativeBuildInputs = [ pkgconfig ];
10861195 buildInputs = [ libX11 libXext xextproto xf86vidmodeproto xproto ];
10871196 meta.platforms = stdenv.lib.platforms.unix;
1088− }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
1197+ }) {};
10891198
1090− libdmx = (mkDerivation "libdmx" {
1199+ libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, dmxproto, libX11, libXext, xextproto }: stdenv.mkDerivation {
10911200 name = "libdmx-1.1.3";
10921201 builder = ./builder.sh;
10931202 src = fetchurl {
10941203 url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2;
10951204 sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9";
10961205 };
1206+ hardeningDisable = [ "bindnow" "relro" ];
10971207 nativeBuildInputs = [ pkgconfig ];
10981208 buildInputs = [ dmxproto libX11 libXext xextproto ];
10991209 meta.platforms = stdenv.lib.platforms.unix;
1100− }) // {inherit dmxproto libX11 libXext xextproto ;};
1210+ }) {};
11011211
1102− libfontenc = (mkDerivation "libfontenc" {
1212+ libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, zlib }: stdenv.mkDerivation {
11031213 name = "libfontenc-1.1.3";
11041214 builder = ./builder.sh;
11051215 src = fetchurl {
11061216 url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2;
11071217 sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h";
11081218 };
1219+ hardeningDisable = [ "bindnow" "relro" ];
11091220 nativeBuildInputs = [ pkgconfig ];
11101221 buildInputs = [ xproto zlib ];
11111222 meta.platforms = stdenv.lib.platforms.unix;
1112− }) // {inherit xproto zlib ;};
1223+ }) {};
11131224
1114− libpciaccess = (mkDerivation "libpciaccess" {
1225+ libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation {
11151226 name = "libpciaccess-0.14";
11161227 builder = ./builder.sh;
11171228 src = fetchurl {
11181229 url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2;
11191230 sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x";
11201231 };
1232+ hardeningDisable = [ "bindnow" "relro" ];
11211233 nativeBuildInputs = [ pkgconfig ];
11221234 buildInputs = [ zlib ];
11231235 meta.platforms = stdenv.lib.platforms.unix;
1124− }) // {inherit zlib ;};
1236+ }) {};
11251237
1126− libpthreadstubs = (mkDerivation "libpthreadstubs" {
1238+ libpthreadstubs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
11271239 name = "libpthread-stubs-0.4";
11281240 builder = ./builder.sh;
11291241 src = fetchurl {
11301242 url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2;
11311243 sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74";
11321244 };
1245+ hardeningDisable = [ "bindnow" "relro" ];
11331246 nativeBuildInputs = [ pkgconfig ];
11341247 buildInputs = [ ];
11351248 meta.platforms = stdenv.lib.platforms.unix;
1136− }) // {inherit ;};
1249+ }) {};
11371250
1138− libxcb = (mkDerivation "libxcb" {
1251+ libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation {
11391252 name = "libxcb-1.13.1";
11401253 builder = ./builder.sh;
11411254 src = fetchurl {
11421255 url = http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2;
11431256 sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8";
11441257 };
1258+ hardeningDisable = [ "bindnow" "relro" ];
11451259 nativeBuildInputs = [ pkgconfig ];
11461260 buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
11471261 meta.platforms = stdenv.lib.platforms.unix;
1148− }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
1262+ }) {};
11491263
1150− libxkbfile = (mkDerivation "libxkbfile" {
1264+ libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, kbproto, libX11 }: stdenv.mkDerivation {
11511265 name = "libxkbfile-1.0.9";
11521266 builder = ./builder.sh;
11531267 src = fetchurl {
11541268 url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2;
11551269 sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai";
11561270 };
1271+ hardeningDisable = [ "bindnow" "relro" ];
11571272 nativeBuildInputs = [ pkgconfig ];
11581273 buildInputs = [ kbproto libX11 ];
11591274 meta.platforms = stdenv.lib.platforms.unix;
1160− }) // {inherit kbproto libX11 ;};
1275+ }) {};
11611276
1162− libxshmfence = (mkDerivation "libxshmfence" {
1277+ libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
11631278 name = "libxshmfence-1.2";
11641279 builder = ./builder.sh;
11651280 src = fetchurl {
11661281 url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2;
11671282 sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj";
11681283 };
1284+ hardeningDisable = [ "bindnow" "relro" ];
11691285 nativeBuildInputs = [ pkgconfig ];
11701286 buildInputs = [ xproto ];
11711287 meta.platforms = stdenv.lib.platforms.unix;
1172− }) // {inherit xproto ;};
1288+ }) {};
11731289
1174− lndir = (mkDerivation "lndir" {
1290+ lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
11751291 name = "lndir-1.0.3";
11761292 builder = ./builder.sh;
11771293 src = fetchurl {
11781294 url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2;
11791295 sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
11801296 };
1297+ hardeningDisable = [ "bindnow" "relro" ];
11811298 nativeBuildInputs = [ pkgconfig ];
11821299 buildInputs = [ xproto ];
11831300 meta.platforms = stdenv.lib.platforms.unix;
1184− }) // {inherit xproto ;};
1301+ }) {};
11851302
1186− luit = (mkDerivation "luit" {
1303+ luit = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc }: stdenv.mkDerivation {
11871304 name = "luit-1.1.1";
11881305 builder = ./builder.sh;
11891306 src = fetchurl {
11901307 url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2;
11911308 sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
11921309 };
1310+ hardeningDisable = [ "bindnow" "relro" ];
11931311 nativeBuildInputs = [ pkgconfig ];
11941312 buildInputs = [ libfontenc ];
11951313 meta.platforms = stdenv.lib.platforms.unix;
1196− }) // {inherit libfontenc ;};
1314+ }) {};
11971315
1198− makedepend = (mkDerivation "makedepend" {
1316+ makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
11991317 name = "makedepend-1.0.5";
12001318 builder = ./builder.sh;
12011319 src = fetchurl {
12021320 url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2;
12031321 sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
12041322 };
1323+ hardeningDisable = [ "bindnow" "relro" ];
12051324 nativeBuildInputs = [ pkgconfig ];
12061325 buildInputs = [ xproto ];
12071326 meta.platforms = stdenv.lib.platforms.unix;
1208− }) // {inherit xproto ;};
1327+ }) {};
12091328
1210− mkfontdir = (mkDerivation "mkfontdir" {
1329+ mkfontdir = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
12111330 name = "mkfontdir-1.0.7";
12121331 builder = ./builder.sh;
12131332 src = fetchurl {
12141333 url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2;
12151334 sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
12161335 };
1336+ hardeningDisable = [ "bindnow" "relro" ];
12171337 nativeBuildInputs = [ pkgconfig ];
12181338 buildInputs = [ ];
12191339 meta.platforms = stdenv.lib.platforms.unix;
1220− }) // {inherit ;};
1340+ }) {};
12211341
1222− mkfontscale = (mkDerivation "mkfontscale" {
1342+ mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xproto, zlib }: stdenv.mkDerivation {
12231343 name = "mkfontscale-1.1.2";
12241344 builder = ./builder.sh;
12251345 src = fetchurl {
12261346 url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2;
12271347 sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc";
12281348 };
1349+ hardeningDisable = [ "bindnow" "relro" ];
12291350 nativeBuildInputs = [ pkgconfig ];
12301351 buildInputs = [ libfontenc freetype xproto zlib ];
12311352 meta.platforms = stdenv.lib.platforms.unix;
1232− }) // {inherit libfontenc freetype xproto zlib ;};
1353+ }) {};
12331354
1234− presentproto = (mkDerivation "presentproto" {
1355+ presentproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
12351356 name = "presentproto-1.1";
12361357 builder = ./builder.sh;
12371358 src = fetchurl {
12381359 url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2;
12391360 sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn";
12401361 };
1362+ hardeningDisable = [ "bindnow" "relro" ];
12411363 nativeBuildInputs = [ pkgconfig ];
12421364 buildInputs = [ ];
12431365 meta.platforms = stdenv.lib.platforms.unix;
1244− }) // {inherit ;};
1366+ }) {};
12451367
1246− printproto = (mkDerivation "printproto" {
1368+ printproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXau }: stdenv.mkDerivation {
12471369 name = "printproto-1.0.5";
12481370 builder = ./builder.sh;
12491371 src = fetchurl {
12501372 url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2;
12511373 sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j";
12521374 };
1375+ hardeningDisable = [ "bindnow" "relro" ];
12531376 nativeBuildInputs = [ pkgconfig ];
12541377 buildInputs = [ libXau ];
12551378 meta.platforms = stdenv.lib.platforms.unix;
1256− }) // {inherit libXau ;};
1379+ }) {};
12571380
1258− randrproto = (mkDerivation "randrproto" {
1381+ randrproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
12591382 name = "randrproto-1.5.0";
12601383 builder = ./builder.sh;
12611384 src = fetchurl {
12621385 url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2;
12631386 sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc";
12641387 };
1388+ hardeningDisable = [ "bindnow" "relro" ];
12651389 nativeBuildInputs = [ pkgconfig ];
12661390 buildInputs = [ ];
12671391 meta.platforms = stdenv.lib.platforms.unix;
1268− }) // {inherit ;};
1392+ }) {};
12691393
1270− recordproto = (mkDerivation "recordproto" {
1394+ recordproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
12711395 name = "recordproto-1.14.2";
12721396 builder = ./builder.sh;
12731397 src = fetchurl {
12741398 url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2;
12751399 sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
12761400 };
1401+ hardeningDisable = [ "bindnow" "relro" ];
12771402 nativeBuildInputs = [ pkgconfig ];
12781403 buildInputs = [ ];
12791404 meta.platforms = stdenv.lib.platforms.unix;
1280− }) // {inherit ;};
1405+ }) {};
12811406
1282− renderproto = (mkDerivation "renderproto" {
1407+ renderproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
12831408 name = "renderproto-0.11.1";
12841409 builder = ./builder.sh;
12851410 src = fetchurl {
12861411 url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2;
12871412 sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
12881413 };
1414+ hardeningDisable = [ "bindnow" "relro" ];
12891415 nativeBuildInputs = [ pkgconfig ];
12901416 buildInputs = [ ];
12911417 meta.platforms = stdenv.lib.platforms.unix;
1292− }) // {inherit ;};
1418+ }) {};
12931419
1294− resourceproto = (mkDerivation "resourceproto" {
1420+ resourceproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
12951421 name = "resourceproto-1.2.0";
12961422 builder = ./builder.sh;
12971423 src = fetchurl {
12981424 url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2;
12991425 sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
13001426 };
1427+ hardeningDisable = [ "bindnow" "relro" ];
13011428 nativeBuildInputs = [ pkgconfig ];
13021429 buildInputs = [ ];
13031430 meta.platforms = stdenv.lib.platforms.unix;
1304− }) // {inherit ;};
1431+ }) {};
13051432
1306− scrnsaverproto = (mkDerivation "scrnsaverproto" {
1433+ scrnsaverproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13071434 name = "scrnsaverproto-1.2.2";
13081435 builder = ./builder.sh;
13091436 src = fetchurl {
13101437 url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2;
13111438 sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
13121439 };
1440+ hardeningDisable = [ "bindnow" "relro" ];
13131441 nativeBuildInputs = [ pkgconfig ];
13141442 buildInputs = [ ];
13151443 meta.platforms = stdenv.lib.platforms.unix;
1316− }) // {inherit ;};
1444+ }) {};
13171445
1318− sessreg = (mkDerivation "sessreg" {
1446+ sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation {
13191447 name = "sessreg-1.1.1";
13201448 builder = ./builder.sh;
13211449 src = fetchurl {
13221450 url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2;
13231451 sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq";
13241452 };
1453+ hardeningDisable = [ "bindnow" "relro" ];
13251454 nativeBuildInputs = [ pkgconfig ];
13261455 buildInputs = [ xproto ];
13271456 meta.platforms = stdenv.lib.platforms.unix;
1328− }) // {inherit xproto ;};
1457+ }) {};
13291458
1330− setxkbmap = (mkDerivation "setxkbmap" {
1459+ setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation {
13311460 name = "setxkbmap-1.3.1";
13321461 builder = ./builder.sh;
13331462 src = fetchurl {
13341463 url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2;
13351464 sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9";
13361465 };
1466+ hardeningDisable = [ "bindnow" "relro" ];
13371467 nativeBuildInputs = [ pkgconfig ];
13381468 buildInputs = [ libX11 libxkbfile ];
13391469 meta.platforms = stdenv.lib.platforms.unix;
1340− }) // {inherit libX11 libxkbfile ;};
1470+ }) {};
13411471
1342− smproxy = (mkDerivation "smproxy" {
1472+ smproxy = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation {
13431473 name = "smproxy-1.0.6";
13441474 builder = ./builder.sh;
13451475 src = fetchurl {
13461476 url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2;
13471477 sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc";
13481478 };
1479+ hardeningDisable = [ "bindnow" "relro" ];
13491480 nativeBuildInputs = [ pkgconfig ];
13501481 buildInputs = [ libICE libSM libXmu libXt ];
13511482 meta.platforms = stdenv.lib.platforms.unix;
1352− }) // {inherit libICE libSM libXmu libXt ;};
1483+ }) {};
13531484
1354− twm = (mkDerivation "twm" {
1485+ twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xproto, libXt }: stdenv.mkDerivation {
13551486 name = "twm-1.0.9";
13561487 builder = ./builder.sh;
13571488 src = fetchurl {
13581489 url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2;
13591490 sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5";
13601491 };
1492+ hardeningDisable = [ "bindnow" "relro" ];
13611493 nativeBuildInputs = [ pkgconfig ];
13621494 buildInputs = [ libICE libSM libX11 libXext libXmu xproto libXt ];
13631495 meta.platforms = stdenv.lib.platforms.unix;
1364− }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
1496+ }) {};
13651497
1366− utilmacros = (mkDerivation "utilmacros" {
1498+ utilmacros = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13671499 name = "util-macros-1.19.2";
13681500 builder = ./builder.sh;
13691501 src = fetchurl {
13701502 url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2;
13711503 sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p";
13721504 };
1505+ hardeningDisable = [ "bindnow" "relro" ];
13731506 nativeBuildInputs = [ pkgconfig ];
13741507 buildInputs = [ ];
13751508 meta.platforms = stdenv.lib.platforms.unix;
1376− }) // {inherit ;};
1509+ }) {};
13771510
1378− videoproto = (mkDerivation "videoproto" {
1511+ videoproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13791512 name = "videoproto-2.3.3";
13801513 builder = ./builder.sh;
13811514 src = fetchurl {
13821515 url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2;
13831516 sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067";
13841517 };
1518+ hardeningDisable = [ "bindnow" "relro" ];
13851519 nativeBuildInputs = [ pkgconfig ];
13861520 buildInputs = [ ];
13871521 meta.platforms = stdenv.lib.platforms.unix;
1388− }) // {inherit ;};
1522+ }) {};
13891523
1390− windowswmproto = (mkDerivation "windowswmproto" {
1524+ windowswmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
13911525 name = "windowswmproto-1.0.4";
13921526 builder = ./builder.sh;
13931527 src = fetchurl {
13941528 url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2;
13951529 sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
13961530 };
1531+ hardeningDisable = [ "bindnow" "relro" ];
13971532 nativeBuildInputs = [ pkgconfig ];
13981533 buildInputs = [ ];
13991534 meta.platforms = stdenv.lib.platforms.unix;
1400− }) // {inherit ;};
1535+ }) {};
14011536
1402− x11perf = (mkDerivation "x11perf" {
1537+ x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xproto, libXrender }: stdenv.mkDerivation {
14031538 name = "x11perf-1.6.0";
14041539 builder = ./builder.sh;
14051540 src = fetchurl {
14061541 url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2;
14071542 sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78";
14081543 };
1544+ hardeningDisable = [ "bindnow" "relro" ];
14091545 nativeBuildInputs = [ pkgconfig ];
14101546 buildInputs = [ libX11 libXext libXft libXmu xproto libXrender ];
14111547 meta.platforms = stdenv.lib.platforms.unix;
1412− }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;};
1548+ }) {};
14131549
1414− xauth = (mkDerivation "xauth" {
1550+ xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xproto }: stdenv.mkDerivation {
14151551 name = "xauth-1.0.10";
14161552 builder = ./builder.sh;
14171553 src = fetchurl {
14181554 url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2;
14191555 sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs";
14201556 };
1557+ hardeningDisable = [ "bindnow" "relro" ];
14211558 nativeBuildInputs = [ pkgconfig ];
14221559 buildInputs = [ libX11 libXau libXext libXmu xproto ];
14231560 meta.platforms = stdenv.lib.platforms.unix;
1424− }) // {inherit libX11 libXau libXext libXmu xproto ;};
1561+ }) {};
14251562
1426− xbacklight = (mkDerivation "xbacklight" {
1563+ xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation {
14271564 name = "xbacklight-1.2.2";
14281565 builder = ./builder.sh;
14291566 src = fetchurl {
14301567 url = mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2;
14311568 sha256 = "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1";
14321569 };
1570+ hardeningDisable = [ "bindnow" "relro" ];
14331571 nativeBuildInputs = [ pkgconfig ];
14341572 buildInputs = [ libxcb xcbutil ];
14351573 meta.platforms = stdenv.lib.platforms.unix;
1436− }) // {inherit libxcb xcbutil ;};
1574+ }) {};
14371575
1438− xbitmaps = (mkDerivation "xbitmaps" {
1576+ xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
14391577 name = "xbitmaps-1.1.1";
14401578 builder = ./builder.sh;
14411579 src = fetchurl {
14421580 url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2;
14431581 sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
14441582 };
1583+ hardeningDisable = [ "bindnow" "relro" ];
14451584 nativeBuildInputs = [ pkgconfig ];
14461585 buildInputs = [ ];
14471586 meta.platforms = stdenv.lib.platforms.unix;
1448− }) // {inherit ;};
1587+ }) {};
14491588
1450− xcbproto = (mkDerivation "xcbproto" {
1589+ xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation {
14511590 name = "xcb-proto-1.13";
14521591 builder = ./builder.sh;
14531592 src = fetchurl {
14541593 url = http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2;
14551594 sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
14561595 };
1596+ hardeningDisable = [ "bindnow" "relro" ];
14571597 nativeBuildInputs = [ pkgconfig ];
14581598 buildInputs = [ python ];
14591599 meta.platforms = stdenv.lib.platforms.unix;
1460− }) // {inherit python ;};
1600+ }) {};
14611601
1462− xcbutil = (mkDerivation "xcbutil" {
1602+ xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
14631603 name = "xcb-util-0.4.0";
14641604 builder = ./builder.sh;
14651605 src = fetchurl {
14661606 url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2;
14671607 sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26";
14681608 };
1609+ hardeningDisable = [ "bindnow" "relro" ];
14691610 nativeBuildInputs = [ pkgconfig ];
14701611 buildInputs = [ gperf m4 libxcb xproto ];
14711612 meta.platforms = stdenv.lib.platforms.unix;
1472− }) // {inherit gperf m4 libxcb xproto ;};
1613+ }) {};
14731614
1474− xcbutilcursor = (mkDerivation "xcbutilcursor" {
1615+ xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xproto }: stdenv.mkDerivation {
14751616 name = "xcb-util-cursor-0.1.3";
14761617 builder = ./builder.sh;
14771618 src = fetchurl {
14781619 url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2;
14791620 sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885";
14801621 };
1622+ hardeningDisable = [ "bindnow" "relro" ];
14811623 nativeBuildInputs = [ pkgconfig ];
14821624 buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ];
14831625 meta.platforms = stdenv.lib.platforms.unix;
1484− }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;};
1626+ }) {};
14851627
1486− xcbutilerrors = (mkDerivation "xcbutilerrors" {
1628+ xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xproto }: stdenv.mkDerivation {
14871629 name = "xcb-util-errors-1.0";
14881630 builder = ./builder.sh;
14891631 src = fetchurl {
14901632 url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2;
14911633 sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8";
14921634 };
1635+ hardeningDisable = [ "bindnow" "relro" ];
14931636 nativeBuildInputs = [ pkgconfig ];
14941637 buildInputs = [ gperf m4 libxcb xcbproto xproto ];
14951638 meta.platforms = stdenv.lib.platforms.unix;
1496− }) // {inherit gperf m4 libxcb xcbproto xproto ;};
1639+ }) {};
14971640
1498− xcbutilimage = (mkDerivation "xcbutilimage" {
1641+ xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xproto }: stdenv.mkDerivation {
14991642 name = "xcb-util-image-0.4.0";
15001643 builder = ./builder.sh;
15011644 src = fetchurl {
15021645 url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2;
15031646 sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d";
15041647 };
1648+ hardeningDisable = [ "bindnow" "relro" ];
15051649 nativeBuildInputs = [ pkgconfig ];
15061650 buildInputs = [ gperf m4 libxcb xcbutil xproto ];
15071651 meta.platforms = stdenv.lib.platforms.unix;
1508− }) // {inherit gperf m4 libxcb xcbutil xproto ;};
1652+ }) {};
15091653
1510− xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" {
1654+ xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
15111655 name = "xcb-util-keysyms-0.4.0";
15121656 builder = ./builder.sh;
15131657 src = fetchurl {
15141658 url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2;
15151659 sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f";
15161660 };
1661+ hardeningDisable = [ "bindnow" "relro" ];
15171662 nativeBuildInputs = [ pkgconfig ];
15181663 buildInputs = [ gperf m4 libxcb xproto ];
15191664 meta.platforms = stdenv.lib.platforms.unix;
1520− }) // {inherit gperf m4 libxcb xproto ;};
1665+ }) {};
15211666
1522− xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" {
1667+ xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
15231668 name = "xcb-util-renderutil-0.3.9";
15241669 builder = ./builder.sh;
15251670 src = fetchurl {
15261671 url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2;
15271672 sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
15281673 };
1674+ hardeningDisable = [ "bindnow" "relro" ];
15291675 nativeBuildInputs = [ pkgconfig ];
15301676 buildInputs = [ gperf m4 libxcb xproto ];
15311677 meta.platforms = stdenv.lib.platforms.unix;
1532− }) // {inherit gperf m4 libxcb xproto ;};
1678+ }) {};
15331679
1534− xcbutilwm = (mkDerivation "xcbutilwm" {
1680+ xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation {
15351681 name = "xcb-util-wm-0.4.1";
15361682 builder = ./builder.sh;
15371683 src = fetchurl {
15381684 url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2;
15391685 sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
15401686 };
1687+ hardeningDisable = [ "bindnow" "relro" ];
15411688 nativeBuildInputs = [ pkgconfig ];
15421689 buildInputs = [ gperf m4 libxcb xproto ];
15431690 meta.platforms = stdenv.lib.platforms.unix;
1544− }) // {inherit gperf m4 libxcb xproto ;};
1691+ }) {};
15451692
1546− xclock = (mkDerivation "xclock" {
1693+ xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation {
15471694 name = "xclock-1.0.7";
15481695 builder = ./builder.sh;
15491696 src = fetchurl {
15501697 url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2;
15511698 sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";
15521699 };
1700+ hardeningDisable = [ "bindnow" "relro" ];
15531701 nativeBuildInputs = [ pkgconfig ];
15541702 buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ];
15551703 meta.platforms = stdenv.lib.platforms.unix;
1556− }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
1704+ }) {};
15571705
1558− xcmiscproto = (mkDerivation "xcmiscproto" {
1706+ xcmiscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
15591707 name = "xcmiscproto-1.2.2";
15601708 builder = ./builder.sh;
15611709 src = fetchurl {
15621710 url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2;
15631711 sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
15641712 };
1713+ hardeningDisable = [ "bindnow" "relro" ];
15651714 nativeBuildInputs = [ pkgconfig ];
15661715 buildInputs = [ ];
15671716 meta.platforms = stdenv.lib.platforms.unix;
1568− }) // {inherit ;};
1717+ }) {};
15691718
1570− xcmsdb = (mkDerivation "xcmsdb" {
1719+ xcmsdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11 }: stdenv.mkDerivation {
15711720 name = "xcmsdb-1.0.5";
15721721 builder = ./builder.sh;
15731722 src = fetchurl {
15741723 url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2;
15751724 sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75";
15761725 };
1726+ hardeningDisable = [ "bindnow" "relro" ];
15771727 nativeBuildInputs = [ pkgconfig ];
15781728 buildInputs = [ libX11 ];
15791729 meta.platforms = stdenv.lib.platforms.unix;
1580− }) // {inherit libX11 ;};
1730+ }) {};
15811731
1582− xcompmgr = (mkDerivation "xcompmgr" {
1732+ xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation {
15831733 name = "xcompmgr-1.1.7";
15841734 builder = ./builder.sh;
15851735 src = fetchurl {
15861736 url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2;
15871737 sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168";
15881738 };
1739+ hardeningDisable = [ "bindnow" "relro" ];
15891740 nativeBuildInputs = [ pkgconfig ];
15901741 buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ];
15911742 meta.platforms = stdenv.lib.platforms.unix;
1592− }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;};
1743+ }) {};
15931744
1594− xcursorgen = (mkDerivation "xcursorgen" {
1745+ xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation {
15951746 name = "xcursorgen-1.0.6";
15961747 builder = ./builder.sh;
15971748 src = fetchurl {
15981749 url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2;
15991750 sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
16001751 };
1752+ hardeningDisable = [ "bindnow" "relro" ];
16011753 nativeBuildInputs = [ pkgconfig ];
16021754 buildInputs = [ libpng libX11 libXcursor ];
16031755 meta.platforms = stdenv.lib.platforms.unix;
1604− }) // {inherit libpng libX11 libXcursor ;};
1756+ }) {};
16051757
1606− xcursorthemes = (mkDerivation "xcursorthemes" {
1758+ xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation {
16071759 name = "xcursor-themes-1.0.4";
16081760 builder = ./builder.sh;
16091761 src = fetchurl {
16101762 url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2;
16111763 sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
16121764 };
1765+ hardeningDisable = [ "bindnow" "relro" ];
16131766 nativeBuildInputs = [ pkgconfig ];
16141767 buildInputs = [ libXcursor ];
16151768 meta.platforms = stdenv.lib.platforms.unix;
1616− }) // {inherit libXcursor ;};
1769+ }) {};
16171770
1618− xdm = (mkDerivation "xdm" {
1771+ xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation {
16191772 name = "xdm-1.1.11";
16201773 builder = ./builder.sh;
16211774 src = fetchurl {
16221775 url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2;
16231776 sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
16241777 };
1778+ hardeningDisable = [ "bindnow" "relro" ];
16251779 nativeBuildInputs = [ pkgconfig ];
16261780 buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
16271781 meta.platforms = stdenv.lib.platforms.unix;
1628− }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
1782+ }) {};
16291783
1630− xdpyinfo = (mkDerivation "xdpyinfo" {
1784+ xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation {
16311785 name = "xdpyinfo-1.3.2";
16321786 builder = ./builder.sh;
16331787 src = fetchurl {
16341788 url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2;
16351789 sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh";
16361790 };
1791+ hardeningDisable = [ "bindnow" "relro" ];
16371792 nativeBuildInputs = [ pkgconfig ];
16381793 buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
16391794 meta.platforms = stdenv.lib.platforms.unix;
1640− }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
1795+ }) {};
16411796
1642− xdriinfo = (mkDerivation "xdriinfo" {
1797+ xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, glproto, libX11 }: stdenv.mkDerivation {
16431798 name = "xdriinfo-1.0.5";
16441799 builder = ./builder.sh;
16451800 src = fetchurl {
16461801 url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2;
16471802 sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc";
16481803 };
1804+ hardeningDisable = [ "bindnow" "relro" ];
16491805 nativeBuildInputs = [ pkgconfig ];
16501806 buildInputs = [ glproto libX11 ];
16511807 meta.platforms = stdenv.lib.platforms.unix;
1652− }) // {inherit glproto libX11 ;};
1808+ }) {};
16531809
1654− xev = (mkDerivation "xev" {
1810+ xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr }: stdenv.mkDerivation {
16551811 name = "xev-1.2.2";
16561812 builder = ./builder.sh;
16571813 src = fetchurl {
16581814 url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2;
16591815 sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr";
16601816 };
1817+ hardeningDisable = [ "bindnow" "relro" ];
16611818 nativeBuildInputs = [ pkgconfig ];
16621819 buildInputs = [ libX11 xproto libXrandr ];
16631820 meta.platforms = stdenv.lib.platforms.unix;
1664− }) // {inherit libX11 xproto libXrandr ;};
1821+ }) {};
16651822
1666− xextproto = (mkDerivation "xextproto" {
1823+ xextproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
16671824 name = "xextproto-7.3.0";
16681825 builder = ./builder.sh;
16691826 src = fetchurl {
16701827 url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2;
16711828 sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
16721829 };
1830+ hardeningDisable = [ "bindnow" "relro" ];
16731831 nativeBuildInputs = [ pkgconfig ];
16741832 buildInputs = [ ];
16751833 meta.platforms = stdenv.lib.platforms.unix;
1676− }) // {inherit ;};
1834+ }) {};
16771835
1678− xeyes = (mkDerivation "xeyes" {
1836+ xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation {
16791837 name = "xeyes-1.1.2";
16801838 builder = ./builder.sh;
16811839 src = fetchurl {
16821840 url = mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2;
16831841 sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p";
16841842 };
1843+ hardeningDisable = [ "bindnow" "relro" ];
16851844 nativeBuildInputs = [ pkgconfig ];
1686− buildInputs = [ libX11 libXext libXmu libXrender libXt ];
1845+ buildInputs = [ libX11 libXext libXmu xproto libXrender libXt ];
16871846 meta.platforms = stdenv.lib.platforms.unix;
1688− }) // {inherit libX11 libXext libXmu libXrender libXt ;};
1847+ }) {};
16891848
1690− xf86bigfontproto = (mkDerivation "xf86bigfontproto" {
1849+ xf86bigfontproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
16911850 name = "xf86bigfontproto-1.2.0";
16921851 builder = ./builder.sh;
16931852 src = fetchurl {
16941853 url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2;
16951854 sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
16961855 };
1856+ hardeningDisable = [ "bindnow" "relro" ];
16971857 nativeBuildInputs = [ pkgconfig ];
16981858 buildInputs = [ ];
16991859 meta.platforms = stdenv.lib.platforms.unix;
1700− }) // {inherit ;};
1860+ }) {};
17011861
1702− xf86dgaproto = (mkDerivation "xf86dgaproto" {
1862+ xf86dgaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
17031863 name = "xf86dgaproto-2.1";
17041864 builder = ./builder.sh;
17051865 src = fetchurl {
17061866 url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2;
17071867 sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
17081868 };
1869+ hardeningDisable = [ "bindnow" "relro" ];
17091870 nativeBuildInputs = [ pkgconfig ];
17101871 buildInputs = [ ];
17111872 meta.platforms = stdenv.lib.platforms.unix;
1712− }) // {inherit ;};
1873+ }) {};
17131874
1714− xf86driproto = (mkDerivation "xf86driproto" {
1875+ xf86driproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
17151876 name = "xf86driproto-2.1.1";
17161877 builder = ./builder.sh;
17171878 src = fetchurl {
17181879 url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2;
17191880 sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
17201881 };
1882+ hardeningDisable = [ "bindnow" "relro" ];
17211883 nativeBuildInputs = [ pkgconfig ];
17221884 buildInputs = [ ];
17231885 meta.platforms = stdenv.lib.platforms.unix;
1724− }) // {inherit ;};
1886+ }) {};
17251887
1726− xf86inputevdev = (mkDerivation "xf86inputevdev" {
1888+ xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, xorgserver, xproto }: stdenv.mkDerivation {
17271889 name = "xf86-input-evdev-2.10.5";
17281890 builder = ./builder.sh;
17291891 src = fetchurl {
17301892 url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2;
17311893 sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly";
17321894 };
1895+ hardeningDisable = [ "bindnow" "relro" ];
17331896 nativeBuildInputs = [ pkgconfig ];
17341897 buildInputs = [ inputproto udev xorgserver xproto ];
17351898 meta.platforms = stdenv.lib.platforms.unix;
1736− }) // {inherit inputproto udev xorgserver xproto ;};
1899+ }) {};
17371900
1738− xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
1901+ xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, xorgserver, xproto }: stdenv.mkDerivation {
17391902 name = "xf86-input-joystick-1.6.3";
17401903 builder = ./builder.sh;
17411904 src = fetchurl {
17421905 url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2;
17431906 sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly";
17441907 };
1908+ hardeningDisable = [ "bindnow" "relro" ];
17451909 nativeBuildInputs = [ pkgconfig ];
17461910 buildInputs = [ inputproto kbproto xorgserver xproto ];
17471911 meta.platforms = stdenv.lib.platforms.unix;
1748− }) // {inherit inputproto kbproto xorgserver xproto ;};
1912+ }) {};
17491913
1750− xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
1914+ xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
17511915 name = "xf86-input-keyboard-1.9.0";
17521916 builder = ./builder.sh;
17531917 src = fetchurl {
17541918 url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2;
17551919 sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp";
17561920 };
1921+ hardeningDisable = [ "bindnow" "relro" ];
17571922 nativeBuildInputs = [ pkgconfig ];
17581923 buildInputs = [ inputproto xorgserver xproto ];
17591924 meta.platforms = stdenv.lib.platforms.unix;
1760− }) // {inherit inputproto xorgserver xproto ;};
1925+ }) {};
17611926
1762− xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
1927+ xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
17631928 name = "xf86-input-libinput-0.28.0";
17641929 builder = ./builder.sh;
17651930 src = fetchurl {
17661931 url = mirror://xorg/individual/driver/xf86-input-libinput-0.28.0.tar.bz2;
17671932 sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691";
17681933 };
1934+ hardeningDisable = [ "bindnow" "relro" ];
17691935 nativeBuildInputs = [ pkgconfig ];
17701936 buildInputs = [ inputproto xorgserver xproto ];
17711937 meta.platforms = stdenv.lib.platforms.unix;
1772− }) // {inherit inputproto xorgserver xproto ;};
1938+ }) {};
17731939
1774− xf86inputmouse = (mkDerivation "xf86inputmouse" {
1940+ xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation {
17751941 name = "xf86-input-mouse-1.9.2";
17761942 builder = ./builder.sh;
17771943 src = fetchurl {
17781944 url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2;
17791945 sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl";
17801946 };
1947+ hardeningDisable = [ "bindnow" "relro" ];
17811948 nativeBuildInputs = [ pkgconfig ];
17821949 buildInputs = [ inputproto xorgserver xproto ];
17831950 meta.platforms = stdenv.lib.platforms.unix;
1784− }) // {inherit inputproto xorgserver xproto ;};
1951+ }) {};
17851952
1786− xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
1953+ xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, randrproto, recordproto, libX11, libXi, xorgserver, xproto, libXtst }: stdenv.mkDerivation {
17871954 name = "xf86-input-synaptics-1.9.0";
17881955 builder = ./builder.sh;
17891956 src = fetchurl {
17901957 url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2;
17911958 sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg";
17921959 };
1960+ hardeningDisable = [ "bindnow" "relro" ];
17931961 nativeBuildInputs = [ pkgconfig ];
17941962 buildInputs = [ inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
17951963 meta.platforms = stdenv.lib.platforms.unix;
1796− }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
1964+ }) {};
17971965
1798− xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" {
1966+ xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, randrproto, xorgserver, xproto }: stdenv.mkDerivation {
17991967 name = "xf86-input-vmmouse-13.1.0";
18001968 builder = ./builder.sh;
18011969 src = fetchurl {
18021970 url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2;
18031971 sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a";
18041972 };
1973+ hardeningDisable = [ "bindnow" "relro" ];
18051974 nativeBuildInputs = [ pkgconfig ];
18061975 buildInputs = [ inputproto udev randrproto xorgserver xproto ];
18071976 meta.platforms = stdenv.lib.platforms.unix;
1808− }) // {inherit inputproto udev randrproto xorgserver xproto ;};
1977+ }) {};
18091978
1810− xf86inputvoid = (mkDerivation "xf86inputvoid" {
1979+ xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation {
18111980 name = "xf86-input-void-1.4.1";
18121981 builder = ./builder.sh;
18131982 src = fetchurl {
18141983 url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2;
18151984 sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr";
18161985 };
1986+ hardeningDisable = [ "bindnow" "relro" ];
18171987 nativeBuildInputs = [ pkgconfig ];
18181988 buildInputs = [ xorgserver xproto ];
18191989 meta.platforms = stdenv.lib.platforms.unix;
1820− }) // {inherit xorgserver xproto ;};
1990+ }) {};
18211991
1822− xf86miscproto = (mkDerivation "xf86miscproto" {
1992+ xf86miscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
18231993 name = "xf86miscproto-0.9.3";
18241994 builder = ./builder.sh;
18251995 src = fetchurl {
18261996 url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2;
18271997 sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
18281998 };
1999+ hardeningDisable = [ "bindnow" "relro" ];
18292000 nativeBuildInputs = [ pkgconfig ];
18302001 buildInputs = [ ];
18312002 meta.platforms = stdenv.lib.platforms.unix;
1832− }) // {inherit ;};
2003+ }) {};
18332004
1834− xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" {
2005+ xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, mesa_noglu, libGL, libdrm, udev, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
18352006 name = "xf86-video-amdgpu-1.4.0";
18362007 builder = ./builder.sh;
18372008 src = fetchurl {
18382009 url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2;
18392010 sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq";
18402011 };
2012+ hardeningDisable = [ "bindnow" "relro" ];
18412013 nativeBuildInputs = [ pkgconfig ];
18422014 buildInputs = [ fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
18432015 meta.platforms = stdenv.lib.platforms.unix;
1844− }) // {inherit fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
2016+ }) {};
18452017
1846− xf86videoark = (mkDerivation "xf86videoark" {
2018+ xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
18472019 name = "xf86-video-ark-0.7.5";
18482020 builder = ./builder.sh;
18492021 src = fetchurl {
18502022 url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2;
18512023 sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
18522024 };
2025+ hardeningDisable = [ "bindnow" "relro" ];
18532026 nativeBuildInputs = [ pkgconfig ];
18542027 buildInputs = [ fontsproto libpciaccess xextproto xorgserver xproto ];
18552028 meta.platforms = stdenv.lib.platforms.unix;
1856− }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
2029+ }) {};
18572030
1858− xf86videoast = (mkDerivation "xf86videoast" {
2031+ xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
18592032 name = "xf86-video-ast-1.1.5";
18602033 builder = ./builder.sh;
18612034 src = fetchurl {
18622035 url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2;
18632036 sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy";
18642037 };
2038+ hardeningDisable = [ "bindnow" "relro" ];
18652039 nativeBuildInputs = [ pkgconfig ];
18662040 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
18672041 meta.platforms = stdenv.lib.platforms.unix;
1868− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2042+ }) {};
18692043
1870− xf86videoati = (mkDerivation "xf86videoati" {
2044+ xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
18712045 name = "xf86-video-ati-18.0.1";
18722046 builder = ./builder.sh;
18732047 src = fetchurl {
18742048 url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2;
18752049 sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj";
18762050 };
2051+ hardeningDisable = [ "bindnow" "relro" ];
18772052 nativeBuildInputs = [ pkgconfig ];
18782053 buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
18792054 meta.platforms = stdenv.lib.platforms.unix;
1880− }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
2055+ }) {};
18812056
1882− xf86videochips = (mkDerivation "xf86videochips" {
2057+ xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
18832058 name = "xf86-video-chips-1.2.7";
18842059 builder = ./builder.sh;
18852060 src = fetchurl {
18862061 url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2;
18872062 sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f";
18882063 };
2064+ hardeningDisable = [ "bindnow" "relro" ];
18892065 nativeBuildInputs = [ pkgconfig ];
18902066 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
18912067 meta.platforms = stdenv.lib.platforms.unix;
1892− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2068+ }) {};
18932069
1894− xf86videocirrus = (mkDerivation "xf86videocirrus" {
2070+ xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
18952071 name = "xf86-video-cirrus-1.5.3";
18962072 builder = ./builder.sh;
18972073 src = fetchurl {
18982074 url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2;
18992075 sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d";
19002076 };
2077+ hardeningDisable = [ "bindnow" "relro" ];
19012078 nativeBuildInputs = [ pkgconfig ];
19022079 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
19032080 meta.platforms = stdenv.lib.platforms.unix;
1904− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2081+ }) {};
19052082
1906− xf86videodummy = (mkDerivation "xf86videodummy" {
2083+ xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
19072084 name = "xf86-video-dummy-0.3.8";
19082085 builder = ./builder.sh;
19092086 src = fetchurl {
19102087 url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2;
19112088 sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip";
19122089 };
2090+ hardeningDisable = [ "bindnow" "relro" ];
19132091 nativeBuildInputs = [ pkgconfig ];
19142092 buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
19152093 meta.platforms = stdenv.lib.platforms.unix;
1916− }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
2094+ }) {};
19172095
1918− xf86videofbdev = (mkDerivation "xf86videofbdev" {
2096+ xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
19192097 name = "xf86-video-fbdev-0.4.4";
19202098 builder = ./builder.sh;
19212099 src = fetchurl {
19222100 url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2;
19232101 sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x";
19242102 };
2103+ hardeningDisable = [ "bindnow" "relro" ];
19252104 nativeBuildInputs = [ pkgconfig ];
19262105 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
19272106 meta.platforms = stdenv.lib.platforms.unix;
1928− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
2107+ }) {};
19292108
1930− xf86videogeode = (mkDerivation "xf86videogeode" {
2109+ xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
19312110 name = "xf86-video-geode-2.11.17";
19322111 builder = ./builder.sh;
19332112 src = fetchurl {
19342113 url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2;
19352114 sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07";
19362115 };
2116+ hardeningDisable = [ "bindnow" "relro" ];
19372117 nativeBuildInputs = [ pkgconfig ];
19382118 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
19392119 meta.platforms = stdenv.lib.platforms.unix;
1940− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2120+ }) {};
19412121
1942− xf86videoglide = (mkDerivation "xf86videoglide" {
2122+ xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
19432123 name = "xf86-video-glide-1.2.2";
19442124 builder = ./builder.sh;
19452125 src = fetchurl {
19462126 url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2;
19472127 sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
19482128 };
2129+ hardeningDisable = [ "bindnow" "relro" ];
19492130 nativeBuildInputs = [ pkgconfig ];
19502131 buildInputs = [ xextproto xorgserver xproto ];
19512132 meta.platforms = stdenv.lib.platforms.unix;
1952− }) // {inherit xextproto xorgserver xproto ;};
2133+ }) {};
19532134
1954− xf86videoglint = (mkDerivation "xf86videoglint" {
2135+ xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
19552136 name = "xf86-video-glint-1.2.9";
19562137 builder = ./builder.sh;
19572138 src = fetchurl {
19582139 url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2;
19592140 sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45";
19602141 };
2142+ hardeningDisable = [ "bindnow" "relro" ];
19612143 nativeBuildInputs = [ pkgconfig ];
19622144 buildInputs = [ libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
19632145 meta.platforms = stdenv.lib.platforms.unix;
1964− }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
2146+ }) {};
19652147
1966− xf86videoi128 = (mkDerivation "xf86videoi128" {
2148+ xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
19672149 name = "xf86-video-i128-1.3.6";
19682150 builder = ./builder.sh;
19692151 src = fetchurl {
19702152 url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2;
19712153 sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq";
19722154 };
2155+ hardeningDisable = [ "bindnow" "relro" ];
19732156 nativeBuildInputs = [ pkgconfig ];
19742157 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
19752158 meta.platforms = stdenv.lib.platforms.unix;
1976− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2159+ }) {};
19772160
1978− xf86videoi740 = (mkDerivation "xf86videoi740" {
2161+ xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
19792162 name = "xf86-video-i740-1.3.6";
19802163 builder = ./builder.sh;
19812164 src = fetchurl {
19822165 url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2;
19832166 sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389";
19842167 };
2168+ hardeningDisable = [ "bindnow" "relro" ];
19852169 nativeBuildInputs = [ pkgconfig ];
19862170 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
19872171 meta.platforms = stdenv.lib.platforms.unix;
1988− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2172+ }) {};
19892173
1990− xf86videointel = (mkDerivation "xf86videointel" {
2174+ xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, fontsproto, libdrm, libpng, udev, libpciaccess, presentproto, randrproto, renderproto, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, xextproto, xf86driproto, libXfixes, xorgserver, xproto, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
19912175 name = "xf86-video-intel-2.99.917";
19922176 builder = ./builder.sh;
19932177 src = fetchurl {
19942178 url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2;
19952179 sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0";
19962180 };
2181+ hardeningDisable = [ "bindnow" "relro" ];
19972182 nativeBuildInputs = [ pkgconfig ];
19982183 buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
19992184 meta.platforms = stdenv.lib.platforms.unix;
2000− }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
2185+ }) {};
20012186
2002− xf86videomach64 = (mkDerivation "xf86videomach64" {
2187+ xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
20032188 name = "xf86-video-mach64-6.9.5";
20042189 builder = ./builder.sh;
20052190 src = fetchurl {
20062191 url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2;
20072192 sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y";
20082193 };
2194+ hardeningDisable = [ "bindnow" "relro" ];
20092195 nativeBuildInputs = [ pkgconfig ];
20102196 buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
20112197 meta.platforms = stdenv.lib.platforms.unix;
2012− }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
2198+ }) {};
20132199
2014− xf86videomga = (mkDerivation "xf86videomga" {
2200+ xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
20152201 name = "xf86-video-mga-1.6.5";
20162202 builder = ./builder.sh;
20172203 src = fetchurl {
20182204 url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2;
20192205 sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn";
20202206 };
2207+ hardeningDisable = [ "bindnow" "relro" ];
20212208 nativeBuildInputs = [ pkgconfig ];
20222209 buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
20232210 meta.platforms = stdenv.lib.platforms.unix;
2024− }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
2211+ }) {};
20252212
2026− xf86videoneomagic = (mkDerivation "xf86videoneomagic" {
2213+ xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xorgserver, xproto }: stdenv.mkDerivation {
20272214 name = "xf86-video-neomagic-1.2.9";
20282215 builder = ./builder.sh;
20292216 src = fetchurl {
20302217 url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2;
20312218 sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j";
20322219 };
2220+ hardeningDisable = [ "bindnow" "relro" ];
20332221 nativeBuildInputs = [ pkgconfig ];
20342222 buildInputs = [ fontsproto libpciaccess xorgserver xproto ];
20352223 meta.platforms = stdenv.lib.platforms.unix;
2036− }) // {inherit fontsproto libpciaccess xorgserver xproto ;};
2224+ }) {};
20372225
2038− xf86videonewport = (mkDerivation "xf86videonewport" {
2226+ xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
20392227 name = "xf86-video-newport-0.2.4";
20402228 builder = ./builder.sh;
20412229 src = fetchurl {
20422230 url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2;
20432231 sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
20442232 };
2233+ hardeningDisable = [ "bindnow" "relro" ];
20452234 nativeBuildInputs = [ pkgconfig ];
20462235 buildInputs = [ fontsproto randrproto renderproto videoproto xorgserver xproto ];
20472236 meta.platforms = stdenv.lib.platforms.unix;
2048− }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
2237+ }) {};
20492238
2050− xf86videonouveau = (mkDerivation "xf86videonouveau" {
2239+ xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
20512240 name = "xf86-video-nouveau-1.0.15";
20522241 builder = ./builder.sh;
20532242 src = fetchurl {
20542243 url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2;
20552244 sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf";
20562245 };
2246+ hardeningDisable = [ "bindnow" "relro" ];
20572247 nativeBuildInputs = [ pkgconfig ];
20582248 buildInputs = [ dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
20592249 meta.platforms = stdenv.lib.platforms.unix;
2060− }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2250+ }) {};
20612251
2062− xf86videonv = (mkDerivation "xf86videonv" {
2252+ xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
20632253 name = "xf86-video-nv-2.1.21";
20642254 builder = ./builder.sh;
20652255 src = fetchurl {
20662256 url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2;
20672257 sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z";
20682258 };
2259+ hardeningDisable = [ "bindnow" "relro" ];
20692260 nativeBuildInputs = [ pkgconfig ];
20702261 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
20712262 meta.platforms = stdenv.lib.platforms.unix;
2072− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2263+ }) {};
20732264
2074− xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" {
2265+ xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xf86driproto, xorgserver, xproto, libXvMC }: stdenv.mkDerivation {
20752266 name = "xf86-video-openchrome-0.6.0";
20762267 builder = ./builder.sh;
20772268 src = fetchurl {
20782269 url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2;
20792270 sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs";
20802271 };
2272+ hardeningDisable = [ "bindnow" "relro" ];
20812273 nativeBuildInputs = [ pkgconfig ];
20822274 buildInputs = [ fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
20832275 meta.platforms = stdenv.lib.platforms.unix;
2084− }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
2276+ }) {};
20852277
2086− xf86videoqxl = (mkDerivation "xf86videoqxl" {
2278+ xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
20872279 name = "xf86-video-qxl-0.1.5";
20882280 builder = ./builder.sh;
20892281 src = fetchurl {
20902282 url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2;
20912283 sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi";
20922284 };
2285+ hardeningDisable = [ "bindnow" "relro" ];
20932286 nativeBuildInputs = [ pkgconfig ];
20942287 buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
20952288 meta.platforms = stdenv.lib.platforms.unix;
2096− }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
2289+ }) {};
20972290
2098− xf86videor128 = (mkDerivation "xf86videor128" {
2291+ xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xf86miscproto, xorgserver, xproto }: stdenv.mkDerivation {
20992292 name = "xf86-video-r128-6.10.2";
21002293 builder = ./builder.sh;
21012294 src = fetchurl {
21022295 url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2;
21032296 sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4";
21042297 };
2298+ hardeningDisable = [ "bindnow" "relro" ];
21052299 nativeBuildInputs = [ pkgconfig ];
21062300 buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
21072301 meta.platforms = stdenv.lib.platforms.unix;
2108− }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
2302+ }) {};
21092303
2110− xf86videorendition = (mkDerivation "xf86videorendition" {
2304+ xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
21112305 name = "xf86-video-rendition-4.2.6";
21122306 builder = ./builder.sh;
21132307 src = fetchurl {
21142308 url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2;
21152309 sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6";
21162310 };
2311+ hardeningDisable = [ "bindnow" "relro" ];
21172312 nativeBuildInputs = [ pkgconfig ];
21182313 buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
21192314 meta.platforms = stdenv.lib.platforms.unix;
2120− }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
2315+ }) {};
21212316
2122− xf86videos3virge = (mkDerivation "xf86videos3virge" {
2317+ xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
21232318 name = "xf86-video-s3virge-1.10.7";
21242319 builder = ./builder.sh;
21252320 src = fetchurl {
21262321 url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2;
21272322 sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx";
21282323 };
2324+ hardeningDisable = [ "bindnow" "relro" ];
21292325 nativeBuildInputs = [ pkgconfig ];
21302326 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
21312327 meta.platforms = stdenv.lib.platforms.unix;
2132− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
2328+ }) {};
21332329
2134− xf86videosavage = (mkDerivation "xf86videosavage" {
2330+ xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
21352331 name = "xf86-video-savage-2.3.9";
21362332 builder = ./builder.sh;
21372333 src = fetchurl {
21382334 url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2;
21392335 sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc";
21402336 };
2337+ hardeningDisable = [ "bindnow" "relro" ];
21412338 nativeBuildInputs = [ pkgconfig ];
21422339 buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
21432340 meta.platforms = stdenv.lib.platforms.unix;
2144− }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
2341+ }) {};
21452342
2146− xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
2343+ xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
21472344 name = "xf86-video-siliconmotion-1.7.9";
21482345 builder = ./builder.sh;
21492346 src = fetchurl {
21502347 url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2;
21512348 sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh";
21522349 };
2350+ hardeningDisable = [ "bindnow" "relro" ];
21532351 nativeBuildInputs = [ pkgconfig ];
21542352 buildInputs = [ fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
21552353 meta.platforms = stdenv.lib.platforms.unix;
2156− }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
2354+ }) {};
21572355
2158− xf86videosis = (mkDerivation "xf86videosis" {
2356+ xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
21592357 name = "xf86-video-sis-0.10.9";
21602358 builder = ./builder.sh;
21612359 src = fetchurl {
21622360 url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2;
21632361 sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj";
21642362 };
2363+ hardeningDisable = [ "bindnow" "relro" ];
21652364 nativeBuildInputs = [ pkgconfig ];
21662365 buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
21672366 meta.platforms = stdenv.lib.platforms.unix;
2168− }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
2367+ }) {};
21692368
2170− xf86videosisusb = (mkDerivation "xf86videosisusb" {
2369+ xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
21712370 name = "xf86-video-sisusb-0.9.7";
21722371 builder = ./builder.sh;
21732372 src = fetchurl {
21742373 url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2;
21752374 sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l";
21762375 };
2376+ hardeningDisable = [ "bindnow" "relro" ];
21772377 nativeBuildInputs = [ pkgconfig ];
21782378 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ];
21792379 meta.platforms = stdenv.lib.platforms.unix;
2180− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;};
2380+ }) {};
21812381
2182− xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
2382+ xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation {
21832383 name = "xf86-video-suncg6-1.1.2";
21842384 builder = ./builder.sh;
21852385 src = fetchurl {
21862386 url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2;
21872387 sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
21882388 };
2389+ hardeningDisable = [ "bindnow" "relro" ];
21892390 nativeBuildInputs = [ pkgconfig ];
21902391 buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ];
21912392 meta.platforms = stdenv.lib.platforms.unix;
2192− }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
2393+ }) {};
21932394
2194− xf86videosunffb = (mkDerivation "xf86videosunffb" {
2395+ xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
21952396 name = "xf86-video-sunffb-1.2.2";
21962397 builder = ./builder.sh;
21972398 src = fetchurl {
21982399 url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2;
21992400 sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
22002401 };
2402+ hardeningDisable = [ "bindnow" "relro" ];
22012403 nativeBuildInputs = [ pkgconfig ];
22022404 buildInputs = [ fontsproto randrproto renderproto xextproto xorgserver xproto ];
22032405 meta.platforms = stdenv.lib.platforms.unix;
2204− }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
2406+ }) {};
22052407
2206− xf86videosunleo = (mkDerivation "xf86videosunleo" {
2408+ xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation {
22072409 name = "xf86-video-sunleo-1.2.2";
22082410 builder = ./builder.sh;
22092411 src = fetchurl {
22102412 url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2;
22112413 sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3";
22122414 };
2415+ hardeningDisable = [ "bindnow" "relro" ];
22132416 nativeBuildInputs = [ pkgconfig ];
22142417 buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ];
22152418 meta.platforms = stdenv.lib.platforms.unix;
2216− }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
2419+ }) {};
22172420
2218− xf86videotdfx = (mkDerivation "xf86videotdfx" {
2421+ xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation {
22192422 name = "xf86-video-tdfx-1.4.7";
22202423 builder = ./builder.sh;
22212424 src = fetchurl {
22222425 url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2;
22232426 sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c";
22242427 };
2428+ hardeningDisable = [ "bindnow" "relro" ];
22252429 nativeBuildInputs = [ pkgconfig ];
22262430 buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
22272431 meta.platforms = stdenv.lib.platforms.unix;
2228− }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
2432+ }) {};
22292433
2230− xf86videotga = (mkDerivation "xf86videotga" {
2434+ xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
22312435 name = "xf86-video-tga-1.2.2";
22322436 builder = ./builder.sh;
22332437 src = fetchurl {
22342438 url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2;
22352439 sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
22362440 };
2441+ hardeningDisable = [ "bindnow" "relro" ];
22372442 nativeBuildInputs = [ pkgconfig ];
22382443 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
22392444 meta.platforms = stdenv.lib.platforms.unix;
2240− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
2445+ }) {};
22412446
2242− xf86videotrident = (mkDerivation "xf86videotrident" {
2447+ xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
22432448 name = "xf86-video-trident-1.3.8";
22442449 builder = ./builder.sh;
22452450 src = fetchurl {
22462451 url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2;
22472452 sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy";
22482453 };
2454+ hardeningDisable = [ "bindnow" "relro" ];
22492455 nativeBuildInputs = [ pkgconfig ];
22502456 buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
22512457 meta.platforms = stdenv.lib.platforms.unix;
2252− }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
2458+ }) {};
22532459
2254− xf86videov4l = (mkDerivation "xf86videov4l" {
2460+ xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation {
22552461 name = "xf86-video-v4l-0.2.0";
22562462 builder = ./builder.sh;
22572463 src = fetchurl {
22582464 url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2;
22592465 sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
22602466 };
2467+ hardeningDisable = [ "bindnow" "relro" ];
22612468 nativeBuildInputs = [ pkgconfig ];
22622469 buildInputs = [ randrproto videoproto xorgserver xproto ];
22632470 meta.platforms = stdenv.lib.platforms.unix;
2264− }) // {inherit randrproto videoproto xorgserver xproto ;};
2471+ }) {};
22652472
2266− xf86videovesa = (mkDerivation "xf86videovesa" {
2473+ xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
22672474 name = "xf86-video-vesa-2.4.0";
22682475 builder = ./builder.sh;
22692476 src = fetchurl {
22702477 url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2;
22712478 sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z";
22722479 };
2480+ hardeningDisable = [ "bindnow" "relro" ];
22732481 nativeBuildInputs = [ pkgconfig ];
22742482 buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
22752483 meta.platforms = stdenv.lib.platforms.unix;
2276− }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
2484+ }) {};
22772485
2278− xf86videovmware = (mkDerivation "xf86videovmware" {
2486+ xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
22792487 name = "xf86-video-vmware-13.2.1";
22802488 builder = ./builder.sh;
22812489 src = fetchurl {
22822490 url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2;
22832491 sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2";
22842492 };
2493+ hardeningDisable = [ "bindnow" "relro" ];
22852494 nativeBuildInputs = [ pkgconfig ];
22862495 buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
22872496 meta.platforms = stdenv.lib.platforms.unix;
2288− }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
2497+ }) {};
22892498
2290− xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
2499+ xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation {
22912500 name = "xf86-video-voodoo-1.2.5";
22922501 builder = ./builder.sh;
22932502 src = fetchurl {
22942503 url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2;
22952504 sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
22962505 };
2506+ hardeningDisable = [ "bindnow" "relro" ];
22972507 nativeBuildInputs = [ pkgconfig ];
22982508 buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
22992509 meta.platforms = stdenv.lib.platforms.unix;
2300− }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
2510+ }) {};
23012511
2302− xf86videowsfb = (mkDerivation "xf86videowsfb" {
2512+ xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation {
23032513 name = "xf86-video-wsfb-0.4.0";
23042514 builder = ./builder.sh;
23052515 src = fetchurl {
23062516 url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2;
23072517 sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
23082518 };
2519+ hardeningDisable = [ "bindnow" "relro" ];
23092520 nativeBuildInputs = [ pkgconfig ];
23102521 buildInputs = [ xorgserver xproto ];
23112522 meta.platforms = stdenv.lib.platforms.unix;
2312− }) // {inherit xorgserver xproto ;};
2523+ }) {};
23132524
2314− xf86videoxgi = (mkDerivation "xf86videoxgi" {
2525+ xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation {
23152526 name = "xf86-video-xgi-1.6.1";
23162527 builder = ./builder.sh;
23172528 src = fetchurl {
23182529 url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2;
23192530 sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si";
23202531 };
2532+ hardeningDisable = [ "bindnow" "relro" ];
23212533 nativeBuildInputs = [ pkgconfig ];
23222534 buildInputs = [ fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ];
23232535 meta.platforms = stdenv.lib.platforms.unix;
2324− }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;};
2536+ }) {};
23252537
2326− xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" {
2538+ xf86vidmodeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
23272539 name = "xf86vidmodeproto-2.3.1";
23282540 builder = ./builder.sh;
23292541 src = fetchurl {
23302542 url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2;
23312543 sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
23322544 };
2545+ hardeningDisable = [ "bindnow" "relro" ];
23332546 nativeBuildInputs = [ pkgconfig ];
23342547 buildInputs = [ ];
23352548 meta.platforms = stdenv.lib.platforms.unix;
2336− }) // {inherit ;};
2549+ }) {};
23372550
2338− xfs = (mkDerivation "xfs" {
2551+ xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont, xproto, xtrans }: stdenv.mkDerivation {
23392552 name = "xfs-1.1.4";
23402553 builder = ./builder.sh;
23412554 src = fetchurl {
23422555 url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2;
23432556 sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4";
23442557 };
2558+ hardeningDisable = [ "bindnow" "relro" ];
23452559 nativeBuildInputs = [ pkgconfig ];
23462560 buildInputs = [ libXfont xproto xtrans ];
23472561 meta.platforms = stdenv.lib.platforms.unix;
2348− }) // {inherit libXfont xproto xtrans ;};
2562+ }) {};
23492563
2350− xgamma = (mkDerivation "xgamma" {
2564+ xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXxf86vm }: stdenv.mkDerivation {
23512565 name = "xgamma-1.0.6";
23522566 builder = ./builder.sh;
23532567 src = fetchurl {
23542568 url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2;
23552569 sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f";
23562570 };
2571+ hardeningDisable = [ "bindnow" "relro" ];
23572572 nativeBuildInputs = [ pkgconfig ];
23582573 buildInputs = [ libX11 xproto libXxf86vm ];
23592574 meta.platforms = stdenv.lib.platforms.unix;
2360− }) // {inherit libX11 xproto libXxf86vm ;};
2575+ }) {};
23612576
2362− xgc = (mkDerivation "xgc" {
2577+ xgc = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
23632578 name = "xgc-1.0.5";
23642579 builder = ./builder.sh;
23652580 src = fetchurl {
23662581 url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2;
23672582 sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl";
23682583 };
2584+ hardeningDisable = [ "bindnow" "relro" ];
23692585 nativeBuildInputs = [ pkgconfig ];
23702586 buildInputs = [ libXaw libXt ];
23712587 meta.platforms = stdenv.lib.platforms.unix;
2372− }) // {inherit libXaw libXt ;};
2588+ }) {};
23732589
2374− xhost = (mkDerivation "xhost" {
2590+ xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xproto }: stdenv.mkDerivation {
23752591 name = "xhost-1.0.7";
23762592 builder = ./builder.sh;
23772593 src = fetchurl {
23782594 url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2;
23792595 sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk";
23802596 };
2597+ hardeningDisable = [ "bindnow" "relro" ];
23812598 nativeBuildInputs = [ pkgconfig ];
23822599 buildInputs = [ libX11 libXau libXmu xproto ];
23832600 meta.platforms = stdenv.lib.platforms.unix;
2384− }) // {inherit libX11 libXau libXmu xproto ;};
2601+ }) {};
23852602
2386− xineramaproto = (mkDerivation "xineramaproto" {
2603+ xineramaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
23872604 name = "xineramaproto-1.2.1";
23882605 builder = ./builder.sh;
23892606 src = fetchurl {
23902607 url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2;
23912608 sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
23922609 };
2610+ hardeningDisable = [ "bindnow" "relro" ];
23932611 nativeBuildInputs = [ pkgconfig ];
23942612 buildInputs = [ ];
23952613 meta.platforms = stdenv.lib.platforms.unix;
2396− }) // {inherit ;};
2614+ }) {};
23972615
2398− xinit = (mkDerivation "xinit" {
2616+ xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
23992617 name = "xinit-1.4.0";
24002618 builder = ./builder.sh;
24012619 src = fetchurl {
24022620 url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2;
24032621 sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213";
24042622 };
2623+ hardeningDisable = [ "bindnow" "relro" ];
24052624 nativeBuildInputs = [ pkgconfig ];
24062625 buildInputs = [ libX11 xproto ];
24072626 meta.platforms = stdenv.lib.platforms.unix;
2408− }) // {inherit libX11 xproto ;};
2627+ }) {};
24092628
2410− xinput = (mkDerivation "xinput" {
2629+ xinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation {
24112630 name = "xinput-1.6.2";
24122631 builder = ./builder.sh;
24132632 src = fetchurl {
24142633 url = mirror://xorg/individual/app/xinput-1.6.2.tar.bz2;
24152634 sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n";
24162635 };
2636+ hardeningDisable = [ "bindnow" "relro" ];
24172637 nativeBuildInputs = [ pkgconfig ];
24182638 buildInputs = [ inputproto libX11 libXext libXi libXinerama libXrandr ];
24192639 meta.platforms = stdenv.lib.platforms.unix;
2420− }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
2640+ }) {};
24212641
2422− xkbcomp = (mkDerivation "xkbcomp" {
2642+ xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation {
24232643 name = "xkbcomp-1.4.2";
24242644 builder = ./builder.sh;
24252645 src = fetchurl {
24262646 url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2;
24272647 sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d";
24282648 };
2649+ hardeningDisable = [ "bindnow" "relro" ];
24292650 nativeBuildInputs = [ pkgconfig ];
24302651 buildInputs = [ libX11 libxkbfile xproto ];
24312652 meta.platforms = stdenv.lib.platforms.unix;
2432− }) // {inherit libX11 libxkbfile xproto ;};
2653+ }) {};
24332654
2434− xkbevd = (mkDerivation "xkbevd" {
2655+ xkbevd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation {
24352656 name = "xkbevd-1.1.4";
24362657 builder = ./builder.sh;
24372658 src = fetchurl {
24382659 url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2;
24392660 sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14";
24402661 };
2662+ hardeningDisable = [ "bindnow" "relro" ];
24412663 nativeBuildInputs = [ pkgconfig ];
24422664 buildInputs = [ libX11 libxkbfile ];
24432665 meta.platforms = stdenv.lib.platforms.unix;
2444− }) // {inherit libX11 libxkbfile ;};
2666+ }) {};
24452667
2446− xkbprint = (mkDerivation "xkbprint" {
2668+ xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation {
24472669 name = "xkbprint-1.0.4";
24482670 builder = ./builder.sh;
24492671 src = fetchurl {
24502672 url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2;
24512673 sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb";
24522674 };
2675+ hardeningDisable = [ "bindnow" "relro" ];
24532676 nativeBuildInputs = [ pkgconfig ];
24542677 buildInputs = [ libX11 libxkbfile xproto ];
24552678 meta.platforms = stdenv.lib.platforms.unix;
2456− }) // {inherit libX11 libxkbfile xproto ;};
2679+ }) {};
24572680
2458− xkbutils = (mkDerivation "xkbutils" {
2681+ xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXaw, xproto, libXt }: stdenv.mkDerivation {
24592682 name = "xkbutils-1.0.4";
24602683 builder = ./builder.sh;
24612684 src = fetchurl {
24622685 url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2;
24632686 sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
24642687 };
2688+ hardeningDisable = [ "bindnow" "relro" ];
24652689 nativeBuildInputs = [ pkgconfig ];
24662690 buildInputs = [ inputproto libX11 libXaw xproto libXt ];
24672691 meta.platforms = stdenv.lib.platforms.unix;
2468− }) // {inherit inputproto libX11 libXaw xproto libXt ;};
2692+ }) {};
24692693
2470− xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
2694+ xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
24712695 name = "xkeyboard-config-2.24";
24722696 builder = ./builder.sh;
24732697 src = fetchurl {
24742698 url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2;
24752699 sha256 = "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci";
24762700 };
2701+ hardeningDisable = [ "bindnow" "relro" ];
24772702 nativeBuildInputs = [ pkgconfig ];
24782703 buildInputs = [ libX11 xproto ];
2479− configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
24802704 meta.platforms = stdenv.lib.platforms.unix;
2481− }) // {inherit libX11 xproto ;};
2705+ }) {};
24822706
2483− xkill = (mkDerivation "xkill" {
2707+ xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation {
24842708 name = "xkill-1.0.4";
24852709 builder = ./builder.sh;
24862710 src = fetchurl {
24872711 url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2;
24882712 sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
24892713 };
2714+ hardeningDisable = [ "bindnow" "relro" ];
24902715 nativeBuildInputs = [ pkgconfig ];
24912716 buildInputs = [ libX11 libXmu xproto ];
24922717 meta.platforms = stdenv.lib.platforms.unix;
2493− }) // {inherit libX11 libXmu xproto ;};
2718+ }) {};
24942719
2495− xlsatoms = (mkDerivation "xlsatoms" {
2720+ xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation {
24962721 name = "xlsatoms-1.1.2";
24972722 builder = ./builder.sh;
24982723 src = fetchurl {
24992724 url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2;
25002725 sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7";
25012726 };
2727+ hardeningDisable = [ "bindnow" "relro" ];
25022728 nativeBuildInputs = [ pkgconfig ];
25032729 buildInputs = [ libxcb ];
25042730 meta.platforms = stdenv.lib.platforms.unix;
2505− }) // {inherit libxcb ;};
2731+ }) {};
25062732
2507− xlsclients = (mkDerivation "xlsclients" {
2733+ xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation {
25082734 name = "xlsclients-1.1.3";
25092735 builder = ./builder.sh;
25102736 src = fetchurl {
25112737 url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2;
25122738 sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx";
25132739 };
2740+ hardeningDisable = [ "bindnow" "relro" ];
25142741 nativeBuildInputs = [ pkgconfig ];
25152742 buildInputs = [ libxcb ];
25162743 meta.platforms = stdenv.lib.platforms.unix;
2517− }) // {inherit libxcb ;};
2744+ }) {};
25182745
2519− xlsfonts = (mkDerivation "xlsfonts" {
2746+ xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
25202747 name = "xlsfonts-1.0.5";
25212748 builder = ./builder.sh;
25222749 src = fetchurl {
25232750 url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2;
25242751 sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0";
25252752 };
2753+ hardeningDisable = [ "bindnow" "relro" ];
25262754 nativeBuildInputs = [ pkgconfig ];
25272755 buildInputs = [ libX11 xproto ];
25282756 meta.platforms = stdenv.lib.platforms.unix;
2529− }) // {inherit libX11 xproto ;};
2757+ }) {};
25302758
2531− xmag = (mkDerivation "xmag" {
2759+ xmag = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
25322760 name = "xmag-1.0.6";
25332761 builder = ./builder.sh;
25342762 src = fetchurl {
25352763 url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2;
25362764 sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7";
25372765 };
2766+ hardeningDisable = [ "bindnow" "relro" ];
25382767 nativeBuildInputs = [ pkgconfig ];
25392768 buildInputs = [ libX11 libXaw libXmu libXt ];
25402769 meta.platforms = stdenv.lib.platforms.unix;
2541− }) // {inherit libX11 libXaw libXmu libXt ;};
2770+ }) {};
25422771
2543− xmessage = (mkDerivation "xmessage" {
2772+ xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
25442773 name = "xmessage-1.0.4";
25452774 builder = ./builder.sh;
25462775 src = fetchurl {
25472776 url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2;
25482777 sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
25492778 };
2779+ hardeningDisable = [ "bindnow" "relro" ];
25502780 nativeBuildInputs = [ pkgconfig ];
25512781 buildInputs = [ libXaw libXt ];
25522782 meta.platforms = stdenv.lib.platforms.unix;
2553− }) // {inherit libXaw libXt ;};
2783+ }) {};
25542784
2555− xmodmap = (mkDerivation "xmodmap" {
2785+ xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
25562786 name = "xmodmap-1.0.9";
25572787 builder = ./builder.sh;
25582788 src = fetchurl {
25592789 url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2;
25602790 sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p";
25612791 };
2792+ hardeningDisable = [ "bindnow" "relro" ];
25622793 nativeBuildInputs = [ pkgconfig ];
25632794 buildInputs = [ libX11 xproto ];
25642795 meta.platforms = stdenv.lib.platforms.unix;
2565− }) // {inherit libX11 xproto ;};
2796+ }) {};
25662797
2567− xorgcffiles = (mkDerivation "xorgcffiles" {
2798+ xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
25682799 name = "xorg-cf-files-1.0.6";
25692800 builder = ./builder.sh;
25702801 src = fetchurl {
25712802 url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
25722803 sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
25732804 };
2805+ hardeningDisable = [ "bindnow" "relro" ];
25742806 nativeBuildInputs = [ pkgconfig ];
25752807 buildInputs = [ ];
25762808 meta.platforms = stdenv.lib.platforms.unix;
2577− }) // {inherit ;};
2809+ }) {};
25782810
2579− xorgdocs = (mkDerivation "xorgdocs" {
2811+ xorgdocs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
25802812 name = "xorg-docs-1.7.1";
25812813 builder = ./builder.sh;
25822814 src = fetchurl {
25832815 url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2;
25842816 sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14";
25852817 };
2818+ hardeningDisable = [ "bindnow" "relro" ];
25862819 nativeBuildInputs = [ pkgconfig ];
25872820 buildInputs = [ ];
25882821 meta.platforms = stdenv.lib.platforms.unix;
2589− }) // {inherit ;};
2822+ }) {};
25902823
2591− xorgserver = (mkDerivation "xorgserver" {
2824+ xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
25922825 name = "xorg-server-1.19.6";
25932826 builder = ./builder.sh;
25942827 src = fetchurl {
25952828 url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2;
25962829 sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7";
25972830 };
2831+ hardeningDisable = [ "bindnow" "relro" ];
25982832 nativeBuildInputs = [ pkgconfig ];
25992833 buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
26002834 meta.platforms = stdenv.lib.platforms.unix;
2601− }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};
2835+ }) {};
26022836
2603− xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
2837+ xorgsgmldoctools = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
26042838 name = "xorg-sgml-doctools-1.11";
26052839 builder = ./builder.sh;
26062840 src = fetchurl {
26072841 url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2;
26082842 sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
26092843 };
2844+ hardeningDisable = [ "bindnow" "relro" ];
26102845 nativeBuildInputs = [ pkgconfig ];
26112846 buildInputs = [ ];
26122847 meta.platforms = stdenv.lib.platforms.unix;
2613− }) // {inherit ;};
2848+ }) {};
26142849
2615− xpr = (mkDerivation "xpr" {
2850+ xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation {
26162851 name = "xpr-1.0.4";
26172852 builder = ./builder.sh;
26182853 src = fetchurl {
26192854 url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2;
26202855 sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
26212856 };
2857+ hardeningDisable = [ "bindnow" "relro" ];
26222858 nativeBuildInputs = [ pkgconfig ];
26232859 buildInputs = [ libX11 libXmu xproto ];
26242860 meta.platforms = stdenv.lib.platforms.unix;
2625− }) // {inherit libX11 libXmu xproto ;};
2861+ }) {};
26262862
2627− xprop = (mkDerivation "xprop" {
2863+ xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
26282864 name = "xprop-1.2.2";
26292865 builder = ./builder.sh;
26302866 src = fetchurl {
26312867 url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2;
26322868 sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv";
26332869 };
2870+ hardeningDisable = [ "bindnow" "relro" ];
26342871 nativeBuildInputs = [ pkgconfig ];
26352872 buildInputs = [ libX11 xproto ];
26362873 meta.platforms = stdenv.lib.platforms.unix;
2637− }) // {inherit libX11 xproto ;};
2874+ }) {};
26382875
2639− xproto = (mkDerivation "xproto" {
2876+ xproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
26402877 name = "xproto-7.0.31";
26412878 builder = ./builder.sh;
26422879 src = fetchurl {
26432880 url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2;
26442881 sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6";
26452882 };
2883+ hardeningDisable = [ "bindnow" "relro" ];
26462884 nativeBuildInputs = [ pkgconfig ];
26472885 buildInputs = [ ];
26482886 meta.platforms = stdenv.lib.platforms.unix;
2649− }) // {inherit ;};
2887+ }) {};
26502888
2651− xrandr = (mkDerivation "xrandr" {
2889+ xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr, libXrender }: stdenv.mkDerivation {
26522890 name = "xrandr-1.5.0";
26532891 builder = ./builder.sh;
26542892 src = fetchurl {
26552893 url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2;
26562894 sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1";
26572895 };
2896+ hardeningDisable = [ "bindnow" "relro" ];
26582897 nativeBuildInputs = [ pkgconfig ];
26592898 buildInputs = [ libX11 xproto libXrandr libXrender ];
26602899 meta.platforms = stdenv.lib.platforms.unix;
2661− }) // {inherit libX11 xproto libXrandr libXrender ;};
2900+ }) {};
26622901
2663− xrdb = (mkDerivation "xrdb" {
2902+ xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation {
26642903 name = "xrdb-1.1.0";
26652904 builder = ./builder.sh;
26662905 src = fetchurl {
26672906 url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2;
26682907 sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk";
26692908 };
2909+ hardeningDisable = [ "bindnow" "relro" ];
26702910 nativeBuildInputs = [ pkgconfig ];
26712911 buildInputs = [ libX11 libXmu xproto ];
26722912 meta.platforms = stdenv.lib.platforms.unix;
2673− }) // {inherit libX11 libXmu xproto ;};
2913+ }) {};
26742914
2675− xrefresh = (mkDerivation "xrefresh" {
2915+ xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
26762916 name = "xrefresh-1.0.5";
26772917 builder = ./builder.sh;
26782918 src = fetchurl {
26792919 url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2;
26802920 sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj";
26812921 };
2922+ hardeningDisable = [ "bindnow" "relro" ];
26822923 nativeBuildInputs = [ pkgconfig ];
26832924 buildInputs = [ libX11 xproto ];
26842925 meta.platforms = stdenv.lib.platforms.unix;
2685− }) // {inherit libX11 xproto ;};
2926+ }) {};
26862927
2687− xset = (mkDerivation "xset" {
2928+ xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXxf86misc }: stdenv.mkDerivation {
26882929 name = "xset-1.2.3";
26892930 builder = ./builder.sh;
26902931 src = fetchurl {
26912932 url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2;
26922933 sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3";
26932934 };
2935+ hardeningDisable = [ "bindnow" "relro" ];
26942936 nativeBuildInputs = [ pkgconfig ];
26952937 buildInputs = [ libX11 libXext libXmu xproto libXxf86misc ];
26962938 meta.platforms = stdenv.lib.platforms.unix;
2697− }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
2939+ }) {};
26982940
2699− xsetroot = (mkDerivation "xsetroot" {
2941+ xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu }: stdenv.mkDerivation {
27002942 name = "xsetroot-1.1.0";
27012943 builder = ./builder.sh;
27022944 src = fetchurl {
27032945 url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2;
27042946 sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
27052947 };
2948+ hardeningDisable = [ "bindnow" "relro" ];
27062949 nativeBuildInputs = [ pkgconfig ];
27072950 buildInputs = [ libX11 xbitmaps libXcursor libXmu ];
27082951 meta.platforms = stdenv.lib.platforms.unix;
2709− }) // {inherit libX11 xbitmaps libXcursor libXmu ;};
2952+ }) {};
27102953
2711− xtrans = (mkDerivation "xtrans" {
2954+ xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
27122955 name = "xtrans-1.3.5";
27132956 builder = ./builder.sh;
27142957 src = fetchurl {
27152958 url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2;
27162959 sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd";
27172960 };
2961+ hardeningDisable = [ "bindnow" "relro" ];
27182962 nativeBuildInputs = [ pkgconfig ];
27192963 buildInputs = [ ];
27202964 meta.platforms = stdenv.lib.platforms.unix;
2721− }) // {inherit ;};
2965+ }) {};
27222966
2723− xvinfo = (mkDerivation "xvinfo" {
2967+ xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXv }: stdenv.mkDerivation {
27242968 name = "xvinfo-1.1.3";
27252969 builder = ./builder.sh;
27262970 src = fetchurl {
27272971 url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2;
27282972 sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz";
27292973 };
2974+ hardeningDisable = [ "bindnow" "relro" ];
27302975 nativeBuildInputs = [ pkgconfig ];
27312976 buildInputs = [ libX11 xproto libXv ];
27322977 meta.platforms = stdenv.lib.platforms.unix;
2733− }) // {inherit libX11 xproto libXv ;};
2978+ }) {};
27342979
2735− xwd = (mkDerivation "xwd" {
2980+ xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
27362981 name = "xwd-1.0.6";
27372982 builder = ./builder.sh;
27382983 src = fetchurl {
27392984 url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2;
27402985 sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv";
27412986 };
2987+ hardeningDisable = [ "bindnow" "relro" ];
27422988 nativeBuildInputs = [ pkgconfig ];
27432989 buildInputs = [ libX11 xproto ];
27442990 meta.platforms = stdenv.lib.platforms.unix;
2745− }) // {inherit libX11 xproto ;};
2991+ }) {};
27462992
2747− xwininfo = (mkDerivation "xwininfo" {
2993+ xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xproto }: stdenv.mkDerivation {
27482994 name = "xwininfo-1.1.3";
27492995 builder = ./builder.sh;
27502996 src = fetchurl {
27512997 url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2;
27522998 sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1";
27532999 };
3000+ hardeningDisable = [ "bindnow" "relro" ];
27543001 nativeBuildInputs = [ pkgconfig ];
27553002 buildInputs = [ libX11 libxcb xproto ];
27563003 meta.platforms = stdenv.lib.platforms.unix;
2757− }) // {inherit libX11 libxcb xproto ;};
3004+ }) {};
27583005
2759− xwud = (mkDerivation "xwud" {
3006+ xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation {
27603007 name = "xwud-1.0.4";
27613008 builder = ./builder.sh;
27623009 src = fetchurl {
27633010 url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2;
27643011 sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
27653012 };
3013+ hardeningDisable = [ "bindnow" "relro" ];
27663014 nativeBuildInputs = [ pkgconfig ];
27673015 buildInputs = [ libX11 xproto ];
27683016 meta.platforms = stdenv.lib.platforms.unix;
2769− }) // {inherit libX11 xproto ;};
3017+ }) {};
27703018
2771−}; in xorg
3019+})
pkgs/servers/x11/xorg/extra.list+1−1
@@ -2,7 +2,7 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
22http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
33http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
44http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
5−http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
5+https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
66http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2
77http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2
88http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl+35−28
@@ -13,6 +13,9 @@
1313use strict;
1414use warnings;
1515
16+use File::Basename;
17+use File::Spec::Functions;
18+
1619my $tmpDir = "/tmp/xorg-unpack";
1720
1821
@@ -43,7 +46,6 @@ $pcMap{"\$DRI2PROTO"} = "dri2proto";
4346
4447
4548my $downloadCache = "./download-cache";
46−$ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache;
4749mkdir $downloadCache, 0755;
4850
4951
@@ -76,7 +78,17 @@ while (<>) {
7678 $pkgURLs{$pkg} = $tarball;
7779 $pkgNames{$pkg} = $pkgName;
7880
79− my ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball'`;
81+ my $cachePath = catdir($downloadCache, basename($tarball));
82+ my $hash;
83+ my $path;
84+ if (-e $cachePath) {
85+ $path = readlink($cachePath);
86+ $hash = `nix-hash --type sha256 --base32 --flat $cachePath`;
87+ }
88+ else {
89+ ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball'`;
90+ `nix-store --realise --add-root $cachePath --indirect $path`;
91+ }
8092 chomp $hash;
8193 chomp $path;
8294 $pkgHashes{$pkg} = $hash;
@@ -157,7 +169,7 @@ while (<>) {
157169 if ($file =~ /AC_PATH_PROG\(FCCACHE/) {
158170 # Don't run fc-cache.
159171 die if defined $extraAttrs{$pkg};
160− $extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; ";
172+ push @{$extraAttrs{$pkg}}, "preInstall = \"installFlags=(FCCACHE=true)\";";
161173 }
162174
163175 my $isFont;
@@ -178,7 +190,7 @@ while (<>) {
178190 }
179191
180192 if ($isFont) {
181− $extraAttrs{$pkg} = " configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ]; ";
193+ push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ];";
182194 }
183195
184196 sub process {
@@ -231,23 +243,9 @@ open OUT, ">default.nix";
231243print OUT "";
232244print OUT <<EOF;
233245# THIS IS A GENERATED FILE. DO NOT EDIT!
234−args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig
235−, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol
236−, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook
237−, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args;
238−
239−let
240−
241− mkDerivation = name: attrs:
242− let newAttrs = (overrides."\${name}" or (x: x)) attrs;
243− stdenv = newAttrs.stdenv or args.stdenv;
244− in stdenv.mkDerivation ((removeAttrs newAttrs [ "stdenv" ]) // {
245− hardeningDisable = [ "bindnow" "relro" ];
246− });
246+{ lib, newScope, pixman }:
247247
248− overrides = import ./overrides.nix {inherit args xorg;};
249−
250− xorg = rec {
248+lib.makeScope newScope (self: with self; {
251249
252250 inherit pixman;
253251
@@ -258,13 +256,13 @@ foreach my $pkg (sort (keys %pkgURLs)) {
258256 print "$pkg\n";
259257
260258 my %requires = ();
261− my $inputs = "";
259+ my @buildInputs;
262260 foreach my $req (sort @{$pkgRequires{$pkg}}) {
263261 if (defined $pcMap{$req}) {
264262 # Some packages have .pc that depends on itself.
265263 next if $pcMap{$req} eq $pkg;
266264 if (!defined $requires{$pcMap{$req}}) {
267− $inputs .= "$pcMap{$req} ";
265+ push @buildInputs, $pcMap{$req};
268266 $requires{$pcMap{$req}} = 1;
269267 }
270268 } else {
@@ -272,25 +270,34 @@ foreach my $pkg (sort (keys %pkgURLs)) {
272270 }
273271 }
274272
275− my $extraAttrs = $extraAttrs{"$pkg"};
276− $extraAttrs = "" unless defined $extraAttrs;
273+ my $buildInputsStr = join "", map { $_ . " " } @buildInputs;
274+
275+ my @arguments = @buildInputs;
276+ unshift @arguments, "stdenv", "pkgconfig", "fetchurl";
277+ my $argumentsStr = join ", ", @arguments;
278+
279+ my $extraAttrsStr = "";
280+ if (defined $extraAttrs{$pkg}) {
281+ $extraAttrsStr = join "", map { "\n " . $_ } @{$extraAttrs{$pkg}};
282+ }
277283
278284 print OUT <<EOF
279− $pkg = (mkDerivation "$pkg" {
285+ $pkg = callPackage ({ $argumentsStr }: stdenv.mkDerivation {
280286 name = "$pkgNames{$pkg}";
281287 builder = ./builder.sh;
282288 src = fetchurl {
283289 url = $pkgURLs{$pkg};
284290 sha256 = "$pkgHashes{$pkg}";
285291 };
292+ hardeningDisable = [ "bindnow" "relro" ];
286293 nativeBuildInputs = [ pkgconfig ];
287− buildInputs = [ $inputs];$extraAttrs
294+ buildInputs = [ $buildInputsStr];$extraAttrsStr
288295 meta.platforms = stdenv.lib.platforms.unix;
289− }) // {inherit $inputs;};
296+ }) {};
290297
291298EOF
292299}
293300
294−print OUT "}; in xorg\n";
301+print OUT "})\n";
295302
296303close OUT;
pkgs/servers/x11/xorg/old.list+1−1
@@ -1,7 +1,7 @@
11mirror://xorg/individual/app/twm-1.0.8.tar.bz2
22mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
33mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
4−mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
4+mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2
55mirror://xorg/individual/app/xfs-1.1.4.tar.bz2
66mirror://xorg/individual/app/xinit-1.4.0.tar.bz2
77mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2
pkgs/servers/x11/xorg/overrides.nix+272−259
@@ -1,7 +1,13 @@
1−{ args, xorg }:
1+{ abiCompat ? null,
2+ stdenv, makeWrapper, lib, fetchurl, fetchpatch,
3+
4+ automake, autoconf, libtool, intltool, mtdev, libevdev, libinput,
5+ python, freetype, apple_sdk, tradcpp, fontconfig, mesa_drivers,
6+ libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
7+ mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
8+ mcpp, epoxy, openssl, pkgconfig }:
29
310let
4− inherit (args) stdenv makeWrapper;
511 inherit (stdenv) lib isDarwin;
612 inherit (lib) overrideDerivation;
713
@@ -9,83 +15,84 @@ let
915 (stdenv.hostPlatform != stdenv.buildPlatform)
1016 "--enable-malloc0returnsnull";
1117in
18+self: super:
1219{
13− bdftopcf = attrs: attrs // {
14− buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.fontsproto ];
15− };
20+ bdftopcf = super.bdftopcf.overrideAttrs (attrs: {
21+ buildInputs = attrs.buildInputs ++ [ self.xproto self.fontsproto ];
22+ });
1623
17− bitmap = attrs: attrs // {
24+ bitmap = super.bitmap.overrideAttrs (attrs: {
1825 nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
1926 postInstall = ''
2027 paths=(
2128 "$out/share/X11/%T/%N"
2229 "$out/include/X11/%T/%N"
23− "${xorg.xbitmaps}/include/X11/%T/%N"
30+ "${self.xbitmaps}/include/X11/%T/%N"
2431 )
2532 wrapProgram "$out/bin/bitmap" \
2633 --suffix XFILESEARCHPATH : $(IFS=:; echo "''${paths[*]}")
2734 makeWrapper "$out/bin/bitmap" "$out/bin/bitmap-color" \
2835 --suffix XFILESEARCHPATH : "$out/share/X11/%T/%N-color"
2936 '';
30− };
37+ });
3138
32− encodings = attrs: attrs // {
33− buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
34− };
39+ encodings = super.encodings.overrideAttrs (attrs: {
40+ buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
41+ });
3542
36− fontbhttf = attrs: attrs // {
43+ fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
3744 meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
38− };
45+ });
3946
40− fontcursormisc = attrs: attrs // {
41− buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
42− };
47+ fontcursormisc = super.fontcursormisc.overrideAttrs (attrs: {
48+ buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
49+ });
4350
44− fontmiscmisc = attrs: attrs // {
51+ fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
4552 postInstall =
4653 ''
47− ALIASFILE=${xorg.fontalias}/share/fonts/X11/misc/fonts.alias
54+ ALIASFILE=${self.fontalias}/share/fonts/X11/misc/fonts.alias
4855 test -f $ALIASFILE
4956 cp $ALIASFILE $out/lib/X11/fonts/misc/fonts.alias
5057 '';
51− };
58+ });
5259
53− imake = attrs: attrs // {
54− inherit (xorg) xorgcffiles;
60+ imake = super.imake.overrideAttrs (attrs: {
61+ inherit (self) xorgcffiles;
5562 x11BuildHook = ./imake.sh;
5663 patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch];
5764 setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null;
5865 CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin
59− then "${args.tradcpp}/bin/cpp"
66+ then "${tradcpp}/bin/cpp"
6067 else "gcc"}\\\""
6168 ];
62− tradcpp = if stdenv.isDarwin then args.tradcpp else null;
63− };
69+ tradcpp = if stdenv.isDarwin then tradcpp else null;
70+ });
6471
65− mkfontdir = attrs: attrs // {
66− preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin";
67− };
72+ mkfontdir = super.mkfontdir.overrideAttrs (attrs: {
73+ preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin";
74+ });
6875
69− mkfontscale = attrs: attrs // {
70− patches = lib.singleton (args.fetchpatch {
76+ mkfontscale = super.mkfontscale.overrideAttrs (attrs: {
77+ patches = lib.singleton (fetchpatch {
7178 name = "mkfontscale-fix-sig11.patch";
7279 url = "https://bugs.freedesktop.org/attachment.cgi?id=113951";
7380 sha256 = "0i2xf768mz8kvm7i514v0myna9m6jqw82f9a03idabdpamxvwnim";
7481 });
7582 patchFlags = [ "-p0" ];
76− };
83+ });
7784
78− libxcb = attrs : attrs // {
79− nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ];
85+ libxcb = super.libxcb.overrideAttrs (attrs: {
86+ nativeBuildInputs = attrs.nativeBuildInputs ++ [ python ];
8087 configureFlags = [ "--enable-xkb" "--enable-xinput" ];
8188 outputs = [ "out" "dev" "man" "doc" ];
82− };
89+ });
8390
84− xcbproto = attrs : attrs // {
85− nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ];
86− };
91+ xcbproto = super.xcbproto.overrideAttrs (attrs: {
92+ nativeBuildInputs = attrs.nativeBuildInputs ++ [ python ];
93+ });
8794
88− libX11 = attrs: attrs // {
95+ libX11 = super.libX11.overrideAttrs (attrs: {
8996 outputs = [ "out" "dev" "man" ];
9097 configureFlags = attrs.configureFlags or []
9198 ++ malloc0ReturnsNullCrossFlag;
@@ -98,260 +105,264 @@ in
98105 rm -rf $out/share/doc
99106 '';
100107 CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
101− };
108+ });
102109
103− libAppleWM = attrs: attrs // {
104− buildInputs = attrs.buildInputs ++ [ args.apple_sdk.frameworks.ApplicationServices ];
110+ libAppleWM = super.libAppleWM.overrideAttrs (attrs: {
111+ buildInputs = attrs.buildInputs ++ [ apple_sdk.frameworks.ApplicationServices ];
105112 preConfigure = ''
106− substituteInPlace src/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices}
113+ substituteInPlace src/Makefile.in --replace -F/System -F${apple_sdk.frameworks.ApplicationServices}
107114 '';
108− };
115+ });
109116
110− libXau = attrs: attrs // {
117+ libXau = super.libXau.overrideAttrs (attrs: {
111118 outputs = [ "out" "dev" ];
112− };
119+ });
113120
114− libXdmcp = attrs: attrs // {
121+ libXdmcp = super.libXdmcp.overrideAttrs (attrs: {
115122 outputs = [ "out" "dev" "doc" ];
116− };
123+ });
117124
118− libXfont = attrs: attrs // {
125+ libXfont = super.libXfont.overrideAttrs (attrs: {
119126 outputs = [ "out" "dev" ];
120− propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
127+ propagatedBuildInputs = [ freetype ]; # propagate link reqs. like bzip2
121128 # prevents "misaligned_stack_error_entering_dyld_stub_binder"
122129 configureFlags = lib.optionals isDarwin [
123130 "CFLAGS=-O0"
124131 ];
125− };
132+ });
126133
127− libXxf86vm = attrs: attrs // {
134+ libXxf86vm = super.libXxf86vm.overrideAttrs (attrs: {
128135 outputs = [ "out" "dev" ];
129136 configureFlags = attrs.configureFlags or []
130137 ++ malloc0ReturnsNullCrossFlag;
131− };
138+ });
132139
133140 # Propagate some build inputs because of header file dependencies.
134141 # Note: most of these are in Requires.private, so maybe builder.sh
135142 # should propagate them automatically.
136− libXt = attrs: attrs // {
143+ libXt = super.libXt.overrideAttrs (attrs: {
137144 preConfigure = ''
138145 sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
139146 '';
140147 configureFlags = attrs.configureFlags or []
141148 ++ malloc0ReturnsNullCrossFlag;
142− propagatedBuildInputs = [ xorg.libSM ];
149+ propagatedBuildInputs = [ self.libSM ];
143150 CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
144151 outputs = [ "out" "dev" "devdoc" ];
145− };
152+ });
146153
147154 # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
148155 # Once the bug is fixed upstream, this can be removed.
149− luit = attrs: attrs // {
156+ luit = super.luit.overrideAttrs (attrs: {
150157 configureFlags = [ "--disable-selective-werror" ];
151− };
158+ });
152159
153− compositeproto = attrs: attrs // {
154− propagatedBuildInputs = [ xorg.fixesproto ];
155− };
160+ compositeproto = super.compositeproto.overrideAttrs (attrs: {
161+ propagatedBuildInputs = [ self.fixesproto ];
162+ });
156163
157− libICE = attrs: attrs // {
164+ libICE = super.libICE.overrideAttrs (attrs: {
158165 outputs = [ "out" "dev" "doc" ];
159− };
166+ });
160167
161− libXcomposite = attrs: attrs // {
168+ libXcomposite = super.libXcomposite.overrideAttrs (attrs: {
162169 outputs = [ "out" "dev" ];
163− propagatedBuildInputs = [ xorg.libXfixes ];
164− };
170+ propagatedBuildInputs = [ self.libXfixes ];
171+ });
165172
166− libXaw = attrs: attrs // {
173+ libXaw = super.libXaw.overrideAttrs (attrs: {
167174 outputs = [ "out" "dev" "devdoc" ];
168− propagatedBuildInputs = [ xorg.libXmu ];
169− };
175+ propagatedBuildInputs = [ self.libXmu ];
176+ });
170177
171− libXcursor = attrs: attrs // {
178+ libXcursor = super.libXcursor.overrideAttrs (attrs: {
172179 outputs = [ "out" "dev" ];
173− };
180+ });
174181
175− libXdamage = attrs: attrs // {
182+ libXdamage = super.libXdamage.overrideAttrs (attrs: {
176183 outputs = [ "out" "dev" ];
177− };
184+ });
178185
179− libXft = attrs: attrs // {
186+ libXft = super.libXft.overrideAttrs (attrs: {
180187 outputs = [ "out" "dev" ];
181− propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
188+ propagatedBuildInputs = [ self.libXrender freetype fontconfig ];
182189 configureFlags = attrs.configureFlags or []
183190 ++ malloc0ReturnsNullCrossFlag;
184191 # the include files need ft2build.h, and Requires.private isn't enough for us
185192 postInstall = ''
186193 sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
187194 '';
188− };
195+ passthru = {
196+ inherit freetype fontconfig;
197+ };
198+ });
189199
190− libXext = attrs: attrs // {
200+ libXext = super.libXext.overrideAttrs (attrs: {
191201 outputs = [ "out" "dev" "man" "doc" ];
192− propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
202+ propagatedBuildInputs = [ self.xproto self.libXau ];
193203 configureFlags = attrs.configureFlags or []
194204 ++ malloc0ReturnsNullCrossFlag;
195− };
205+ });
196206
197− libXfixes = attrs: attrs // {
207+ libXfixes = super.libXfixes.overrideAttrs (attrs: {
198208 outputs = [ "out" "dev" ];
199− };
209+ });
200210
201− libXi = attrs: attrs // {
211+ libXi = super.libXi.overrideAttrs (attrs: {
202212 outputs = [ "out" "dev" "man" "doc" ];
203− propagatedBuildInputs = [ xorg.libXfixes ];
204− };
213+ propagatedBuildInputs = [ self.libXfixes ];
214+ });
205215
206− libXinerama = attrs: attrs // {
216+ libXinerama = super.libXinerama.overrideAttrs (attrs: {
207217 outputs = [ "out" "dev" ];
208− };
218+ });
209219
210− libXmu = attrs: attrs // {
220+ libXmu = super.libXmu.overrideAttrs (attrs: {
211221 outputs = [ "out" "dev" "doc" ];
212222 buildFlags = ''BITMAP_DEFINES=-DBITMAPDIR=\"/no-such-path\"'';
213− };
223+ });
214224
215− libXrandr = attrs: attrs // {
225+ libXrandr = super.libXrandr.overrideAttrs (attrs: {
216226 outputs = [ "out" "dev" ];
217227 configureFlags = attrs.configureFlags or []
218228 ++ malloc0ReturnsNullCrossFlag;
219− propagatedBuildInputs = [xorg.libXrender];
220− };
229+ propagatedBuildInputs = [self.libXrender];
230+ });
221231
222− libSM = attrs: attrs // {
232+ libSM = super.libSM.overrideAttrs (attrs: {
223233 outputs = [ "out" "dev" "doc" ];
224− propagatedBuildInputs = [ xorg.libICE ];
225− };
234+ propagatedBuildInputs = [ self.libICE ];
235+ });
226236
227− libXrender = attrs: attrs // {
237+ libXrender = super.libXrender.overrideAttrs (attrs: {
228238 outputs = [ "out" "dev" "doc" ];
229239 configureFlags = attrs.configureFlags or []
230240 ++ malloc0ReturnsNullCrossFlag;
231− propagatedBuildInputs = [ xorg.renderproto ];
232− };
241+ propagatedBuildInputs = [ self.renderproto ];
242+ });
233243
234− libXres = attrs: attrs // {
244+ libXres = super.libXres.overrideAttrs (attrs: {
235245 outputs = [ "out" "dev" "devdoc" ];
236− };
246+ });
237247
238− libXv = attrs: attrs // {
248+ libXv = super.libXv.overrideAttrs (attrs: {
239249 outputs = [ "out" "dev" "devdoc" ];
240− };
250+ });
241251
242− libXvMC = attrs: attrs // {
252+ libXvMC = super.libXvMC.overrideAttrs (attrs: {
243253 outputs = [ "out" "dev" "doc" ];
244− buildInputs = attrs.buildInputs ++ [xorg.renderproto];
245− };
254+ buildInputs = attrs.buildInputs ++ [self.renderproto];
255+ });
246256
247− libXp = attrs: attrs // {
257+ libXp = super.libXp.overrideAttrs (attrs: {
248258 outputs = [ "out" "dev" ];
249− };
259+ });
250260
251− libXpm = attrs: attrs // {
261+ libXpm = super.libXpm.overrideAttrs (attrs: {
252262 name = "libXpm-3.5.12";
253− src = args.fetchurl {
263+ src = fetchurl {
254264 url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2;
255265 sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
256266 };
257267 outputs = [ "bin" "dev" "out" ]; # tiny man in $bin
258268 patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
259− };
269+ });
260270
261− libXpresent = attrs: attrs
262− // { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; };
271+ libXpresent = super.libXpresent.overrideAttrs (attrs: {
272+ buildInputs = with self; attrs.buildInputs ++ [ libXext libXfixes libXrandr ];
273+ });
263274
264− libxkbfile = attrs: attrs // {
275+ libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
265276 outputs = [ "out" "dev" ]; # mainly to avoid propagation
266− };
277+ });
267278
268− libxshmfence = attrs: attrs // {
279+ libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
269280 name = "libxshmfence-1.3";
270− src = args.fetchurl {
281+ src = fetchurl {
271282 url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2;
272283 sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q";
273284 };
274285 outputs = [ "out" "dev" ]; # mainly to avoid propagation
275− };
286+ });
276287
277− libpciaccess = attrs: attrs // {
288+ libpciaccess = super.libpciaccess.overrideAttrs (attrs: {
278289 meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; };
279− };
290+ });
280291
281− setxkbmap = attrs: attrs // {
292+ setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
282293 postInstall =
283294 ''
284295 mkdir -p $out/share
285− ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11
296+ ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11
286297 '';
287− };
298+ });
288299
289− utilmacros = attrs: attrs // { # not needed for releases, we propagate the needed tools
290− propagatedBuildInputs = with args; [ automake autoconf libtool ];
291− };
300+ utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools
301+ propagatedBuildInputs = [ automake autoconf libtool ];
302+ });
292303
293− x11perf = attrs: attrs // {
294− buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ];
295− };
304+ x11perf = super.x11perf.overrideAttrs (attrs: {
305+ buildInputs = attrs.buildInputs ++ [ freetype fontconfig ];
306+ });
296307
297− xcbutil = attrs: attrs // {
308+ xcbutil = super.xcbutil.overrideAttrs (attrs: {
298309 outputs = [ "out" "dev" ];
299− };
310+ });
300311
301− xcbutilcursor = attrs: attrs // {
312+ xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: {
302313 outputs = [ "out" "dev" ];
303314 meta = attrs.meta // { maintainers = [ stdenv.lib.maintainers.lovek323 ]; };
304− };
315+ });
305316
306− xcbutilimage = attrs: attrs // {
317+ xcbutilimage = super.xcbutilimage.overrideAttrs (attrs: {
307318 outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
308− };
319+ });
309320
310− xcbutilkeysyms = attrs: attrs // {
321+ xcbutilkeysyms = super.xcbutilkeysyms.overrideAttrs (attrs: {
311322 outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
312− };
323+ });
313324
314− xcbutilrenderutil = attrs: attrs // {
325+ xcbutilrenderutil = super.xcbutilrenderutil.overrideAttrs (attrs: {
315326 outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
316− };
327+ });
317328
318− xcbutilwm = attrs: attrs // {
329+ xcbutilwm = super.xcbutilwm.overrideAttrs (attrs: {
319330 outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
320− };
331+ });
321332
322− xf86inputevdev = attrs: attrs // {
333+ xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
323334 outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny
324335 preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
325336 installFlags = "sdkdir=\${out}/include/xorg";
326− buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ];
327− };
337+ buildInputs = attrs.buildInputs ++ [ mtdev libevdev ];
338+ });
328339
329− xf86inputmouse = attrs: attrs // {
340+ xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
330341 installFlags = "sdkdir=\${out}/include/xorg";
331− };
342+ });
332343
333− xf86inputjoystick = attrs: attrs // {
344+ xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: {
334345 installFlags = "sdkdir=\${out}/include/xorg";
335− };
346+ });
336347
337− xf86inputlibinput = attrs: attrs // rec {
348+ xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec {
338349 name = "xf86-input-libinput-0.28.0";
339− src = args.fetchurl {
350+ src = fetchurl {
340351 url = "mirror://xorg/individual/driver/${name}.tar.bz2";
341352 sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691";
342353 };
343354 outputs = [ "out" "dev" ];
344− buildInputs = attrs.buildInputs ++ [ args.libinput ];
355+ buildInputs = attrs.buildInputs ++ [ libinput ];
345356 installFlags = "sdkdir=\${dev}/include/xorg";
346− };
357+ });
347358
348− xf86inputsynaptics = attrs: attrs // {
359+ xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
349360 outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev
350− buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev];
361+ buildInputs = attrs.buildInputs ++ [mtdev libevdev];
351362 installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d";
352− };
363+ });
353364
354− xf86inputvmmouse = attrs: attrs // {
365+ xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: {
355366 configureFlags = [
356367 "--sysconfdir=$(out)/etc"
357368 "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d"
@@ -361,82 +372,83 @@ in
361372 meta = attrs.meta // {
362373 platforms = ["i686-linux" "x86_64-linux"];
363374 };
364− };
375+ });
365376
366377 # Obsolete drivers that don't compile anymore.
367− xf86videoark = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
368− xf86videogeode = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
369− xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
370− xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
371− xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
372− xf86videotga = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
373− xf86videov4l = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
374− xf86videovoodoo = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
375− xf86videowsfb = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
376−
377− xf86videoamdgpu = attrs: attrs // {
378+ xf86videoark = super.xf86videoark.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
379+ xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
380+ xf86videoglide = super.xf86videoglide.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
381+ xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
382+ xf86videonewport = super.xf86videonewport.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
383+ xf86videotga = super.xf86videotga.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
384+ xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
385+ xf86videovoodoo = super.xf86videovoodoo.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
386+ xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });
387+
388+ xf86videoamdgpu = super.xf86videoamdgpu.overrideAttrs (attrs: {
378389 configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ];
379− };
390+ });
380391
381− xf86videoati = attrs: attrs // {
382− NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver.dev or xorg.xorgserver}/include/xorg";
383− };
392+ xf86videoati = super.xf86videoati.overrideAttrs (attrs: {
393+ NIX_CFLAGS_COMPILE = "-I${self.xorgserver.dev or self.xorgserver}/include/xorg";
394+ });
384395
385− xf86videovmware = attrs: attrs // {
386− buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
396+ xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
397+ buildInputs = attrs.buildInputs ++ [ mesa_drivers ]; # for libxatracker
387398 meta = attrs.meta // {
388399 platforms = ["i686-linux" "x86_64-linux"];
389400 };
390− };
401+ });
391402
392− xf86videoqxl = attrs: attrs // {
393− buildInputs = attrs.buildInputs ++ [ args.spice-protocol ];
394− };
403+ xf86videoqxl = super.xf86videoqxl.overrideAttrs (attrs: {
404+ buildInputs = attrs.buildInputs ++ [ spice-protocol ];
405+ });
395406
396− xf86videosiliconmotion = attrs: attrs // {
407+ xf86videosiliconmotion = super.xf86videosiliconmotion.overrideAttrs (attrs: {
397408 meta = attrs.meta // {
398409 platforms = ["i686-linux" "x86_64-linux"];
399410 };
400− };
401−
402− xdriinfo = attrs: attrs // {
403− buildInputs = attrs.buildInputs ++ [args.libGL];
404− };
411+ });
405412
406− xvinfo = attrs: attrs // {
407− buildInputs = attrs.buildInputs ++ [xorg.libXext];
408− };
413+ xdriinfo = super.xdriinfo.overrideAttrs (attrs: {
414+ buildInputs = attrs.buildInputs ++ [libGL];
415+ });
409416
410− xkbcomp = attrs: attrs // {
411− configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ];
412− };
417+ xvinfo = super.xvinfo.overrideAttrs (attrs: {
418+ buildInputs = attrs.buildInputs ++ [self.libXext];
419+ });
413420
414− xkeyboardconfig = attrs: attrs // {
421+ xkbcomp = super.xkbcomp.overrideAttrs (attrs: {
422+ configureFlags = [ "--with-xkb-config-root=${self.xkeyboardconfig}/share/X11/xkb" ];
423+ });
415424
416− buildInputs = attrs.buildInputs ++ [args.intltool];
425+ xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
426+ buildInputs = attrs.buildInputs ++ [intltool];
417427
418428 #TODO: resurrect patches for US_intl?
419429 patches = [ ./xkeyboard-config-eo.patch ];
420430
431+ configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
432+
421433 # 1: compatibility for X11/xkb location
422434 # 2: I think pkgconfig/ is supposed to be in /lib/
423435 postInstall = ''
424436 ln -s share "$out/etc"
425437 mkdir -p "$out/lib" && ln -s ../share/pkgconfig "$out/lib/"
426438 '';
427− };
439+ });
428440
429− xlsfonts = attrs: attrs // {
441+ xlsfonts = super.xlsfonts.overrideAttrs (attrs: {
430442 meta = attrs.meta // { license = lib.licenses.mit; };
431− };
443+ });
432444
433− xorgserver = with xorg; attrs_passed:
445+ xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed:
434446 # exchange attrs if abiCompat is set
435447 let
436448 version = (builtins.parseDrvName attrs_passed.name).version;
437− attrs = with args;
438− if (args.abiCompat == null || lib.hasPrefix args.abiCompat version) then attrs_passed
439− else if (args.abiCompat == "1.17") then {
449+ attrs =
450+ if (abiCompat == null || lib.hasPrefix abiCompat version) then attrs_passed
451+ else if (abiCompat == "1.17") then {
440452 name = "xorg-server-1.17.4";
441453 builder = ./builder.sh;
442454 src = fetchurl {
@@ -446,7 +458,7 @@ in
446458 nativeBuildInputs = [ pkgconfig ];
447459 buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
448460 meta.platforms = stdenv.lib.platforms.unix;
449− } else if (args.abiCompat == "1.18") then {
461+ } else if (abiCompat == "1.18") then {
450462 name = "xorg-server-1.18.4";
451463 builder = ./builder.sh;
452464 src = fetchurl {
@@ -457,19 +469,19 @@ in
457469 buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
458470 postPatch = stdenv.lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h";
459471 meta.platforms = stdenv.lib.platforms.unix;
460− } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}";
472+ } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}";
461473
462474 in attrs //
463475 (let
464476 version = (builtins.parseDrvName attrs.name).version;
465477 commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
466478 commonPropagatedBuildInputs = [
467− args.zlib args.libGL args.libGLU args.dbus
479+ zlib libGL libGLU dbus
468480 xf86bigfontproto glproto xf86driproto
469481 compositeproto scrnsaverproto resourceproto
470482 xf86dgaproto
471483 dmxproto /*libdmx not used*/ xf86vidmodeproto
472− recordproto libXext pixman libXfont libxshmfence args.libunwind
484+ recordproto libXext pixman libXfont libxshmfence libunwind
473485 damageproto xcmiscproto bigreqsproto
474486 inputproto xextproto randrproto renderproto presentproto
475487 dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
@@ -491,9 +503,9 @@ in
491503 if (!isDarwin)
492504 then {
493505 outputs = [ "out" "dev" ];
494− buildInputs = commonBuildInputs ++ [ args.libdrm args.mesa_noglu ];
495− propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
496− args.udev
506+ buildInputs = commonBuildInputs ++ [ libdrm mesa_noglu ];
507+ propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
508+ udev
497509 ];
498510 prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
499511 export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
@@ -504,8 +516,8 @@ in
504516 "--enable-xcsecurity" # enable SECURITY extension
505517 "--with-default-font-path=" # there were only paths containing "${prefix}",
506518 # and there are no fonts in this package anyway
507− "--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
508− "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
519+ "--with-xkb-bin-directory=${self.xkbcomp}/bin"
520+ "--with-xkb-path=${self.xkeyboardconfig}/share/X11/xkb"
509521 "--with-xkb-output=$out/share/X11/xkb/compiled"
510522 "--enable-glamor"
511523 ] ++ lib.optionals stdenv.hostPlatform.isMusl [
@@ -523,12 +535,12 @@ in
523535 '';
524536 passthru.version = version; # needed by virtualbox guest additions
525537 } else {
526− nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.autoreconfHook xorg.utilmacros xorg.fontutil ];
538+ nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook self.utilmacros self.fontutil ];
527539 buildInputs = commonBuildInputs ++ [
528− args.bootstrap_cmds args.automake args.autoconf
529− args.apple_sdk.libs.Xplugin
530− args.apple_sdk.frameworks.Carbon
531− args.apple_sdk.frameworks.Cocoa
540+ bootstrap_cmds automake autoconf
541+ apple_sdk.libs.Xplugin
542+ apple_sdk.frameworks.Carbon
543+ apple_sdk.frameworks.Cocoa
532544 ];
533545 propagatedBuildInputs = commonPropagatedBuildInputs ++ [
534546 libAppleWM applewmproto
@@ -536,22 +548,22 @@ in
536548
537549 # XQuartz patchset
538550 patches = [
539− (args.fetchpatch {
551+ (fetchpatch {
540552 url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
541553 sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";
542554 name = "use-cppflags-not-cflags.patch";
543555 })
544− (args.fetchpatch {
556+ (fetchpatch {
545557 url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch";
546558 sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg";
547559 name = "use-old-mitrapezoids-and-mitriangles-routines.patch";
548560 })
549− (args.fetchpatch {
561+ (fetchpatch {
550562 url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch";
551563 sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i";
552564 name = "revert-fb-changes-1.patch";
553565 })
554− (args.fetchpatch {
566+ (fetchpatch {
555567 url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch";
556568 sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396";
557569 name = "revert-fb-changes-2.patch";
@@ -570,7 +582,7 @@ in
570582 preConfigure = ''
571583 mkdir -p $out/Applications
572584 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
573− substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices}
585+ substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${apple_sdk.frameworks.ApplicationServices}
574586 '';
575587 postInstall = ''
576588 rm -fr $out/share/X11/xkb/compiled
@@ -582,110 +594,111 @@ in
582594 cp ${darwinOtherX}/share/man -rT $out/share/man
583595 '' ;
584596 passthru.version = version;
585− });
597+ }));
586598
587− lndir = attrs: attrs // {
599+ lndir = super.lndir.overrideAttrs (attrs: {
588600 preConfigure = ''
589601 substituteInPlace lndir.c \
590602 --replace 'n_dirs--;' ""
591603 '';
592− };
604+ });
593605
594− twm = attrs: attrs // {
595− nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex];
596− };
606+ twm = super.twm.overrideAttrs (attrs: {
607+ nativeBuildInputs = attrs.nativeBuildInputs ++ [bison flex];
608+ });
597609
598− xauth = attrs: attrs // {
610+ xauth = super.xauth.overrideAttrs (attrs: {
599611 doCheck = false; # fails
600− };
612+ });
601613
602− xcursorthemes = attrs: attrs // {
603− buildInputs = attrs.buildInputs ++ [xorg.xcursorgen];
614+ xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: {
615+ buildInputs = attrs.buildInputs ++ [self.xcursorgen];
604616 configureFlags = [ "--with-cursordir=$(out)/share/icons" ];
605− };
617+ });
606618
607− xinit = attrs: attrs // {
608− stdenv = if isDarwin then args.clangStdenv else stdenv;
609− buildInputs = attrs.buildInputs ++ lib.optional isDarwin args.bootstrap_cmds;
619+ xinit = (super.xinit.override {
620+ stdenv = if isDarwin then clangStdenv else stdenv;
621+ }).overrideAttrs (attrs: {
622+ buildInputs = attrs.buildInputs ++ lib.optional isDarwin bootstrap_cmds;
610623 configureFlags = [
611− "--with-xserver=${xorg.xorgserver.out}/bin/X"
624+ "--with-xserver=${self.xorgserver.out}/bin/X"
612625 ] ++ lib.optionals isDarwin [
613626 "--with-bundle-id-prefix=org.nixos.xquartz"
614627 "--with-launchdaemons-dir=\${out}/LaunchDaemons"
615628 "--with-launchagents-dir=\${out}/LaunchAgents"
616629 ];
617− propagatedBuildInputs = [ xorg.xauth ]
618− ++ lib.optionals isDarwin [ xorg.libX11 xorg.xproto ];
630+ propagatedBuildInputs = [ self.xauth ]
631+ ++ lib.optionals isDarwin [ self.libX11 self.xproto ];
619632 prePatch = ''
620633 sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp
621634 '';
622− };
635+ });
623636
624− xf86videointel = attrs: attrs // {
637+ xf86videointel = super.xf86videointel.overrideAttrs (attrs: {
625638 # the update script only works with released tarballs :-/
626639 name = "xf86-video-intel-2017-10-19";
627− src = args.fetchurl {
640+ src = fetchurl {
628641 url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/"
629642 + "4798e18b2b2c8b0a05dc967e6140fd9962bc1a73.tar.gz";
630643 sha256 = "1zpgbibfpdassswfj68zwhhfpvd2p80rpxw92bis6lv81ssknwby";
631644 };
632− buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman];
633− nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros];
645+ buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman];
646+ nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros];
634647 configureFlags = [ "--with-default-dri=3" "--enable-tools" ];
635648
636649 meta = attrs.meta // {
637650 platforms = ["i686-linux" "x86_64-linux"];
638651 };
639− };
652+ });
640653
641− xf86videoxgi = attrs: attrs // {
654+ xf86videoxgi = super.xf86videoxgi.overrideAttrs (attrs: {
642655 patches = [
643656 # fixes invalid open mode
644657 # https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/commit/?id=bd94c475035739b42294477cff108e0c5f15ef67
645− (args.fetchpatch {
658+ (fetchpatch {
646659 url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=bd94c475035739b42294477cff108e0c5f15ef67";
647660 sha256 = "0myfry07655adhrpypa9rqigd6rfx57pqagcwibxw7ab3wjay9f6";
648661 })
649− (args.fetchpatch {
662+ (fetchpatch {
650663 url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=78d1138dd6e214a200ca66fa9e439ee3c9270ec8";
651664 sha256 = "0z3643afgrync280zrp531ija0hqxc5mrwjif9nh9lcnzgnz2d6d";
652665 })
653666 ];
654− };
667+ });
655668
656− xorgcffiles = attrs: attrs // {
669+ xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: {
657670 postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
658671 substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
659672 '';
660− };
673+ });
661674
662− xwd = attrs: attrs // {
663− buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile];
664− };
675+ xwd = super.xwd.overrideAttrs (attrs: {
676+ buildInputs = with self; attrs.buildInputs ++ [libXt libxkbfile];
677+ });
665678
666− kbproto = attrs: attrs // {
679+ kbproto = super.kbproto.overrideAttrs (attrs: {
667680 outputs = [ "out" "doc" ];
668− };
681+ });
669682
670− xextproto = attrs: attrs // {
683+ xextproto = super.xextproto.overrideAttrs (attrs: {
671684 outputs = [ "out" "doc" ];
672− };
685+ });
673686
674− xproto = attrs: attrs // {
687+ xproto = super.xproto.overrideAttrs (attrs: {
675688 outputs = [ "out" "doc" ];
676− };
689+ });
677690
678− xrdb = attrs: attrs // {
679− configureFlags = [ "--with-cpp=${args.mcpp}/bin/mcpp" ];
680− };
691+ xrdb = super.xrdb.overrideAttrs (attrs: {
692+ configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ];
693+ });
681694
682− sessreg = attrs: attrs // {
695+ sessreg = super.sessreg.overrideAttrs (attrs: {
683696 preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile";
684− };
697+ });
685698
686− xrandr = attrs: attrs // {
699+ xrandr = super.xrandr.overrideAttrs (attrs: {
687700 postInstall = ''
688701 rm $out/bin/xkeystone
689702 '';
690− };
703+ });
691704}
pkgs/servers/x11/xorg/tarballs-7.7.list+3−3
@@ -106,7 +106,7 @@ mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
106106mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
107107mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
108108mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
109−mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
109+mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
110110mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
111111mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
112112mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
@@ -175,10 +175,10 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
175175mirror://xorg/individual/app/xhost-1.0.7.tar.bz2
176176mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
177177mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
178−mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2
178+mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2
179179mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
180180mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
181−mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2
181+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2
182182mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
183183mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
184184mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
pkgs/shells/zsh/default.nix+10−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ncurses, pcre }:
1+{ stdenv, fetchurl, ncurses, pcre, fetchpatch }:
22
33let
44 version = "5.6.2";
@@ -18,6 +18,15 @@ stdenv.mkDerivation {
1818 sha256 = "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5";
1919 };
2020
21+ patches = [
22+ (fetchpatch {
23+ name = "search-xdg-data-dirs.patch";
24+ url = https://github.com/zsh-users/zsh/commit/624219e0e4cbfdfb286e707bd2853f2d7b6a4a7d.patch;
25+ sha256 = "0i0g7dc0px57vpklm1f4w20vyc92nv15y09r5clvib2kjkxjy2cf";
26+ excludes = [ "ChangeLog" ];
27+ })
28+ ];
29+
2130 buildInputs = [ ncurses pcre ];
2231
2332 configureFlags = [
pkgs/stdenv/generic/make-derivation.nix+12
@@ -41,6 +41,7 @@ rec {
4141
4242 # Configure Phase
4343 , configureFlags ? []
44+ , cmakeFlags ? []
4445 , # Target is not included by default because most programs don't care.
4546 # Including it then would cause needless mass rebuilds.
4647 #
@@ -225,6 +226,17 @@ rec {
225226 inherit doCheck doInstallCheck;
226227
227228 inherit outputs;
229+ } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
230+ cmakeFlags =
231+ (/**/ if lib.isString cmakeFlags then [cmakeFlags]
232+ else if cmakeFlags == null then []
233+ else cmakeFlags)
234+ ++ lib.optional (stdenv.hostPlatform.uname.system != null) "-DCMAKE_SYSTEM_NAME=${stdenv.hostPlatform.uname.system}"
235+ ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
236+ ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}"
237+ ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
238+ ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"
239+ ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}";
228240 } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {
229241 enableParallelChecking = attrs.enableParallelChecking or true;
230242 } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
pkgs/tools/backup/btrbk/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "btrbk-${version}";
6− version = "0.26.1";
6+ version = "0.27.0";
77
88 src = fetchurl {
99 url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz";
10− sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp";
10+ sha256 = "0nsqpmfymh9df32fy8qg6bhimd65yxdjpany97s1n08qb110zh2y";
1111 };
1212
1313 nativeBuildInputs = [ asciidoc makeWrapper ];
pkgs/tools/compression/brotli/default.nix+1−3
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ cmake ];
1717
18− cmakeFlags = stdenv.lib.optional
19− (stdenv.hostPlatform.libc == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows";
18+ cmakeFlags = [];
2019
2120 outputs = [ "out" "dev" "lib" ];
2221
@@ -59,4 +58,3 @@ stdenv.mkDerivation rec {
5958 platforms = platforms.all;
6059 };
6160}
62−
pkgs/tools/misc/bat/default.nix+10−3
@@ -4,17 +4,17 @@
44
55rustPlatform.buildRustPackage rec {
66 name = "bat-${version}";
7− version = "0.7.1";
7+ version = "0.8.0";
88
99 src = fetchFromGitHub {
1010 owner = "sharkdp";
1111 repo = "bat";
1212 rev = "v${version}";
13− sha256 = "1fzk0z7r70rjvv2c6531zaa1jzbcb7j9wbi0xqb9y4dls538bmz0";
13+ sha256 = "1xvjw61q0qbnzj95g7g8xckcqha9jrf2172b5l7faj7i0jhmz2kx";
1414 fetchSubmodules = true;
1515 };
1616
17− cargoSha256 = "19syz0sxcpk3i4675bfq5gpb9i6hp81in36w820kkvamaimq10nd";
17+ cargoSha256 = "0xv769f2iqrgnbmb7ma9p3gbb2xpx2lhqc0kq5nizf8w8xdc5m11";
1818
1919 nativeBuildInputs = [ cmake pkgconfig zlib ];
2020
@@ -22,6 +22,13 @@ rustPlatform.buildRustPackage rec {
2222
2323 postInstall = ''
2424 install -m 444 -Dt $out/share/man/man1 doc/bat.1
25+
26+ install -Dm644 target/release/build/bat-*/out/_bat \
27+ "$out/share/zsh/site-functions/_bat"
28+ install -Dm644 target/release/build/bat-*/out/bat.bash \
29+ "$out/share/bash-completions/completions/bat.bash"
30+ install -Dm644 target/release/build/bat-*/out/bat.fish \
31+ "$out/share/fish/vendor_completions.d/bat.fish"
2532 '';
2633
2734 meta = with stdenv.lib; {
pkgs/tools/networking/curl/7_59.nix+5−1
@@ -77,7 +77,11 @@ stdenv.mkDerivation rec {
7777 ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
7878 # For the 'urandom', maybe it should be a cross-system option
7979 ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
80− "--with-random=/dev/urandom";
80+ "--with-random=/dev/urandom"
81+ ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [
82+ "--disable-shared"
83+ "--enable-static"
84+ ];
8185
8286 CXX = "${stdenv.cc.targetPrefix}c++";
8387 CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
pkgs/tools/networking/curl/default.nix+5−1
@@ -81,7 +81,11 @@ stdenv.mkDerivation rec {
8181 ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
8282 # For the 'urandom', maybe it should be a cross-system option
8383 ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
84− "--with-random=/dev/urandom";
84+ "--with-random=/dev/urandom"
85+ ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [
86+ "--disable-shared"
87+ "--enable-static"
88+ ];
8589
8690 CXX = "${stdenv.cc.targetPrefix}c++";
8791 CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
pkgs/tools/networking/eternal-terminal/default.nix+5−7
@@ -1,20 +1,18 @@
1−{ stdenv, fetchFromGitHub, cmake, gflags, glog, libsodium, protobuf }:
1+{ stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }:
22
33stdenv.mkDerivation rec {
44 name = "eternal-terminal-${version}";
5− version = "4.1.2";
5+ version = "5.1.6";
66
77 src = fetchFromGitHub {
88 owner = "MisterTea";
99 repo = "EternalTCP";
1010 rev = "refs/tags/et-v${version}";
11− sha256 = "1zy30ccsddgs2wqwxphnx5i00j4gf69lr68mzg9x6imqfz0sbcjz";
11+ sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz";
1212 };
1313
14− nativeBuildInputs = [ cmake ];
15− buildInputs = [ gflags glog libsodium protobuf ];
16−
17− enableParallelBuilding = true;
14+ nativeBuildInputs = [ cmake ninja ];
15+ buildInputs = [ gflags libsodium protobuf ];
1816
1917 meta = with stdenv.lib; {
2018 description = "Remote shell that automatically reconnects without interrupting the session";
pkgs/tools/package-management/xbps/default.nix+4−4
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "xbps-${version}";
5− version = "0.52";
5+ version = "0.53";
66
77 src = fetchFromGitHub {
8− owner = "voidlinux";
8+ owner = "void-linux";
99 repo = "xbps";
1010 rev = version;
11− sha256 = "1sf6iy9l3dijsczsngzbhksshfm1374g2rrdasc04l6gz35l2cdp";
11+ sha256 = "1zicin2z5j7vg2ixzpd6nahjhrjwdcavm817wzgs9x013b596paa";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig which ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 enableParallelBuilding = true;
3131
3232 meta = with stdenv.lib; {
33− homepage = https://github.com/voidlinux/xbps;
33+ homepage = https://github.com/void-linux/xbps;
3434 description = "The X Binary Package System";
3535 platforms = platforms.linux; # known to not work on Darwin, at least
3636 license = licenses.bsd2;
pkgs/tools/security/monkeysphere/default.nix+8−6
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, makeWrapper
22, perl, libassuan, libgcrypt
3−, perlPackages, lockfileProgs, gnupg
3+, perlPackages, lockfileProgs, gnupg, coreutils
44# For the tests:
55, bash, openssh, which, socat, cpio, hexdump
66}:
@@ -16,10 +16,14 @@ stdenv.mkDerivation rec {
1616
1717 patches = [ ./monkeysphere.patch ];
1818
19+ postPatch = ''
20+ sed -i "s,/usr/bin/env,${coreutils}/bin/env," src/share/ma/update_users
21+ '';
22+
1923 nativeBuildInputs = [ makeWrapper ];
2024 buildInputs = [ perl libassuan libgcrypt ]
2125 ++ stdenv.lib.optional doCheck
22− ([ gnupg openssh which socat cpio hexdump ] ++
26+ ([ gnupg openssh which socat cpio hexdump lockfileProgs ] ++
2327 (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
2428
2529 makeFlags = ''
@@ -31,10 +35,8 @@ stdenv.mkDerivation rec {
3135 # entropy (apparently GnuPG still uses /dev/random).
3236 doCheck = false;
3337 preCheck = ''
34− patchShebangs tests/keytrans
35− patchShebangs src/share/keytrans
36− patchShebangs src/share/checkperms
37− sed -i "s,/usr/bin/env\ bash,${bash}/bin/bash," tests/basic
38+ patchShebangs tests/
39+ patchShebangs src/
3840 sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic
3941 sed -i "s/<(hd/<(hexdump/" tests/keytrans
4042 '';
pkgs/tools/security/nmap/default.nix+8−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libpcap, pkgconfig, openssl
1+{ stdenv, fetchurl, libpcap, pkgconfig, openssl, lua5_3
22, graphicalSupport ? false
33, libX11 ? null
44, gtk2 ? null
@@ -35,11 +35,17 @@ in stdenv.mkDerivation rec {
3535 --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
3636 '';
3737
38− configureFlags = []
38+ configureFlags = [ "--with-liblua=${lua5_3}" ]
3939 ++ optional (!pythonSupport) "--without-ndiff"
4040 ++ optional (!graphicalSupport) "--without-zenmap"
4141 ;
4242
43+ makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
44+ "AR=${stdenv.cc.bintools.targetPrefix}ar"
45+ "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib"
46+ "CC=${stdenv.cc.targetPrefix}gcc"
47+ ];
48+
4349 postInstall = optionalString pythonSupport ''
4450 wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH"
4551 '' + optionalString graphicalSupport ''
pkgs/tools/text/html-tidy/default.nix+1−2
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
1515
16− cmakeFlags = stdenv.lib.optional
17− (stdenv.hostPlatform.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows";
16+ cmakeFlags = [];
1817
1918 # ATM bin/tidy is statically linked, as upstream provides no other option yet.
2019 # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107
pkgs/tools/video/bento4/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ stdenv, fetchFromGitHub
2+, cmake
3+}:
4+stdenv.mkDerivation rec {
5+ name = "bento4-${version}";
6+ version = "1.5.1-624";
7+
8+ src = fetchFromGitHub {
9+ owner = "axiomatic-systems";
10+ repo = "Bento4";
11+ rev = "v${version}";
12+ sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf";
13+ };
14+
15+ nativeBuildInputs = [ cmake ];
16+ installPhase = ''
17+ mkdir -p $out/{lib,bin}
18+ find -iname '*.so' -exec mv --target-directory="$out/lib" {} \;
19+ find -maxdepth 1 -executable -type f -exec mv --target-directory="$out/bin" {} \;
20+ '';
21+
22+ meta = with stdenv.lib; {
23+ description = "Full-featured MP4 format and MPEG DASH library and tools";
24+ homepage = http://bento4.com;
25+ license = licenses.gpl3;
26+ maintainers = with maintainers; [ makefu ];
27+ broken = stdenv.isAarch64;
28+ platforms = platforms.linux;
29+ };
30+}
pkgs/top-level/all-packages.nix+18−15
@@ -1684,6 +1684,8 @@ with pkgs;
16841684 pythonPackages = python3Packages;
16851685 };
16861686
1687+ bento4 = callPackage ../tools/video/bento4 { };
1688+
16871689 bepasty = callPackage ../tools/misc/bepasty { };
16881690
16891691 bettercap = callPackage ../tools/security/bettercap { };
@@ -2075,7 +2077,7 @@ with pkgs;
20752077 zlibSupport = true;
20762078 sslSupport = zlibSupport;
20772079 scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
2078− gssSupport = true;
2080+ gssSupport = !stdenv.hostPlatform.isWindows;
20792081 };
20802082
20812083 curl = callPackage ../tools/networking/curl rec {
@@ -2084,7 +2086,7 @@ with pkgs;
20842086 zlibSupport = true;
20852087 sslSupport = zlibSupport;
20862088 scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
2087− gssSupport = true;
2089+ gssSupport = !stdenv.hostPlatform.isWindows;
20882090 };
20892091
20902092 curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };
@@ -6833,7 +6835,7 @@ with pkgs;
68336835
68346836 cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install;
68356837
6836− stack = haskell.lib.justStaticExecutables haskellPackages.stack;
6838+ stack = haskell.lib.justStaticExecutables haskell.packages.ghc861.stack;
68376839 hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
68386840
68396841 all-cabal-hashes = callPackage ../data/misc/hackage { };
@@ -8276,7 +8278,7 @@ with pkgs;
82768278 cpplint = callPackage ../development/tools/analysis/cpplint { };
82778279
82788280 cquery = callPackage ../development/tools/misc/cquery {
8279− llvmPackages = llvmPackages_6;
8281+ llvmPackages = llvmPackages_7;
82808282 };
82818283
82828284 creduce = callPackage ../development/tools/misc/creduce {
@@ -13771,21 +13773,19 @@ with pkgs;
1377113773 inherit (darwin.apple_sdk.libs) Xplugin;
1377213774 };
1377313775
13774− xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg {
13775− inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig
13776− libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind
13777− dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
13778− autoconf automake libtool mtdev pixman libGL libGLU
13779− cairo epoxy;
13780− inherit (buildPackages) pkgconfig xmlto asciidoc flex bison;
13781− inherit (darwin) apple_sdk cf-private libobjc;
13776+ # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`
13777+ # so as not to have the newly bound xorg items already in scope, which would
13778+ # have created a cycle.
13779+ xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg {
13780+ }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix {
13781+ inherit (darwin) apple_sdk;
1378213782 bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
1378313783 python = python2; # Incompatible with Python 3x
1378413784 udev = if stdenv.isLinux then udev else null;
1378513785 libdrm = if stdenv.isLinux then libdrm else null;
1378613786 abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
1378713787 or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
13788− } // { inherit xlibsWrapper; } );
13788+ }) // { inherit xlibsWrapper; } );
1378913789
1379013790 xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
1379113791
@@ -17001,7 +17001,7 @@ with pkgs;
1700117001
1700217002 googleearth = callPackage ../applications/misc/googleearth { };
1700317003
17004− google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; patchelf = patchelfUnstable; };
17004+ google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
1700517005
1700617006 google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; };
1700717007
@@ -18588,6 +18588,8 @@ with pkgs;
1858818588
1858918589 rclone = callPackage ../applications/networking/sync/rclone { };
1859018590
18591+ rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
18592+
1859118593 rcs = callPackage ../applications/version-management/rcs { };
1859218594
1859318595 rdesktop = callPackage ../applications/networking/remote/rdesktop { };
@@ -19487,6 +19489,7 @@ with pkgs;
1948719489 winswitch = callPackage ../tools/X11/winswitch { };
1948819490
1948919491 wings = callPackage ../applications/graphics/wings {
19492+ esdl = esdl.override { erlang = erlangR18; };
1949019493 erlang = erlangR18;
1949119494 };
1949219495
@@ -22347,7 +22350,7 @@ with pkgs;
2234722350 unity3d = callPackage ../development/tools/unity3d {
2234822351 stdenv = stdenv_32bit;
2234922352 gcc_32bit = pkgsi686Linux.gcc;
22350− inherit (gnome2) GConf libgnomeui gnome_vfs;
22353+ inherit (gnome2) GConf;
2235122354 };
2235222355
2235322356 urbit = callPackage ../misc/urbit { };
pkgs/top-level/python-packages.nix+2−19
@@ -2390,7 +2390,7 @@ in {
23902390
23912391 google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { };
23922392
2393− gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; });
2393+ gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; });
23942394
23952395 gphoto2 = callPackage ../development/python-modules/gphoto2 {
23962396 inherit (pkgs) pkgconfig;
@@ -3173,24 +3173,7 @@ in {
31733173
31743174 bottleneck = callPackage ../development/python-modules/bottleneck { };
31753175
3176− paho-mqtt = buildPythonPackage rec {
3177− name = "paho-mqtt-${version}";
3178− version = "1.1";
3179−
3180− disabled = isPyPy;
3181−
3182− src = pkgs.fetchurl {
3183− url = "mirror://pypi/p/paho-mqtt/${name}.tar.gz";
3184− sha256 = "07i6k9mw66kgbvjgsrcsd2sjji9ckym50dcxnmhjqfkfzsg64yhg";
3185− };
3186−
3187− meta = {
3188− homepage = "https://eclipse.org/paho/";
3189− description = "mqtt library for machine to machine and internet of things";
3190− license = licenses.epl10;
3191− maintainers = with maintainers; [ mog ];
3192− };
3193− };
3176+ paho-mqtt = callPackage ../development/python-modules/paho-mqtt { };
31943177
31953178 pamqp = buildPythonPackage rec {
31963179 version = "1.6.1";
pkgs/top-level/splice.nix+3−1
@@ -112,7 +112,9 @@ let
112112 inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform;
113113 };
114114
115− splicedPackagesWithXorg = splicedPackages // splicedPackages.xorg;
115+ splicedPackagesWithXorg = splicedPackages // builtins.removeAttrs splicedPackages.xorg [
116+ "callPackage" "newScope" "overrideScope" "packages"
117+ ];
116118
117119in
118120