diff --git a/.mention-bot b/.mention-bot new file mode 100644 index 000000000000..36e38ed82b9d --- /dev/null +++ b/.mention-bot @@ -0,0 +1,6 @@ +{ + // users in this list will never be mentioned by mention-bot + "userBlacklist": [ + "civodul" + ] +} diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 54e10e5cf8cb..e6947bf804c9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -92,7 +92,7 @@ eikek = "Eike Kettner "; elasticdog = "Aaron Bull Schaefer "; ellis = "Ellis Whitehead "; - emery = "Emery Hemingway "; + ehmry = "Emery Hemingway "; enolan = "Echo Nolan "; epitrochoid = "Mabry Cervin "; ericbmerritt = "Eric Merritt "; @@ -207,6 +207,7 @@ muflax = "Stefan Dorn "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; + nequissimus = "Tim Steinbach "; nico202 = "Nicolò Balzarotti "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; @@ -218,6 +219,7 @@ olcai = "Erik Timan "; orbitz = "Malcolm Matalka "; osener = "Ozan Sener "; + oxij = "Jan Malakhovski "; page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; pakhfn = "Fedor Pakhomov "; @@ -287,6 +289,7 @@ tailhook = "Paul Colomiets "; taktoa = "Remy Goldschmidt "; telotortium = "Robert Irelan "; + thall = "Niclas Thall "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; theuni = "Christian Theune "; diff --git a/lib/platforms.nix b/lib/platforms.nix index 825cc4136a19..750829da3751 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -8,8 +8,9 @@ rec { openbsd = ["i686-openbsd" "x86_64-openbsd"]; netbsd = ["i686-netbsd" "x86_64-netbsd"]; cygwin = ["i686-cygwin" "x86_64-cygwin"]; - unix = linux ++ darwin ++ freebsd ++ openbsd; - all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; + illumos = ["x86_64-solaris"]; + unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; + all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; none = []; allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"]; diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index e2202e1e17df..b10846ac18a1 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -2,10 +2,20 @@ with lib; let + cfg = config.hardware.bumblebee; + kernel = config.boot.kernelPackages; - bumblebee = if config.hardware.bumblebee.connectDisplay - then pkgs.bumblebee_display - else pkgs.bumblebee; + + useNvidia = cfg.driver == "nvidia"; + + bumblebee = pkgs.bumblebee.override { + inherit useNvidia; + useDisplayDevice = cfg.connectDisplay; + }; + + primus = pkgs.primus.override { + inherit useNvidia; + }; in @@ -29,6 +39,7 @@ in type = types.str; description = ''Group for bumblebee socket''; }; + hardware.bumblebee.connectDisplay = mkOption { default = false; type = types.bool; @@ -40,26 +51,30 @@ in Only nvidia driver is supported so far. ''; }; + + hardware.bumblebee.driver = mkOption { + default = "nvidia"; + type = types.enum [ "nvidia" "nouveau" ]; + description = '' + Set driver used by bumblebeed. Supported are nouveau and nvidia. + ''; + }; }; config = mkIf config.hardware.bumblebee.enable { boot.blacklistedKernelModules = [ "nouveau" "nvidia" ]; boot.kernelModules = [ "bbswitch" ]; - boot.extraModulePackages = [ kernel.bbswitch kernel.nvidia_x11 ]; + boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11; - environment.systemPackages = [ bumblebee pkgs.primus ]; + environment.systemPackages = [ bumblebee primus ]; systemd.services.bumblebeed = { description = "Bumblebee Hybrid Graphics Switcher"; wantedBy = [ "display-manager.service" ]; path = [ kernel.bbswitch bumblebee ]; serviceConfig = { - ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}"; - Restart = "always"; - RestartSec = 60; - CPUSchedulingPolicy = "idle"; + ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; }; - environment.LD_LIBRARY_PATH="/run/opengl-driver/lib/"; environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 23b6edcefd1a..6427c5be6818 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -10,7 +10,6 @@ enableRDW = config.networking.networkmanager.enable; tlp = pkgs.tlp.override { inherit enableRDW; - kmod = config.system.sbin.modprobe; }; # XXX: We can't use writeTextFile + readFile here because it triggers @@ -69,6 +68,8 @@ in ExecStart = "${tlp}/bin/tlp init start"; ExecStop = "${tlp}/bin/tlp init stop"; }; + + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; tlp-sleep = { @@ -87,6 +88,8 @@ in ExecStart = "${tlp}/bin/tlp suspend"; ExecStop = "${tlp}/bin/tlp resume"; }; + + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 7534eb0ae6a3..3e1f53e79f3e 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -117,7 +117,7 @@ in services.mingetty.helpLine = mkIf cfg.showManual "\nPress for the NixOS manual."; - services.nixosManual.browser = mkDefault "${pkgs.w3m}/bin/w3m"; + services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m"; }; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 2adbb0a5c4e3..5a6ca139ddad 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -53,11 +53,13 @@ in default = false; description = '' Enable putting a wireless interface into infrastructure mode, - allowing other wireless devices to associate with the wireless interface and do - wireless networking. A simple access point will enable hostapd.wpa, and - hostapd.wpa_passphrase, hostapd.ssid, dhcpd on the wireless interface to - provide IP addresses to the associated stations, and nat (from the wireless - interface to an upstream interface). + allowing other wireless devices to associate with the wireless + interface and do wireless networking. A simple access point will + , + , and + , as well as DHCP on the wireless + interface to provide IP addresses to the associated stations, and + NAT (from the wireless interface to an upstream interface). ''; }; @@ -73,7 +75,10 @@ in default = "nl80211"; example = "hostapd"; type = types.string; - description = "Which driver hostapd will use. Most things will probably use the default."; + description = '' + Which driver hostapd will use. + Most applications will probably use the default. + ''; }; ssid = mkOption { @@ -87,7 +92,10 @@ in default = "b"; example = "g"; type = types.string; - description = "Operation mode (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g"; + description = '' + Operation mode. + (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g). + ''; }; channel = mkOption { @@ -97,8 +105,9 @@ in description = '' Channel number (IEEE 802.11) - Please note that some drivers do not use this value from hostapd and the - channel will need to be configured separately with iwconfig. + Please note that some drivers do not use this value from + hostapd and the channel will need to be configured + separately with iwconfig. ''; }; @@ -106,12 +115,16 @@ in default = "wheel"; example = "network"; type = types.string; - description = "members of this group can control hostapd"; + description = '' + Members of this group can control hostapd. + ''; }; wpa = mkOption { default = true; - description = "enable WPA (IEEE 802.11i/D3.0) to authenticate to the access point"; + description = '' + Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point. + ''; }; wpaPassphrase = mkOption { @@ -121,8 +134,9 @@ in description = '' WPA-PSK (pre-shared-key) passphrase. Clients will need this - passphrase to associate with this access point. Warning: This passphrase will - get put into a world-readable file in the nix store. + passphrase to associate with this access point. + Warning: This passphrase will get put into a world-readable file in + the Nix store! ''; }; @@ -134,7 +148,7 @@ in ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40] ''; type = types.string; - description = "Extra configuration options to put in the hostapd.conf"; + description = "Extra configuration options to put in hostapd.conf."; }; }; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 36d9f5d2f166..e85f26811257 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -300,22 +300,8 @@ in options = { services.nsd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the NSD authoritative domain name server. - ''; - }; - - bind8Stats = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - Wheter to enable BIND8 like statisics. - ''; - }; + enable = mkEnableOption "NSD authoritative DNS server"; + bind8Stats = mkEnableOption "BIND8 like statistics"; rootServer = mkOption { type = types.bool; @@ -483,13 +469,7 @@ in ratelimit = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable ratelimit capabilities. - ''; - }; + enable = mkEnableOption "ratelimit capabilities"; size = mkOption { type = types.int; @@ -548,13 +528,7 @@ in remoteControl = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Wheter to enable remote control via nsd-control(8). - ''; - }; + enable = mkEnableOption "remote control via nsd-control"; interfaces = mkOption { type = types.listOf types.str; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 31f42f5ffb9f..37d3348b8a32 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -12,6 +12,7 @@ in ./bspwm.nix ./clfswm.nix ./compiz.nix + ./dwm.nix ./fluxbox.nix ./herbstluftwm.nix ./i3.nix diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix new file mode 100644 index 000000000000..a74bfce097de --- /dev/null +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.windowManager.dwm; + +in + +{ + + ###### interface + + options = { + services.xserver.windowManager.dwm.enable = mkEnableOption "dwm"; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.xserver.windowManager.session = singleton + { name = "dwm"; + start = + '' + ${pkgs.dwm}/bin/dwm & + waitPID=$! + ''; + }; + + environment.systemPackages = [ pkgs.dwm ]; + + }; + +} diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 2cae63fdda44..f61c82b916ad 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -25,7 +25,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "cjdns"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ emery ]; + maintainers = [ ehmry ]; }; nodes = rec @@ -122,4 +122,4 @@ import ./make-test.nix ({ pkgs, ...} : { $bob->succeed("curl --fail -g http://[$aliceIp6]"); ''; -}) \ No newline at end of file +}) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index a5cfdf227bb3..4aba1a530757 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,22 +1,120 @@ -{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}: +{ stdenv, fetchFromGitHub, ncurses, pkgconfig + +, alsaSupport ? stdenv.isLinux, alsaLib ? null +# simple fallback for everyone else +, aoSupport ? !stdenv.isLinux, libao ? null +, jackSupport ? false, libjack ? null +, samplerateSupport ? jackSupport, libsamplerate ? null +, ossSupport ? false, alsaOss ? null +, pulseaudioSupport ? false, libpulseaudio ? null + +# TODO: add these +#, artsSupport +#, roarSupport +#, sndioSupport +#, sunSupport +#, waveoutSupport + +, cddbSupport ? true, libcddb ? null +, cdioSupport ? true, libcdio ? null +, cueSupport ? true, libcue ? null +, discidSupport ? true, libdiscid ? null +, ffmpegSupport ? true, ffmpeg ? null +, flacSupport ? true, flac ? null +, madSupport ? true, libmad ? null +, mikmodSupport ? true, libmikmod ? null +, modplugSupport ? true, libmodplug ? null +, mpcSupport ? true, libmpcdec ? null +, tremorSupport ? false, tremor ? null +, vorbisSupport ? true, libvorbis ? null +, wavpackSupport ? true, wavpack ? null + +# can't make these work, something is broken +#, aacSupport ? true, faac ? null +#, mp4Support ? true, mp4v2 ? null +#, opusSupport ? true, opusfile ? null + +# not in nixpkgs +#, vtxSupport ? true, libayemu ? null +}: + +with stdenv.lib; + +assert samplerateSupport -> jackSupport; + +# vorbis and tremor are mutually exclusive +assert vorbisSupport -> !tremorSupport; +assert tremorSupport -> !vorbisSupport; + +let + + mkFlag = b: f: dep: if b + then { flags = [ f ]; deps = [ dep ]; } + else { flags = []; deps = []; }; + + opts = [ + # Audio output + (mkFlag alsaSupport "CONFIG_ALSA=y" alsaLib) + (mkFlag aoSupport "CONFIG_AO=y" libao) + (mkFlag jackSupport "CONFIG_JACK=y" libjack) + (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) + (mkFlag ossSupport "CONFIG_OSS=y" alsaOss) + (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio) + + #(mkFlag artsSupport "CONFIG_ARTS=y") + #(mkFlag roarSupport "CONFIG_ROAR=y") + #(mkFlag sndioSupport "CONFIG_SNDIO=y") + #(mkFlag sunSupport "CONFIG_SUN=y") + #(mkFlag waveoutSupport "CONFIG_WAVEOUT=y") + + # Input file formats + (mkFlag cddbSupport "CONFIG_CDDB=y" libcddb) + (mkFlag cdioSupport "CONFIG_CDIO=y" libcdio) + (mkFlag cueSupport "CONFIG_CUE=y" libcue) + (mkFlag discidSupport "CONFIG_DISCID=y" libdiscid) + (mkFlag ffmpegSupport "CONFIG_FFMPEG=y" ffmpeg) + (mkFlag flacSupport "CONFIG_FLAC=y" flac) + (mkFlag madSupport "CONFIG_MAD=y" libmad) + (mkFlag mikmodSupport "CONFIG_MIKMOD=y" libmikmod) + (mkFlag modplugSupport "CONFIG_MODPLUG=y" libmodplug) + (mkFlag mpcSupport "CONFIG_MPC=y" libmpcdec) + (mkFlag tremorSupport "CONFIG_TREMOR=y" tremor) + (mkFlag vorbisSupport "CONFIG_VORBIS=y" libvorbis) + (mkFlag wavpackSupport "CONFIG_WAVPACK=y" wavpack) + + #(mkFlag opusSupport "CONFIG_OPUS=y" opusfile) + #(mkFlag mp4Support "CONFIG_MP4=y" mp4v2) + #(mkFlag aacSupport "CONFIG_AAC=y" faac) + + #(mkFlag vtxSupport "CONFIG_VTX=y" libayemu) + ]; + +in stdenv.mkDerivation rec { name = "cmus-${version}"; - version = "2.6.0"; + version = "2.7.0"; - src = fetchgit { - url = https://github.com/cmus/cmus.git; - rev = "46b71032da827d22d4fae5bf2afcc4c9afef568c"; - sha256 = "1hkqifll5ryf3ljp3w1dxz1p8m6rk34fpazc6vwavis6ga310hka"; + src = fetchFromGitHub { + owner = "cmus"; + repo = "cmus"; + rev = "0306cc74c5073a85cf8619c61da5b94a3f863eaa"; + sha256 = "18w9mznb843nzkrcqvshfha51mlpdl92zlvb5wfc5dpgrbf37728"; }; - configurePhase = "./configure prefix=$out"; + patches = [ ./option-debugging.patch ]; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ]; + configurePhase = "./configure " + concatStringsSep " " ([ + "prefix=$out" + "CONFIG_WAV=y" + ] ++ concatMap (a: a.flags) opts); + + buildInputs = [ ncurses pkgconfig ] ++ concatMap (a: a.deps) opts; meta = { description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = https://cmus.github.io/; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.oxij ]; }; } diff --git a/pkgs/applications/audio/cmus/option-debugging.patch b/pkgs/applications/audio/cmus/option-debugging.patch new file mode 100644 index 000000000000..84115e1480e1 --- /dev/null +++ b/pkgs/applications/audio/cmus/option-debugging.patch @@ -0,0 +1,42 @@ +Shows build and link errors in configure for ease of debugging which +options require what. +diff --git a/scripts/checks.sh b/scripts/checks.sh +index 64cbbf3..fab4d9b 100644 +--- a/scripts/checks.sh ++++ b/scripts/checks.sh +@@ -425,7 +425,7 @@ try_compile() + echo "$1" > $__src || exit 1 + shift + __cmd="$CC -c $CFLAGS $@ $__src -o $__obj" +- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null ++ $CC -c $CFLAGS "$@" $__src -o $__obj + ;; + cxx) + __src=`tmp_file prog.cc` +@@ -433,7 +433,7 @@ try_compile() + echo "$1" > $__src || exit 1 + shift + __cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj" +- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null ++ $CXX -c $CXXFLAGS "$@" $__src -o $__obj + ;; + esac + return $? +@@ -451,7 +451,7 @@ try_compile_link() + echo "$1" > $__src || exit 1 + shift + __cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@" +- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null ++ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" + ;; + cxx) + __src=`tmp_file prog.cc` +@@ -459,7 +459,7 @@ try_compile_link() + echo "$1" > $__src || exit 1 + shift + __cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@" +- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null ++ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" + ;; + esac + return $? diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index 93abad7aa77f..2b78d1a4b6dd 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { { description = "Auditory binaural-beat generator"; homepage = http://gnaural.sourceforge.net/; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index 3b7a5bc685c1..e412f31f3168 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of audio level meters with GUI in LV2 plugin format"; homepage = http://x42.github.io/meters.lv2/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 3d0114352a14..df76b8073b66 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { meta = with stdenv.lib; { homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard"; description = "The official MusicBrainz tagger"; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index dc2fe0ba6492..5d60824c3b0d 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, libjack2, libsndfile, lv2, mesa, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.6"; + version = "1.3.7.1"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0c2y59m945rrspnwdxmixk92z9nfiayxdxh582gf15nj8bvkh1l6"; + sha256 = "13xc1x8jrr2rn26jx4dini692ww3771d5j5xf7f56ixqr7mmdhvz"; }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile lv2 mesa + alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile readline lv2 mesa minixml zlib xorg.libpthreadstubs ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ]; + cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ]; meta = with stdenv.lib; { description = "high quality software synthesizer based on ZynAddSubFX"; diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 59f9f7110043..c2956006fb40 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo, acl, gpm, AppKit +, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK3 ? false, gtk3 ? null , withGTK2 ? true, gtk2 @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin AppKit; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; configureFlags = if stdenv.isDarwin diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 344293d3367c..a27027406e2c 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -15,15 +15,15 @@ with stdenv.lib; let - version = "0.1.0"; + version = "0.1.1"; # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation { + neovimLibvterm = let version = "2015-11-06"; in stdenv.mkDerivation { name = "neovim-libvterm-${version}"; src = fetchFromGitHub { - sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5"; - rev = "20ad1396c178c72873aeeb2870bd726f847acb70"; + sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9"; + rev = "04781d37ce5af3f580376dc721bd3b89c434966b"; repo = "libvterm"; owner = "neovim"; }; @@ -63,7 +63,7 @@ let name = "neovim-${version}"; src = fetchFromGitHub { - sha256 = "1704f3dqf5p6hicpzf0pi21n6ymylra9prsm4azvqp86allmvnfx"; + sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60"; rev = "v${version}"; repo = "neovim"; owner = "neovim"; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 8f0c560f47d1..0749f58ecea2 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { { description = "Set of integrated tools for the R language"; homepage = http://www.rstudio.com/; license = licenses.agpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index ab7b08d8186a..a09eb846e500 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { ]; }; + __impureHostDeps = [ "/dev/ptmx" ]; + # To fix the trouble in vim73, that it cannot cross-build with this patch # to bypass a configure script check that cannot be done cross-building. # http://groups.google.com/group/vim_dev/browse_thread/thread/66c02efd1523554b?pli=1 diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 67b733dda7ae..3de7057916aa 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -7,12 +7,12 @@ in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.24.73-g6c4f6bc"; + name = "sane-backends-1.0.25.177-g753d123"; src = fetchgit { url = "git://alioth.debian.org/git/sane/sane-backends.git"; - rev = "6c4f6bc58615755dc734281703b594cea3ebf848"; - sha256 = "0f7lbv1rnr53n4rpihcd8dkfm01xvwfnx9i1nqaadrzbpvgkjrfa"; + rev = "753d123f36d08cdb8047adac7c89a9fe015c4b25"; + sha256 = "1f5b4606f9b1b65a312794726e8d5d06056510b7426f86845ebeb8ca1a9b2f1f"; }; udevSupport = hotplugSupport; @@ -38,12 +38,19 @@ stdenv.mkDerivation { "echo epson2 > \${out}/etc/sane.d/dll.conf" else ""; - meta = { + meta = with stdenv.lib; { homepage = "http://www.sane-project.org/"; - description = "Scanner Access Now Easy"; - license = stdenv.lib.licenses.gpl2Plus; + description = "SANE (Scanner Access Now Easy) backends"; + longDescription = '' + Collection of open-source SANE backends (device drivers). + SANE is a universal scanner interface providing standardized access to + any raster image scanner hardware: flatbed scanners, hand-held scanners, + video- and still-cameras, frame-grabbers, etc. For a list of supported + scanners, see http://www.sane-project.org/sane-backends.html. + ''; + license = licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ nckx simons ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 66fc4810e7d9..fb943ac23b5d 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -8,16 +8,16 @@ let firmware = gt68xxFirmware { inherit fetchurl; }; in stdenv.mkDerivation rec { - version = "1.0.24"; + version = "1.0.25"; name = "sane-backends-${version}"; src = fetchurl { urls = [ - "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.24.tar.gz/1ca68e536cd7c1852322822f5f6ac3a4/${name}.tar.gz" - "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz" + "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.25.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/${name}.tar.gz" + "https://alioth.debian.org/frs/download.php/file/4146/${name}.tar.gz" ]; curlOpts = "--insecure"; - sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7"; + sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4"; }; outputs = [ "out" "doc" "man" ]; @@ -49,12 +49,19 @@ stdenv.mkDerivation rec { " \${out}/share/sane/snapscan/your-firmwarefile.bin" else ""; - meta = { + meta = with stdenv.lib; { homepage = "http://www.sane-project.org/"; - description = "Scanner Access Now Easy"; - license = stdenv.lib.licenses.gpl2Plus; + description = "SANE (Scanner Access Now Easy) backends"; + longDescription = '' + Collection of open-source SANE backends (device drivers). + SANE is a universal scanner interface providing standardized access to + any raster image scanner hardware: flatbed scanners, hand-held scanners, + video- and still-cameras, frame-grabbers, etc. For a list of supported + scanners, see http://www.sane-project.org/sane-backends.html. + ''; + license = licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ nckx simons ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 1b2e518c5a76..df997ad6e0b5 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { ''; homepage = https://electrum.org; license = licenses.gpl3; - maintainers = with maintainers; [ emery joachifm ]; + maintainers = with maintainers; [ ehmry joachifm ]; }; } diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 6af9b7dc267d..e7829be03647 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Private, secure, untraceable currency"; homepage = http://monero.cc/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 06a7e3bcd7ec..8b527463b228 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { homepage = https://centrabit.com/; license = licenses.lgpl3; platforms = qt.meta.platforms; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; }; } diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index f580c41c0a4d..9a912353281f 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { ''; homepage = http://xcruiser.sourceforge.net/; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix index 10b2ffaff5bf..ad3c1a715b3c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { { description = "Plugin for browser to TREZOR device communication"; homepage = https://mytrezor.com; license = licenses.unfree; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index d8c421af46a8..e71a733970ee 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl -, sslSupport ? true -, graphicsSupport ? false -, mouseSupport ? false -, ncurses, openssl ? null, boehmgc, gettext, zlib -, imlib2 ? null, xlibsWrapper ? null, fbcon ? null -, gpm-ncurses ? null +, ncurses, boehmgc, gettext, zlib +, sslSupport ? true, openssl ? null +, graphicsSupport ? true, imlib2 ? null +, x11Support ? graphicsSupport, libX11 ? null +, mouseSupport ? true, gpm-ncurses ? null }: assert sslSupport -> openssl != null; -assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null); +assert graphicsSupport -> imlib2 != null; +assert x11Support -> graphicsSupport && libX11 != null; assert mouseSupport -> gpm-ncurses != null; +with stdenv.lib; + stdenv.mkDerivation rec { name = "w3m-0.5.3"; @@ -19,19 +21,24 @@ stdenv.mkDerivation rec { sha256 = "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lsocket -lnsl"; + patches = [ ./glibc214.patch ] # Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that # alpha. At the time of writing this, boehm-gc-7.1 is the last stable. - ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ] - ++ stdenv.lib.optional stdenv.isCygwin ./cygwin.patch; + ++ optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ] + ++ optional stdenv.isCygwin ./cygwin.patch + # for frame buffer only version + ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]; buildInputs = [ncurses boehmgc gettext zlib] - ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optional mouseSupport gpm-ncurses - ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon]; + ++ optional sslSupport openssl + ++ optional mouseSupport gpm-ncurses + ++ optional graphicsSupport imlib2 + ++ optional x11Support libX11; configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" - + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; + + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb"; preConfigure = '' substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path @@ -40,7 +47,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - meta = with stdenv.lib; { + # for w3mimgdisplay + LIBS = optionalString x11Support "-lX11"; + + meta = { homepage = http://w3m.sourceforge.net/; description = "A text-mode web browser"; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/applications/networking/browsers/w3m/no-x11.patch b/pkgs/applications/networking/browsers/w3m/no-x11.patch new file mode 100644 index 000000000000..83b3e96821f5 --- /dev/null +++ b/pkgs/applications/networking/browsers/w3m/no-x11.patch @@ -0,0 +1,15 @@ +Forget about X11 in fb module. +This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb. +diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c +index ea36637..d3d7bc3 100644 +--- a/w3mimg/fb/fb_imlib2.c ++++ b/w3mimg/fb/fb_imlib2.c +@@ -3,7 +3,7 @@ + fb_imlib2.c 0.3 Copyright (C) 2002, hito + **************************************************************************/ + +-#include ++#define X_DISPLAY_MISSING + #include + #include "fb.h" + #include "fb_img.h" diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 4635814e11c2..9f107559551f 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { { description = "FIFO based tox client"; homepage = http://ratox.2f30.org/; license = licenses.isc; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index 84cf023776ea..6aa1ec762532 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The slrn (S-Lang read news) newsreader"; homepage = http://slrn.sourceforge.net/index.html; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; }; } diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix index e7be81def616..6b1a1fc94540 100644 --- a/pkgs/applications/networking/p2p/firestr/default.nix +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Grass computing platform"; homepage = http://firestr.com/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 5f7ad92f7cc6..b1181960f41a 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = http://dev.yorhel.nl/ncdc; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; # arbitrary - maintainers = [ stdenv.lib.maintainers.emery ]; + maintainers = [ stdenv.lib.maintainers.ehmry ]; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 5d76b295dda3..dc80d7d34dec 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { { description = "GTK remote control for the Transmission BitTorrent client"; homepage = https://github.com/ajf8/transmission-remote-gtk; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 5e29e3cfd0dd..5e09beb4c476 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "A fast incremental file transfer utility"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ simons emery ]; + maintainers = with maintainers; [ simons ehmry ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 0f0793149594..d060acef53ed 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation { # required to support pthread_cancel() NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + # without this, git fails when trying to check for /etc/gitconfig existence + propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc"; + makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix new file mode 100644 index 000000000000..fb6d542f4790 --- /dev/null +++ b/pkgs/applications/version-management/git-review/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pythonPackages, python} : + +pythonPackages.buildPythonPackage rec { + name = "git-review-${version}"; + version = "1.25.0"; + + # Manually set version because prb wants to get it from the git + # upstream repository (and we are installing from tarball instead) + PBR_VERSION = "${version}"; + + src = fetchurl rec { + url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz"; + sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce"; + }; + + propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests2 pythonPackages.argparse pythonPackages.setuptools ]; + + # Don't do tests because they require gerrit which is not packaged + doCheck = false; + + meta = { + homepage = "https://github.com/openstack-infra/git-review"; + description = "Tool to submit code to Gerrit"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 07ad9d8526b5..b02ab0eb8a96 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,8 +1,23 @@ -{ stdenv, fetchFromGitHub, kodi, steam }: +{ stdenv, fetchFromGitHub, cmake, kodi, steam, libcec_platform, tinyxml }: let - pluginDir = "/lib/kodi/plugin"; + pluginDir = "/share/kodi/addons"; + + kodi-platform = stdenv.mkDerivation rec { + project = "kodi-platform"; + version = "15.2"; + name = "${project}-${version}"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = project; + rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1"; + sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi"; + }; + + buildInputs = [ cmake kodi libcec_platform tinyxml ]; + }; mkKodiPlugin = { plugin, namespace, version, src, meta, ... }: stdenv.lib.makeOverridable stdenv.mkDerivation rec { @@ -134,4 +149,36 @@ in propagatedBuildinputs = [ steam ]; }; + pvr-hts = (mkKodiPlugin rec { + plugin = "pvr-hts"; + namespace = "pvr.hts"; + version = "2.1.18"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.hts"; + rev = "016b0b3251d6d5bffaf68baf59010e4347759c4a"; + sha256 = "03lhxipz03r516pycabqc9b89kd7wih3c2dr4p602bk64bsmpi0j"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kodi-pvr/pvr.hts; + description = "Kodi's Tvheadend HTSP client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ page ]; + }; + }).override { + buildInputs = [ cmake kodi libcec_platform kodi-platform ]; + + # disables check ensuring install prefix is that of kodi + cmakeFlags = [ "-DOVERRIDE_PATHS=1" ]; + + # kodi checks for plugin .so libs existance in the addon folder (share/...) + # and the non-wrapped kodi lib/... folder before even trying to dlopen + # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use + installPhase = '' + make install + ln -s $out/lib/kodi/addons/pvr.hts/pvr.hts.so $out/share/kodi/addons/pvr.hts + ''; + }; } diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 9f7a87f9987e..716eef466fb1 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; buildCommand = '' - mkdir -p $out/share/kodi/addons/packages + mkdir -p $out/share/kodi/addons ${stdenv.lib.concatMapStrings (plugin: "ln -s ${plugin.out + plugin.kodiPlugin @@ -50,4 +50,4 @@ stdenv.mkDerivation { }; -} \ No newline at end of file +} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index b84272b7547f..bc777c962d52 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,7 +18,7 @@ let # revision/hash as well. See # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS # for hashes. - version = "5.0.6"; + version = "5.0.10"; forEachModule = action: '' for mod in \ @@ -39,12 +39,12 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "103037"; + extpackRevision = "104061"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - sha256 = "4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5"; + sha256 = "c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -63,7 +63,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0hsqd9bvbbzs3ihlfp2m15z6vx3nydjirv6drhfs6r9iqhl3zmi2"; + sha256 = "56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4ef62baa3d9f..f4d8abb49abc 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "59ed9911c2bb22357345448c3df6104938b45fa780311d20c330e39c6e309991"; + sha256 = "8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix new file mode 100644 index 000000000000..b2aa4de40c02 --- /dev/null +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: + +stdenv.mkDerivation rec { + name = "cwm-5.6"; + + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "cwm"; + rev = "b7a8c11750d11721a897fdb8442d52f15e7a24a0"; + sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml"; + }; + + buildInputs = [ libX11 libXinerama libXrandr libXft yacc pkgconfig ]; + + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + + meta = with stdenv.lib; { + description = "A lightweight and efficient window manager for X11"; + homepage = https://github.com/chneukirchen/cwm; + maintainers = []; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 9822b1a026a1..bea7e07a2029 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -145,7 +145,7 @@ stdenv.mkDerivation { + optionalString (stdenv.isSunOS && nativePrefix != "") '' # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" - ld="$out/bin/ld-solaris" + exec="$ldPath/ld" wrap ld-solaris ${./ld-solaris-wrapper.sh} '') diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh index 9216ea3198dd..5a7b92b5ad7d 100644 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -6,7 +6,7 @@ set -u # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 # but still no success. -cmd="@prog@ -z ignore" +cmd="@ld@ -z ignore" args=("$@"); diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 64eea4ae1000..4bbef1d6e62a 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -6,7 +6,7 @@ source $stdenv/setup header "exporting $url (rev $rev) into $out" -$fetcher --builder --url "$url" --out "$out" --rev "$rev" \ +$SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} \ diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index c73ee1935196..127693d42f2a 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -45,7 +45,7 @@ assert deepClone -> leaveDotGit; stdenv.mkDerivation { inherit name; builder = ./builder.sh; - fetcher = "${stdenv.shell} ${./nix-prefetch-git}"; + fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. buildInputs = [git]; outputHashAlgo = if sha256 == "" then "md5" else "sha256"; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 9a3cdd5c77d2..767444e76981 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -51,50 +51,12 @@ rec { # GnuPG. gnupg = [ - http://gd.tuwien.ac.at/privacy/gnupg/ - ftp://gd.tuwien.ac.at/privacy/gnupg/ - ftp://gnupg.x-zone.org/pub/gnupg/ - ftp://ftp.gnupg.cz/pub/gcrypt/ - ftp://sunsite.dk/pub/security/gcrypt/ - http://gnupg.wildyou.net/ - http://ftp.gnupg.zone-h.org/ - ftp://ftp.jyu.fi/pub/crypt/gcrypt/ - ftp://trumpetti.atm.tut.fi/gcrypt/ - ftp://mirror.cict.fr/gnupg/ - ftp://ftp.strasbourg.linuxfr.org/pub/gnupg/ - ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/ - ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ - ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/ - ftp://hal.csd.auth.gr/mirrors/gnupg/ - ftp://igloo.linux.gr/pub/crypto/gnupg/ - ftp://ftp.uoi.gr/mirror/gcrypt/ - ftp://ftp.crysys.hu/pub/gnupg/ - ftp://ftp.kfki.hu/pub/packages/security/gnupg/ - ftp://ftp.hi.is/pub/mirrors/gnupg/ - ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ - ftp://ftp3.linux.it/pub/mirrors/gnupg/ - ftp://ftp.linux.it/pub/mirrors/gnupg/ - ftp://ftp.bit.nl/mirror/gnupg/ - ftp://ftp.demon.nl/pub/mirrors/gnupg/ - ftp://ftp.surfnet.nl/pub/security/gnupg/ - ftp://sunsite.icm.edu.pl/pub/security/gnupg/ - ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/ - http://ftp.gnupg.tsuren.net/ - http://www.mirror386.com/gnupg/ - ftp://ftp.sunet.se/pub/security/gnupg/ - ftp://mirror.switch.ch/mirror/gnupg/ - ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt - - http://gnupg.unixmexico.org/ftp/ - ftp://ftp.gnupg.ca/ - http://gulus.usherbrooke.ca/pub/appl/GnuPG/ - http://mirrors.rootmode.com/ftp.gnupg.org/ - - ftp://ftp.planetmirror.com/pub/gnupg/ - - ftp://pgp.iijlab.net/pub/pgp/gnupg/ - ftp://ftp.ring.gr.jp/pub/net/gnupg/ - ftp://gnupg.cdpa.nsysu.edu.tw/gnupg/ + https://gnupg.org/ftp/gcrypt/ + http://www.ring.gr.jp/pub/net/ + http://gd.tuwien.ac.at/privacy/ + http://mirrors.dotsrc.org/ + http://ftp.heanet.ie/mirrors/ftp.gnupg.org/ + http://www.mirrorservice.org/sites/ftp.gnupg.org/ ]; # kernel.org's /pub (/pub/{linux,software}) tree. diff --git a/pkgs/build-support/gcc-wrapper-old/utils.sh b/pkgs/build-support/gcc-wrapper-old/utils.sh index 753b3772e956..fa19f91bf5d2 100644 --- a/pkgs/build-support/gcc-wrapper-old/utils.sh +++ b/pkgs/build-support/gcc-wrapper-old/utils.sh @@ -14,6 +14,8 @@ badPath() { # the temporary build directory). if test "${p:0:1}" != "/"; then return 1; fi + @extraPathTests@ + # Otherwise, the path should refer to the store or some temporary # directory (including the build directory). test \ diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 9d8cd0217a53..38660718d0e2 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -19,12 +19,12 @@ patchShebangs() { local newInterpreterLine find "$dir" -type f -perm -0100 | while read f; do - if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then + if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then # missing shebang => not a script continue fi - oldInterpreterLine=$(head -1 "$f" | tail -c +3) + oldInterpreterLine=$(head -1 "$f" | tail -c+3) read -r oldPath arg0 args <<< "$oldInterpreterLine" if $(echo "$oldPath" | grep -q "/bin/env$"); then diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 91bf95d1ea25..fe23b04c551e 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ipafont-003.03"; src = fetchurl { - url = "http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php"; + url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5"; }; diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix index dee9caf444c5..690d0ac20069 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: stdenv.mkDerivation rec { - version = "${gnome3.version}.3"; + version = "${gnome3.version}.2"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a"; + sha256 = "0w9d0vbqhvc78vqlsyaywmrpzibr7137398azpfh416bm6vh6d3h"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ff1d388b6e23..fd80f4ec8c5f 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -294,7 +294,6 @@ stdenv.mkDerivation ({ ++ (optional stdenv.isDarwin gnused) ; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` @@ -519,6 +518,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ optionals (langAda == false) stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 13154ddd27a6..fecdd85cd415 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -293,9 +293,8 @@ stdenv.mkDerivation ({ ++ (optional stdenv.isDarwin gnused) ; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; - preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + sed -i -e "s/-lrt//g" libstdc++-v3/configure export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" @@ -518,6 +517,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ optionals (langAda == false) stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix new file mode 100644 index 000000000000..8c21fb9e2634 --- /dev/null +++ b/pkgs/development/compilers/kotlin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, jre, unzip, which }: + +stdenv.mkDerivation rec { + version = "1.0.0-beta-3594"; + name = "kotlin-${version}"; + + src = fetchurl { + url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip"; + sha256 = "a633dc27bc9bc87174835ea47d5be8ec73e0a673bb46c4b9a5a784db95f3c733"; + }; + + propagatedBuildInputs = [ jre which ] ; + buildInputs = [ makeWrapper unzip ] ; + + installPhase = '' + mkdir -p $out + rm "bin/"*.bat + mv * $out + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; + done + ''; + + meta = { + description = "General purpose programming language"; + longDescription = '' + Kotlin is a statically typed language that targets the JVM and JavaScript. + It is a general-purpose language intended for industry use. + It is developed by a team at JetBrains although it is an OSS language + and has external contributors. + ''; + homepage = http://kotlinlang.org/; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; + [ nequissimus ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index ff038024d10f..060c0f3e8676 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -14,6 +14,7 @@ , compiler-rt_src , libcxxabi , debugVersion ? false +, enableSharedLibraries ? !stdenv.isDarwin }: let @@ -46,10 +47,11 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" - ] ++ stdenv.lib.optionals (!isDarwin) [ + ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" + ++ stdenv.lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ] ++ stdenv.lib.optionals ( isDarwin) [ + ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 142167e33736..6e552959fdbf 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { { description = "Statically typed, imperative programming language"; homepage = http://nim-lang.org/; license = licenses.mit; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux ++ platforms.darwin; # arbitrary }; } diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 9b3dca42b628..d578facad698 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -37,6 +37,8 @@ let version = if isRelease then name = "rustc-${version}"; + llvmShared = llvmPackages_37.llvm.override { enableSharedLibraries = true; }; + platform = if stdenv.system == "i686-linux" then "linux-i386" else if stdenv.system == "x86_64-linux" @@ -84,6 +86,8 @@ with stdenv.lib; stdenv.mkDerivation { __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; + src = if isRelease then fetchzip { url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; @@ -119,7 +123,7 @@ with stdenv.lib; stdenv.mkDerivation { # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" - ++ optional (!forceBundledLLVM) "--llvm-root=${llvmPackages_37.llvm}"; + ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; inherit patches; @@ -155,11 +159,10 @@ with stdenv.lib; stdenv.mkDerivation { configureFlagsArray+=("--infodir=$out/share/info") ''; - # Procps is needed for one of the test cases - nativeBuildInputs = [ file python2 ] - ++ optionals stdenv.isLinux [ procps ]; + # ps is needed for one of the test cases + nativeBuildInputs = [ file python2 procps ]; buildInputs = [ ncurses ] - ++ optional (!forceBundledLLVM) llvmPackages_37.llvm; + ++ optional (!forceBundledLLVM) llvmShared; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index d95e3e0cd897..0114f014a51e 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -23,6 +23,7 @@ let sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; }; armv6l-linux = armv7l-linux; + x86_64-solaris = x86_64-linux; }; cfg = options.${stdenv.system}; in diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 4412b3d535c8..bd2289723f8d 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -168,6 +168,6 @@ go.stdenv.mkDerivation ( } // meta // { # add an extra maintainer to every package maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.emery lib.maintainers.lethalman ]; + [ lib.maintainers.ehmry lib.maintainers.lethalman ]; }; }) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f94d2397284c..7bfae6b2cda1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -926,5 +926,4 @@ self: super: { # https://github.com/mainland/language-c-quote/issues/57 language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; }; - } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7d80392944c2..d5bc64a4f6d9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -204,6 +204,7 @@ dont-distribute-packages: ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] alea: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] + al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -221,7 +222,6 @@ dont-distribute-packages: altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] ALUT: [ x86_64-darwin ] - al: [ x86_64-darwin ] amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-ec2: [ i686-linux ] amazonka-rds: [ i686-linux ] @@ -423,6 +423,7 @@ dont-distribute-packages: BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] + bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] bird: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -461,6 +462,7 @@ dont-distribute-packages: Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + BNFC: [ i686-linux, x86_64-linux, x86_64-darwin ] board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -788,6 +790,7 @@ dont-distribute-packages: ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] + cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] cuboid: [ x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -986,7 +989,7 @@ dont-distribute-packages: Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] dvda: [ i686-linux, x86_64-linux, x86_64-darwin ] dvdread: [ i686-linux, x86_64-linux, x86_64-darwin ] - dynamic-graph: [ x86_64-darwin ] + dynamic-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1025,6 +1028,7 @@ dont-distribute-packages: electrum-mnemonic: [ i686-linux ] elerea-examples: [ x86_64-darwin ] elerea-sdl: [ x86_64-darwin ] + elm-init: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ x86_64-darwin ] email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1188,6 +1192,7 @@ dont-distribute-packages: forml: [ i686-linux, x86_64-linux, x86_64-darwin ] ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] + foscam-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1197,6 +1202,7 @@ dont-distribute-packages: frame-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] freenect: [ x86_64-darwin ] @@ -1353,7 +1359,7 @@ dont-distribute-packages: gloss-sodium: [ x86_64-darwin ] gloss: [ x86_64-darwin ] GLURaw: [ x86_64-darwin ] - GLUtil: [ x86_64-darwin ] + GLUtil: [ i686-linux, x86_64-linux, x86_64-darwin ] gluturtle: [ x86_64-darwin ] GLUT: [ x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1506,6 +1512,7 @@ dont-distribute-packages: hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] + handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] hannahci: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1539,6 +1546,7 @@ dont-distribute-packages: HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] + harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace-Base: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1554,6 +1562,7 @@ dont-distribute-packages: hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] hash: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashids: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] haskakafka: [ x86_64-darwin ] @@ -2128,6 +2137,7 @@ dont-distribute-packages: InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] infix: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] + influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inilist: [ i686-linux, x86_64-linux, x86_64-darwin ] inline-c-cpp: [ x86_64-darwin ] @@ -2244,8 +2254,6 @@ dont-distribute-packages: keera-hails-reactive-polling: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactivevalues: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-hails-reactive-wx: [ x86_64-darwin ] keera-hails-reactive-yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2385,6 +2393,7 @@ dont-distribute-packages: LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + linode: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-evdev: [ x86_64-darwin ] linux-file-extents: [ x86_64-darwin ] @@ -2533,7 +2542,7 @@ dont-distribute-packages: mfsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] - Michelangelo: [ x86_64-darwin ] + Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-alsa: [ x86_64-darwin ] midimory: [ x86_64-darwin ] @@ -2772,6 +2781,7 @@ dont-distribute-packages: OpenAL: [ x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + opencog-atomspace: [ i686-linux, x86_64-linux, x86_64-darwin ] opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] openexchangerates: [ i686-linux, x86_64-linux, x86_64-darwin ] openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2806,6 +2816,7 @@ dont-distribute-packages: ot: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + packman: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] pam: [ x86_64-darwin ] @@ -3089,6 +3100,7 @@ dont-distribute-packages: recursive-line-count: [ i686-linux, x86_64-linux, x86_64-darwin ] redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] + reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ i686-linux, x86_64-linux, x86_64-darwin ] ref: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3388,6 +3400,7 @@ dont-distribute-packages: snaplet-haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-lss: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-mongodb-minimalistic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3613,6 +3626,7 @@ dont-distribute-packages: th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] + threads-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3815,7 +3829,7 @@ dont-distribute-packages: vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-gl: [ x86_64-darwin ] + vinyl-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vision: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3859,7 +3873,7 @@ dont-distribute-packages: watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] - WaveFront: [ x86_64-darwin ] + WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3904,6 +3918,7 @@ dont-distribute-packages: woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] word24: [ i686-linux, x86_64-linux, x86_64-darwin ] + WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 52d479315ebb..39ed88df521b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -2508,6 +2508,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3203,6 +3204,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7172,6 +7174,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7304,6 +7307,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8390,6 +8394,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index e5f36bb75709..ae64a29c7f8b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3202,6 +3203,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7171,6 +7173,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7303,6 +7306,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8389,6 +8393,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index e3d0cdb95727..a84c1373c7c8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3202,6 +3203,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7171,6 +7173,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7303,6 +7306,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8389,6 +8393,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 515b24f5a663..d16313afef2d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3202,6 +3203,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7171,6 +7173,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7303,6 +7306,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8389,6 +8393,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index a0d8051eb01d..5dd14262adf0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3201,6 +3202,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7167,6 +7169,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7299,6 +7302,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8384,6 +8388,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 15fb8882f0da..8decd57903f4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -2507,6 +2507,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3201,6 +3202,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7167,6 +7169,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7299,6 +7302,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8384,6 +8388,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 093c4f733ef2..3b2b2314cea3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -2504,6 +2504,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3198,6 +3199,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7161,6 +7163,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7293,6 +7296,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8378,6 +8382,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 6220b6a28d9b..642fc7fa9772 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -2504,6 +2504,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3198,6 +3199,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7161,6 +7163,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7293,6 +7296,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8378,6 +8382,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index faebc05bd3c8..8dca42ee9b53 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -2495,6 +2495,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3188,6 +3189,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7146,6 +7148,7 @@ self: super: { "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; "setenv" = doDistribute super."setenv_0_1_1_1"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7278,6 +7281,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8361,6 +8365,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index d13ec626bd40..605cb0efc2bd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -2492,6 +2492,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3184,6 +3185,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7136,6 +7138,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7268,6 +7271,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8346,6 +8350,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index b1a2cad2352f..650752ee5bab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -2486,6 +2486,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3175,6 +3176,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6394,6 +6396,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7105,6 +7108,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7236,6 +7240,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8308,6 +8313,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 5263c6d9b86b..74dbf8771c13 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -2486,6 +2486,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3174,6 +3175,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6390,6 +6392,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7101,6 +7104,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7232,6 +7236,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8304,6 +8309,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 52b2b12117d9..c11b1e51c562 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -2486,6 +2486,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3174,6 +3175,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6389,6 +6391,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7100,6 +7103,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7231,6 +7235,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8301,6 +8306,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 826a3070e604..91daa23e07f6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -2486,6 +2486,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3173,6 +3174,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6387,6 +6389,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7098,6 +7101,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7229,6 +7233,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8298,6 +8303,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 7e52c6eea83e..d18305e23779 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -2483,6 +2483,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3170,6 +3171,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6380,6 +6382,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7090,6 +7093,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7221,6 +7225,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8290,6 +8295,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 2c84f74b753c..1a030949d045 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -2479,6 +2479,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3165,6 +3166,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -6373,6 +6375,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7081,6 +7084,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7212,6 +7216,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8279,6 +8284,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 9e6d809f2b4f..499205c79627 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -2490,6 +2490,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3182,6 +3183,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7130,6 +7132,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7262,6 +7265,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8340,6 +8344,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index dba69f1dec46..e6c9400fe95f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -2489,6 +2489,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3180,6 +3181,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7125,6 +7127,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7257,6 +7260,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8334,6 +8338,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 29c37ff9e461..99b5a6662d9a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -2488,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3179,6 +3180,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7123,6 +7125,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7255,6 +7258,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8330,6 +8334,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 56bb92b1892a..dac91f75f479 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -2488,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3179,6 +3180,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7117,6 +7119,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7249,6 +7252,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8324,6 +8328,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 40ee1cf5740b..5415b132255a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -2488,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3177,6 +3178,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7112,6 +7114,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7244,6 +7247,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8318,6 +8322,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 13b6ba122111..76d5755dff0b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -2488,6 +2488,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3177,6 +3178,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -7109,6 +7111,7 @@ self: super: { "set-monad" = dontDistribute super."set-monad"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7241,6 +7244,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8315,6 +8319,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 2a3166094847..f920f0dfcc16 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -1692,6 +1692,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2460,6 +2461,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3141,6 +3143,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4895,6 +4898,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6312,6 +6316,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7018,6 +7023,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7149,6 +7155,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8208,6 +8215,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 9edb5a2c836c..a40332c27851 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -1692,6 +1692,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2459,6 +2460,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3140,6 +3142,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4893,6 +4896,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6310,6 +6314,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7016,6 +7021,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7147,6 +7153,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8205,6 +8212,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 491de8d0d0e4..998b724d6a8b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -1683,6 +1683,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2444,6 +2445,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3121,6 +3123,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4862,6 +4865,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6264,6 +6268,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6967,6 +6972,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7097,6 +7103,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8144,6 +8151,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 04508eb6adce..2f9fdcace954 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -1682,6 +1682,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2443,6 +2444,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3120,6 +3122,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4857,6 +4860,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6257,6 +6261,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6959,6 +6964,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7089,6 +7095,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8134,6 +8141,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 2a1cbd735d9f..30bda4220758 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -1682,6 +1682,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2443,6 +2444,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3120,6 +3122,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4857,6 +4860,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6257,6 +6261,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6958,6 +6963,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7088,6 +7094,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8133,6 +8140,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 0adb52db528c..c2f5925a80e5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -1682,6 +1682,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2443,6 +2444,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3120,6 +3122,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4855,6 +4858,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6254,6 +6258,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6955,6 +6960,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7085,6 +7091,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8130,6 +8137,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 9545f51a8ab7..b1a58da2e4d6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -1681,6 +1681,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2442,6 +2443,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3118,6 +3120,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4852,6 +4855,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6251,6 +6255,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6951,6 +6956,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7080,6 +7086,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8125,6 +8132,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 495f8c59c7ce..2635c5769c7b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -1681,6 +1681,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2442,6 +2443,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3117,6 +3119,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4851,6 +4854,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6247,6 +6251,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6947,6 +6952,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7076,6 +7082,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8120,6 +8127,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 69008eef6f84..ab08a75c97d1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -1680,6 +1680,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2439,6 +2440,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3111,6 +3113,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4844,6 +4847,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6239,6 +6243,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6939,6 +6944,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7068,6 +7074,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8111,6 +8118,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index f349c9623760..68e42372a93f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2436,6 +2437,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3106,6 +3108,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4837,6 +4840,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6231,6 +6235,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6930,6 +6935,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7059,6 +7065,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8102,6 +8109,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index afcbcfdba138..0f156cc4440e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2434,6 +2435,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3103,6 +3105,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4832,6 +4835,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6224,6 +6228,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6923,6 +6928,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7052,6 +7058,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8094,6 +8101,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 5742e57eeed5..a147151148c6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2434,6 +2435,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3102,6 +3104,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4831,6 +4834,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6221,6 +6225,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6920,6 +6925,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7049,6 +7055,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8089,6 +8096,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index f9f9af3edefd..20162f4a9680 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -1691,6 +1691,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2456,6 +2457,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3137,6 +3139,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4889,6 +4892,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6305,6 +6309,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7011,6 +7016,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7142,6 +7148,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8200,6 +8207,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index a0ac730e2e60..51b222c69499 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2433,6 +2434,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3100,6 +3102,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4828,6 +4831,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6217,6 +6221,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6916,6 +6921,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7044,6 +7050,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8084,6 +8091,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 455e9b3cbf8b..bb0ac6243f6a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -1678,6 +1678,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2433,6 +2434,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3100,6 +3102,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4827,6 +4830,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6214,6 +6218,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6913,6 +6918,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7041,6 +7047,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8079,6 +8086,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 5dbf1176db5d..205ce1a35840 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -1677,6 +1677,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2432,6 +2433,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3099,6 +3101,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4824,6 +4827,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6210,6 +6214,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6909,6 +6914,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7037,6 +7043,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8075,6 +8082,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 519d1221af50..46a8defbbc37 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -1691,6 +1691,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2456,6 +2457,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3136,6 +3138,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4887,6 +4890,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6303,6 +6307,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7009,6 +7014,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7139,6 +7145,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8197,6 +8204,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index a94a7d2649fc..605e7a591ab7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -1690,6 +1690,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2455,6 +2456,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3135,6 +3137,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4886,6 +4889,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6299,6 +6303,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7004,6 +7009,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7134,6 +7140,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8192,6 +8199,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 4e538d285efc..499eb7c9d36f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -1690,6 +1690,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2454,6 +2455,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3134,6 +3136,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4885,6 +4888,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6297,6 +6301,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -7002,6 +7007,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7132,6 +7138,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8189,6 +8196,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index dba6827cb908..69f0f1dd7d06 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -1687,6 +1687,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2451,6 +2452,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3131,6 +3133,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4880,6 +4883,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6291,6 +6295,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6996,6 +7001,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7126,6 +7132,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8181,6 +8188,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 476f657f88ab..c98a21f0c1be 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -1686,6 +1686,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2450,6 +2451,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3130,6 +3132,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4879,6 +4882,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6290,6 +6294,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6995,6 +7000,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7125,6 +7131,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8180,6 +8187,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index fb68e8624d93..d3d3f51d0881 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -1685,6 +1685,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2449,6 +2450,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3128,6 +3130,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4875,6 +4878,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_1"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6286,6 +6290,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6990,6 +6995,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7120,6 +7126,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8172,6 +8179,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 52601c8d85e7..7cfcc222592f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -1683,6 +1683,7 @@ self: super: { "blake2" = dontDistribute super."blake2"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; + "blank-canvas" = doDistribute super."blank-canvas_0_5"; "blas" = dontDistribute super."blas"; "blas-hs" = dontDistribute super."blas-hs"; "blaze" = dontDistribute super."blaze"; @@ -2446,6 +2447,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -3123,6 +3125,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4867,6 +4870,7 @@ self: super: { "kafka-client" = dontDistribute super."kafka-client"; "kan-extensions" = doDistribute super."kan-extensions_4_2_2"; "kangaroo" = dontDistribute super."kangaroo"; + "kansas-comet" = doDistribute super."kansas-comet_0_3_1"; "kansas-lava" = dontDistribute super."kansas-lava"; "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; @@ -6274,6 +6278,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6978,6 +6983,7 @@ self: super: { "set-extra" = dontDistribute super."set-extra"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setlocale" = dontDistribute super."setlocale"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; @@ -7108,6 +7114,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -8156,6 +8163,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 59f8cf22a0d9..6c1a2b2bb119 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -2352,6 +2352,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2991,6 +2992,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5992,6 +5994,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6675,6 +6678,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6801,6 +6805,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7802,6 +7807,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 77ffcd825bb5..b7df56e7e36e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -2350,6 +2350,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2986,6 +2987,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5983,6 +5985,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6665,6 +6668,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6791,6 +6795,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7791,6 +7796,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 5653c720f304..4e8962259424 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -2317,6 +2317,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2929,6 +2930,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5882,6 +5884,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6544,6 +6547,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6668,6 +6672,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7649,6 +7654,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 7dacd13b53e6..0c9c0cf1c096 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -2315,6 +2315,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2926,6 +2927,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5874,6 +5876,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6535,6 +6538,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6658,6 +6662,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7638,6 +7643,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 062cb92bb5b6..c0cc28940183 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -2310,6 +2310,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2921,6 +2922,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5865,6 +5867,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6526,6 +6529,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6649,6 +6653,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7625,6 +7630,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index c0a7c2cae54e..14280d9ef81f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -2310,6 +2310,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2921,6 +2922,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5861,6 +5863,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6522,6 +6525,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6645,6 +6649,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7620,6 +7625,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 70429d828ec5..e28ff3719ac4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -2305,6 +2305,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2911,6 +2912,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5846,6 +5848,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6507,6 +6510,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6630,6 +6634,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7603,6 +7608,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 37d26eb294b7..387317ea794d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -2304,6 +2304,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2910,6 +2911,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4357,6 +4359,7 @@ self: super: { "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-parser" = doDistribute super."incremental-parser_0_2_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; "indentation" = dontDistribute super."indentation"; @@ -5839,6 +5842,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6498,6 +6502,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6621,6 +6626,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6808,6 +6814,7 @@ self: super: { "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_8_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run-auto" = dontDistribute super."stack-run-auto"; @@ -7592,6 +7599,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 39be674d51a1..fff8eb6b220a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -2302,6 +2302,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2907,6 +2908,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -4353,6 +4355,7 @@ self: super: { "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; "incremental-computing" = dontDistribute super."incremental-computing"; + "incremental-parser" = doDistribute super."incremental-parser_0_2_4"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; "increments" = dontDistribute super."increments"; "indentation" = dontDistribute super."indentation"; @@ -5830,6 +5833,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6486,6 +6490,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6609,6 +6614,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -6796,6 +6802,7 @@ self: super: { "stable-marriage" = dontDistribute super."stable-marriage"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_8_0"; "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; "stack-prism" = dontDistribute super."stack-prism"; "stack-run-auto" = dontDistribute super."stack-run-auto"; @@ -7576,6 +7583,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index e999d0358914..220977e57c82 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -2347,6 +2347,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2982,6 +2983,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5974,6 +5976,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6653,6 +6656,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6778,6 +6782,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7776,6 +7781,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 0da13e057b7c..e9ccb4b7e2bd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -2343,6 +2343,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2977,6 +2978,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5966,6 +5968,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6644,6 +6647,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6769,6 +6773,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7764,6 +7769,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index dc54a3847b2d..5bb6b8988fd3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -2342,6 +2342,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2976,6 +2977,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5965,6 +5967,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6642,6 +6645,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6767,6 +6771,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7761,6 +7766,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 27acc39fd643..f757ca0e6d99 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -2339,6 +2339,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2971,6 +2972,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5950,6 +5952,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6624,6 +6627,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6749,6 +6753,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7740,6 +7745,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 76e8151ea55a..f9686a9ea1bd 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -2337,6 +2337,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2966,6 +2967,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5936,6 +5938,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6610,6 +6613,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6735,6 +6739,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7725,6 +7730,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 683b6aa1e045..75b5a3c260ef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -2331,6 +2331,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2956,6 +2957,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5918,6 +5920,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6589,6 +6592,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6714,6 +6718,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7701,6 +7706,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index ad2042e5406d..60bfa4012786 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -2325,6 +2325,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2945,6 +2946,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5905,6 +5907,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6573,6 +6576,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6698,6 +6702,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7683,6 +7688,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index dfaf44cdce43..726d3c38d96a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -2321,6 +2321,7 @@ self: super: { "dates" = dontDistribute super."dates"; "datetime" = dontDistribute super."datetime"; "datetime-sb" = dontDistribute super."datetime-sb"; + "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; @@ -2937,6 +2938,7 @@ self: super: { "forml" = dontDistribute super."forml"; "formlets" = dontDistribute super."formlets"; "formlets-hsp" = dontDistribute super."formlets-hsp"; + "formura" = dontDistribute super."formura"; "forth-hll" = dontDistribute super."forth-hll"; "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; @@ -5896,6 +5898,7 @@ self: super: { "postgresql-orm" = dontDistribute super."postgresql-orm"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-schema" = dontDistribute super."postgresql-schema"; + "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; @@ -6564,6 +6567,7 @@ self: super: { "set-cover" = dontDistribute super."set-cover"; "set-with" = dontDistribute super."set-with"; "setdown" = dontDistribute super."setdown"; + "setgame" = dontDistribute super."setgame"; "setops" = dontDistribute super."setops"; "sets" = dontDistribute super."sets"; "setters" = dontDistribute super."setters"; @@ -6689,6 +6693,7 @@ self: super: { "skeleton" = dontDistribute super."skeleton"; "skeletons" = dontDistribute super."skeletons"; "skell" = dontDistribute super."skell"; + "skemmtun" = dontDistribute super."skemmtun"; "skype4hs" = dontDistribute super."skype4hs"; "skypelogexport" = dontDistribute super."skypelogexport"; "slack" = dontDistribute super."slack"; @@ -7674,6 +7679,7 @@ self: super: { "vinyl-gl" = dontDistribute super."vinyl-gl"; "vinyl-json" = dontDistribute super."vinyl-json"; "vinyl-utils" = dontDistribute super."vinyl-utils"; + "vinyl-vectors" = dontDistribute super."vinyl-vectors"; "virthualenv" = dontDistribute super."virthualenv"; "vision" = dontDistribute super."vision"; "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1c153707c7e0..435d7b37c415 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1158,6 +1158,7 @@ self: { homepage = "http://bnfc.digitalgrammars.com/"; description = "A compiler front-end generator"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -6357,7 +6358,7 @@ self: { libraryToolDepends = [ cpphs ]; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPX" = callPackage @@ -10072,6 +10073,7 @@ self: { array base containers directory filepath FPretty libgraph mtl process RBTree regex-posix template-haskell threepenny-gui ]; + jailbreak = true; homepage = "http://maartenfaddegon.nl"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; @@ -10738,8 +10740,8 @@ self: { ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: mkDerivation { pname = "IntervalMap"; - version = "0.4.1.0"; - sha256 = "cbe486ae239e97deeccd6194be2e9933291778f6dd3a0bed7af60caa361ef44f"; + version = "0.4.1.1"; + sha256 = "eda9176e35ae9988770af216ba69d7a714f1baec7344789c03f3eaec0a4af423"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; @@ -12597,7 +12599,7 @@ self: { doHaddock = false; description = "OpenGL for dummies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MicrosoftTranslator" = callPackage @@ -18956,7 +18958,7 @@ self: { ]; description = "Parsers and utilities for the OBJ WaveFront 3D model format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Weather" = callPackage @@ -19311,6 +19313,7 @@ self: { homepage = "https://github.com/choener/WordAlignment"; description = "Bigram word pair alignments"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WordNet" = callPackage @@ -22698,7 +22701,7 @@ self: { homepage = "http://github.com/phaazon/al"; description = "OpenAL 1.1 raw API."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openal;}; "alarmclock_0_2_0_5" = callPackage @@ -35241,6 +35244,7 @@ self: { ]; description = "A collection of bioinformatics tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "biophd" = callPackage @@ -36018,7 +36022,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blank-canvas" = callPackage + "blank-canvas_0_5" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, colour , containers, data-default-class, http-types, kansas-comet, scotty , stm, text, transformers, vector, wai, wai-extra, warp @@ -36041,6 +36045,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blank-canvas" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, colour, containers, data-default-class, directory + , http-types, kansas-comet, mime-types, process, scotty, shake, stm + , text, text-show, time, transformers, unix, vector, wai, wai-extra + , warp + }: + mkDerivation { + pname = "blank-canvas"; + version = "0.6"; + sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring colour + containers data-default-class http-types kansas-comet mime-types + scotty stm text text-show transformers vector wai wai-extra warp + ]; + testHaskellDepends = [ + base containers directory process shake stm text time unix vector + ]; + homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; + description = "HTML5 Canvas Graphics Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blas" = callPackage ({ mkDerivation, base, ieee, QuickCheck, storable-complex }: mkDerivation { @@ -52904,6 +52933,7 @@ self: { homepage = "https://github.com/simhu/cubical"; description = "Implementation of Univalence in Cubical Sets"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubicbezier" = callPackage @@ -55233,6 +55263,21 @@ self: { license = "GPL"; }) {}; + "dawdle" = callPackage + ({ mkDerivation, base, filepath, parsec, pretty, text, time }: + mkDerivation { + pname = "dawdle"; + version = "0.1.0.1"; + sha256 = "d6738e621934621cd2a84c108cfa8d940b4c8f6c1e66b15aceb61a711cf9d5e7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec pretty text time ]; + executableHaskellDepends = [ base filepath parsec pretty text ]; + homepage = "https://github.com/arnons1/dawdle"; + description = "Generates DDL suggestions based on a CSV file"; + license = stdenv.lib.licenses.mit; + }) {}; + "dawg" = callPackage ({ mkDerivation, base, binary, containers, mtl, transformers , vector, vector-binary @@ -62059,6 +62104,7 @@ self: { testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text ]; + jailbreak = true; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -62641,7 +62687,7 @@ self: { homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-linker-template" = callPackage @@ -64305,6 +64351,7 @@ self: { jailbreak = true; description = "Set up basic structure for an elm project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-make" = callPackage @@ -71242,8 +71289,8 @@ self: { }: mkDerivation { pname = "fn"; - version = "0.2.0.0"; - sha256 = "56ce8492016a576e3cb15283984756a00c1a4c3784ee9861fd75f3ddfe290841"; + version = "0.2.0.1"; + sha256 = "8f39132f14a82c280f74b799f39367d9fc7566c9827bb1d4cc10e837ce37e95c"; libraryHaskellDepends = [ base blaze-builder bytestring directory filepath http-types text unordered-containers wai wai-extra @@ -71252,7 +71299,7 @@ self: { base directory filepath hspec http-types text unordered-containers wai wai-extra ]; - homepage = "http://github.cxom/dbp/fn#readme"; + homepage = "http://github.com/dbp/fn#readme"; description = "A functional web framework"; license = stdenv.lib.licenses.isc; }) {}; @@ -72109,6 +72156,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "formura" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, either, lattices + , lens, mmorph, mtl, parsers, QuickCheck, text, trifecta, vector + }: + mkDerivation { + pname = "formura"; + version = "1.0"; + sha256 = "85f87237328c583f9178a37223def73ac394be919cbb91896c54340a69cadc8c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base containers either lattices lens mmorph mtl + parsers QuickCheck text trifecta vector + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers lens text trifecta + ]; + homepage = "http://nushio3.github.io"; + description = "Formura is a simple language to describe stencil computation"; + license = stdenv.lib.licenses.mit; + }) {}; + "forth-hll" = callPackage ({ mkDerivation, array-forth, base, free, mtl }: mkDerivation { @@ -72187,6 +72256,7 @@ self: { homepage = "https://github.com/tonymorris/foscam-sort"; description = "Foscam File format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fountain" = callPackage @@ -72579,6 +72649,7 @@ self: { homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Provides free functors that are adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-game" = callPackage @@ -85400,6 +85471,7 @@ self: { homepage = "https://github.com/utdemir/handsy"; description = "A DSL to describe common shell operations and interpeters for running them locally and remotely"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hangman" = callPackage @@ -86476,6 +86548,7 @@ self: { ]; description = "A web service specification compiler that generates implementation and tests"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haroonga" = callPackage @@ -86920,6 +86993,7 @@ self: { homepage = "http://hashids.org/"; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashmap" = callPackage @@ -87547,15 +87621,15 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, directory + ({ mkDerivation, base, bytestring, containers, directory , file-embed, filepath, free, glib, gobjectIntrospection , haskell-gi-base, mtl, pretty-show, process, safe, text , transformers, xdg-basedir, xml-conduit }: mkDerivation { pname = "haskell-gi"; - version = "0.10.1"; - sha256 = "dc62929c8018eed13acb99be501298b172345bd4f7d93024cbc59c4fc84fa86a"; + version = "0.10.2"; + sha256 = "d6e6808615a03b69b0653f10f6634315ccc8e3e57b108175a043b708e3608163"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87564,7 +87638,6 @@ self: { xdg-basedir xml-conduit ]; executablePkgconfigDepends = [ glib gobjectIntrospection ]; - executableToolDepends = [ c2hs ]; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; @@ -87577,8 +87650,8 @@ self: { }: mkDerivation { pname = "haskell-gi-base"; - version = "0.10"; - sha256 = "54631b2ae430ded0eee1542fc73f3468b228058e35fbc3432db54a9f9a4c88ad"; + version = "0.10.1"; + sha256 = "04457204453324cb8cea89d86159153bc9c141d8371212c49fa379aa06f7cde0"; libraryHaskellDepends = [ base bytestring containers text transformers ]; @@ -88106,23 +88179,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-exts_1_17_0" = callPackage + "haskell-src-exts_1_17_1" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , syb, tasty, tasty-golden, tasty-smallcheck }: mkDerivation { pname = "haskell-src-exts"; - version = "1.17.0"; - sha256 = "398f668f690a7a766c7338b82d241581ff6dfbd9aa166712911535ebd3f03122"; - revision = "1"; - editedCabalFile = "ca48ccd93dd2abf02c84a35eefb88402442c45eaa45524dce1f7396ec334e31c"; + version = "1.17.1"; + sha256 = "ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd"; libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; libraryToolDepends = [ happy ]; testHaskellDepends = [ base containers directory filepath mtl pretty-show smallcheck syb tasty tasty-golden tasty-smallcheck ]; + jailbreak = true; homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; @@ -109339,7 +109411,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "incremental-parser" = callPackage + "incremental-parser_0_2_4" = callPackage ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck , tasty, tasty-quickcheck }: @@ -109354,9 +109426,10 @@ self: { homepage = "http://patch-tag.com/r/blamario/incremental-parser/wiki/"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "incremental-parser_0_2_4_1" = callPackage + "incremental-parser" = callPackage ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck , tasty, tasty-quickcheck }: @@ -109371,7 +109444,6 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -109725,6 +109797,7 @@ self: { homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -110688,7 +110761,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time transformers vector zlib zlib-bindings ]; - doCheck = false; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -114112,7 +114184,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "kansas-comet" = callPackage + "kansas-comet_0_3_1" = callPackage ({ mkDerivation, aeson, base, containers, data-default, scotty, stm , text, time, transformers, unordered-containers }: @@ -114131,6 +114203,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kansas-comet" = callPackage + ({ mkDerivation, aeson, base, containers, data-default-class + , scotty, stm, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "kansas-comet"; + version = "0.4"; + sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1"; + libraryHaskellDepends = [ + aeson base containers data-default-class scotty stm text time + transformers unordered-containers + ]; + homepage = "https://github.com/ku-fpg/kansas-comet/"; + description = "A JavaScript push mechanism based on the comet idiom"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kansas-lava" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers , data-default, data-reify, directory, dotgen, filepath, netlist @@ -114582,7 +114672,7 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Rails - Reactive Fields for WX widgets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-reactive-yampa" = callPackage @@ -119401,8 +119491,8 @@ self: { }: mkDerivation { pname = "libgraph"; - version = "1.7"; - sha256 = "5dfcfcba1005a4ac411192f2a8138100534ec7c2e576f46e4acb6367e89dbc33"; + version = "1.8"; + sha256 = "34377397255a7fd2b1e77ee25d9e865e1bb7e8ce394519458f2d819727d59878"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -120772,6 +120862,7 @@ self: { homepage = "http://github.com/Helkafen/haskell-linode#readme"; description = "Bindings to the Linode API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linux-blkid" = callPackage @@ -137356,6 +137447,7 @@ self: { base bytestring lens mtl opaleye postgresql-simple product-profunctors transformers ]; + jailbreak = true; homepage = "https://github.com/benkolera/opaleye-classy/tree/master"; description = "Opaleye wrapped up in classy MTL attire"; license = stdenv.lib.licenses.mit; @@ -137404,6 +137496,7 @@ self: { executableHaskellDepends = [ base opaleye postgresql-simple product-profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "A monad transformer for Opaleye"; license = stdenv.lib.licenses.bsd3; @@ -137529,6 +137622,7 @@ self: { homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell"; description = "Haskell Bindings for the AtomSpace"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {atomspace-cwrapper = null;}; "opencv-raw" = callPackage @@ -138958,6 +139052,7 @@ self: { ]; description = "Serialization library for GHC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "packunused" = callPackage @@ -143057,6 +143152,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143079,6 +143175,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143101,6 +143198,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143123,6 +143221,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143145,6 +143244,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143167,6 +143267,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143189,6 +143290,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143211,6 +143313,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143233,6 +143336,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143255,6 +143359,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143277,6 +143382,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -143299,6 +143405,7 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resourcet text time transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; @@ -147625,7 +147732,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "postgresql-simple" = callPackage + "postgresql-simple_0_4_10_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , blaze-builder, blaze-textual, bytestring, case-insensitive , containers, cryptohash, hashable, HUnit, postgresql-libpq @@ -147648,9 +147755,10 @@ self: { doCheck = false; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "postgresql-simple_0_5_1_1" = callPackage + "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers , cryptohash, hashable, HUnit, postgresql-libpq, scientific @@ -147669,9 +147777,9 @@ self: { aeson base base16-bytestring bytestring containers cryptohash HUnit text time vector ]; + doCheck = false; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-migration" = callPackage @@ -148313,8 +148421,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "prelude-edsl"; - version = "0.1.2"; - sha256 = "97e884220ca2c37e913b8b73f148f0cb3e822a3b6cf89d88e25b7d4d9e1cd934"; + version = "0.3"; + sha256 = "8250585549ad9c64c2b0407157cacb8a4a2dd0dcf77c8de4b005adddf2b98008"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/emilaxelsson/prelude-edsl"; description = "An EDSL-motivated subset of the Prelude"; @@ -154151,6 +154259,7 @@ self: { homepage = "http://github.com/NicolasT/reedsolomon"; description = "Reed-Solomon Erasure Coding in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {reedsolomon = null;}; "reenact" = callPackage @@ -164585,6 +164694,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "setgame" = callPackage + ({ mkDerivation, base, random, vty }: + mkDerivation { + pname = "setgame"; + version = "1.1"; + sha256 = "34b0c18e84023bc1785a18386663be136ac3d02f901cf8106942d4d3c89a22c3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random vty ]; + executableHaskellDepends = [ base ]; + description = "A console interface to the game of Set"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "setlocale" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -167776,6 +167899,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skemmtun" = callPackage + ({ mkDerivation, base, bytestring, data-default, http-client + , http-types, lens, text, time, wreq, xml-conduit + }: + mkDerivation { + pname = "skemmtun"; + version = "0.1.0.0"; + sha256 = "9602063e569741878f18dc1820a7281a3387ff6fdfdc394e32511f2abaab6c11"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring data-default http-client http-types lens text time + wreq xml-conduit + ]; + homepage = "https://github.com/nyorem/skemmtun"; + description = "A MyAnimeList.net client."; + license = stdenv.lib.licenses.mit; + }) {}; + "skype4hs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, lifted-base , monad-control, mtl, stm, text, time, transformers-base, word8 @@ -169632,6 +169774,7 @@ self: { homepage = "https://github.com/ixmatus/snaplet-influxdb"; description = "Snap framework snaplet for the InfluxDB library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-lss" = callPackage @@ -172583,7 +172726,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "stack" = callPackage + "stack_0_1_8_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base , base16-bytestring, base64-bytestring, bifunctors, binary , binary-tagged, blaze-builder, byteable, bytestring, Cabal @@ -172648,6 +172791,74 @@ self: { homepage = "https://github.com/commercialhaskell/stack"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {}; + + "stack" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-tagged, blaze-builder, byteable, bytestring, Cabal + , conduit, conduit-combinators, conduit-extra, containers + , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance + , either, email-validate, enclosed-exceptions, exceptions, extra + , fast-logger, file-embed, filelock, filepath, fsnotify, gitrev + , hashable, hastache, hpc, hspec, http-client, http-client-tls + , http-conduit, http-types, lifted-base, monad-control + , monad-logger, monad-loops, mtl, old-locale, optparse-applicative + , optparse-simple, path, persistent, persistent-sqlite + , persistent-template, pretty, process, project-template + , QuickCheck, resourcet, retry, safe, semigroups, split, stm + , streaming-commons, tar, template-haskell, temporary, text, time + , transformers, transformers-base, unix, unix-compat + , unordered-containers, uuid, vector, vector-binary-instances, void + , word8, yaml, zlib + }: + mkDerivation { + pname = "stack"; + version = "0.1.10.0"; + sha256 = "9b730c2b4b7bb87fc70ccbf0bab0e2fe6f0775644b36972b4dea9088cbcab979"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-tagged blaze-builder + byteable bytestring Cabal conduit conduit-combinators conduit-extra + containers cryptohash cryptohash-conduit deepseq directory + edit-distance either email-validate enclosed-exceptions exceptions + extra fast-logger file-embed filelock filepath fsnotify hashable + hastache hpc http-client http-client-tls http-conduit http-types + lifted-base monad-control monad-logger monad-loops mtl old-locale + optparse-applicative path persistent persistent-sqlite + persistent-template pretty process project-template resourcet retry + safe semigroups split stm streaming-commons tar template-haskell + temporary text time transformers transformers-base unix unix-compat + unordered-containers uuid vector vector-binary-instances void word8 + yaml zlib + ]; + executableHaskellDepends = [ + base bytestring Cabal conduit containers directory either + exceptions filelock filepath gitrev hashable http-client + http-conduit lifted-base monad-control monad-logger mtl old-locale + optparse-applicative optparse-simple path process resourcet split + text transformers unordered-containers + ]; + testHaskellDepends = [ + async base bytestring Cabal conduit conduit-extra containers + cryptohash directory exceptions filepath hspec http-conduit + monad-logger optparse-applicative path process QuickCheck resourcet + retry temporary text transformers unix-compat + ]; + doCheck = false; + enableSharedExecutables = false; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + homepage = "http://haskellstack.org"; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -182752,6 +182963,7 @@ self: { ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threadscope" = callPackage @@ -187388,8 +187600,8 @@ self: { }: mkDerivation { pname = "typography-geometry"; - version = "1.0.0"; - sha256 = "0ec6c98ddd23dec27f6511b917b896f4b7ef3102629d1ceb92d5f376076478ef"; + version = "1.0.0.1"; + sha256 = "edaeafb60126be19f0e4fdda54be89b92317dd03b59e9d8b6f119064c1642ad7"; libraryHaskellDepends = [ base containers parallel polynomials-bernstein vector ]; @@ -191901,7 +192113,7 @@ self: { ]; description = "Utilities for working with OpenGL's GLSL shading language and vinyl records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-json" = callPackage @@ -191934,6 +192146,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vinyl-vectors" = callPackage + ({ mkDerivation, base, constraints, primitive, text, vector, vinyl + }: + mkDerivation { + pname = "vinyl-vectors"; + version = "0.1.0.3"; + sha256 = "e439e9b8045d71c898a7aad388322594cc52399b60588bfcec1116b2cb179afe"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base constraints primitive text vector vinyl + ]; + homepage = "http://github.com/andrewthad/vinyl-vectors"; + description = "Vectors for vinyl vectors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "virthualenv" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, file-embed , filepath, mtl, process, safe, split @@ -194153,6 +194382,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.0"; sha256 = "a37aaf452e3816928934d39b4eef3c1f7186c9db618d0b303e5136fc858e5e58"; + revision = "1"; + editedCabalFile = "b365b6463ecd16b5e9782776e365b1441109a2909ff42873b7fd5862b1397eb7"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash directory expiring-cache-map filepath http-types mime-types mtl old-locale @@ -203088,6 +203319,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-auth-oauth2_0_1_5" = callPackage + ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 + , http-client, http-conduit, http-types, lifted-base, network-uri + , random, text, transformers, vector, yesod-auth, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.1.5"; + sha256 = "7678dcd4ed18ffb502601cdc069674260ae10019f9619c69a1a7f90aadc88768"; + libraryHaskellDepends = [ + aeson authenticate base bytestring hoauth2 http-client http-conduit + http-types lifted-base network-uri random text transformers vector + yesod-auth yesod-core yesod-form + ]; + homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; + description = "OAuth 2.0 authentication plugins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-pam" = callPackage ({ mkDerivation, base, hamlet, pam, text, yesod-auth, yesod-core , yesod-form @@ -204955,8 +205207,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.16"; - sha256 = "26bab99551e7f6318f367947606129a9360f3a00e04c3ed5d783de9878ebd268"; + version = "1.4.17"; + sha256 = "954f0851ec388ef9b9009e087d7b8c214481f7e5bd4c3dff2828030780d0eadf"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index 141484814ea3..05d64e9c511e 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -44,12 +44,14 @@ stdenv.mkDerivation rec { # while at the same time erasing the PATH environment variable so it unconditionally # fails. The code in question is guarded by a check for Mac OS, but the patch below # doesn't have any runtime effect on other platforms. - postPatch = stdenv.lib.optional (stdenv.isDarwin && !stdenv.cc.nativeLibc) '' + postPatch = stdenv.lib.optional stdenv.isDarwin '' pwd="$(type -P pwd)" substituteInPlace dist/PathTools/Cwd.pm \ - --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'" + --replace "/bin/pwd" "$pwd" ''; + sandboxProfile = stdenv.lib.sandbox.allow "ipc-sysv-sem"; + # Build a thread-safe Perl with a dynamic libperls.o. We need the # "installstyle" option to ensure that modules are put under # $out/lib/perl5 - this is the general default, but because $out @@ -64,6 +66,7 @@ stdenv.mkDerivation rec { "-Dlocincpth=${libc}/include" "-Dloclibpth=${libc}/lib" ] + ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; configureScript = "${stdenv.shell} ./Configure"; diff --git a/pkgs/development/interpreters/perl/5.20/ld-shared.patch b/pkgs/development/interpreters/perl/5.20/ld-shared.patch index be45230c8a73..9f92368df687 100644 --- a/pkgs/development/interpreters/perl/5.20/ld-shared.patch +++ b/pkgs/development/interpreters/perl/5.20/ld-shared.patch @@ -1,11 +1,24 @@ ---- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 -+++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 -@@ -568,7 +568,7 @@ - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - # fi - ldflags="$ldflags -m64" -- lddlflags="$lddlflags -G -m64" -+ lddlflags="$lddlflags -shared -m64" +$NetBSD: patch-hints_solaris__2.sh,v 1.2 2015/10/27 09:10:44 jperkin Exp $ + +Redo PR pkg/44999. + +--- perl-5.20.2/hints/solaris_2.sh.orig 2015-05-13 20:19:29.000000000 +0000 ++++ perl-5.20.2/hints/solaris_2.sh +@@ -585,7 +585,7 @@ EOM + fi + fi + case "${cc:-cc} -v 2>/dev/null" in +- *gcc*) ++ *gcc*|clang*) + echo 'int main() { return 0; }' > try.c + case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in + *"m64 is not supported"*) +@@ -622,7 +622,7 @@ EOM + # use that with Solaris 11 and later, but keep + # the old behavior for older Solaris versions. + case "$osvers" in +- 2.?|2.10) lddlflags="$lddlflags -G -m64" ;; ++ 2.?|2.10) lddlflags="$lddlflags -shared -m64" ;; + *) lddlflags="$lddlflags -shared -m64" ;; + esac ;; - *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix index 4b0f4364ea22..53e777c19a11 100644 --- a/pkgs/development/interpreters/perl/5.22/default.nix +++ b/pkgs/development/interpreters/perl/5.22/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { "-Dlocincpth=${libc}/include" "-Dloclibpth=${libc}/lib" ] + ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; configureScript = "${stdenv.shell} ./Configure"; diff --git a/pkgs/development/interpreters/perl/5.22/ld-shared.patch b/pkgs/development/interpreters/perl/5.22/ld-shared.patch index be45230c8a73..140af9af40ed 100644 --- a/pkgs/development/interpreters/perl/5.22/ld-shared.patch +++ b/pkgs/development/interpreters/perl/5.22/ld-shared.patch @@ -1,11 +1,24 @@ ---- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 -+++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 -@@ -568,7 +568,7 @@ - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - # fi - ldflags="$ldflags -m64" -- lddlflags="$lddlflags -G -m64" -+ lddlflags="$lddlflags -shared -m64" +$NetBSD: patch-hints_solaris__2.sh,v 1.2 2015/10/27 09:10:44 jperkin Exp $ + +Redo PR pkg/44999. + +--- perl-5.22.0/hints/solaris_2.sh.orig 2015-05-13 20:19:29.000000000 +0000 ++++ perl-5.22.0/hints/solaris_2.sh +@@ -585,7 +585,7 @@ EOM + fi + fi + case "${cc:-cc} -v 2>/dev/null" in +- *gcc*) ++ *gcc*|clang*) + echo 'int main() { return 0; }' > try.c + case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in + *"m64 is not supported"*) +@@ -622,7 +622,7 @@ EOM + # use that with Solaris 11 and later, but keep + # the old behavior for older Solaris versions. + case "$osvers" in +- 2.?|2.10) lddlflags="$lddlflags -G -m64" ;; ++ 2.?|2.10) lddlflags="$lddlflags -shared -m64" ;; + *) lddlflags="$lddlflags -shared -m64" ;; + esac ;; - *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index e08fde3c8bfc..f624bd5d85e2 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -97,7 +97,9 @@ let ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ) ++ optional zlibSupport zlib - ++ optionals stdenv.isDarwin [ CF configd ]; + ++ optional stdenv.isDarwin CF; + + propagatedBuildInputs = optional stdenv.isDarwin configd; # Build the basic Python interpreter without modules that have # external dependencies. @@ -105,8 +107,8 @@ let name = "python-${version}"; pythonVersion = majorVersion; - inherit majorVersion version src patches buildInputs preConfigure - configureFlags; + inherit majorVersion version src patches buildInputs propagatedBuildInputs + preConfigure configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 70447d9f8853..cfe86ce4e70e 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { description = "A library to import various 3D model formats"; homepage = http://assimp.sourceforge.net/; license = licenses.bsd3; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platfroms = platforms.linux; inherit version; }; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 5bf1ec78bef2..c06b9355d309 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4a0f98d262a0..97eecf78a1a1 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -93,7 +93,7 @@ let preBuild = makeInternalLib; buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs ]; NIX_CFLAGS_LINK = - stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed " + stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.isSunOS) "-Wl,--as-needed " + "-ldbus-1"; # don't provide another dbus-1.pc (with incorrect include and link dirs), diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index bafe8949e93c..e53775464e03 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { configureFlags = optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional stdenv.isSunOS "--disable-modular-tests"; + ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"]; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" + optionalString stdenv.isSunOS " -DBSD_COMP"; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 174f12fc68ca..248c4fa385e1 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -10,7 +10,7 @@ assert cupsSupport -> cups != null; let ver_maj = "3.18"; - ver_min = "4"; + ver_min = "5"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "5400dcf280d28d24606f33d59ed48c717f7d3db425d4b6fb52e8002f0c76c7eb"; + sha256 = "107aeb9a4244ce3c044becdd6dffc32d83202595181597180d4c736302a71852"; }; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index b060498d40a2..c6ead6739824 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova -, libjpeg, gsl }: +, curl, libjpeg, gsl }: stdenv.mkDerivation { - name = "indilib-1.0.0"; + name = "indilib-1.1.0"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_1.0.0.tar.gz; - sha256 = "0f66jykpjk8mv50lc3rywbqj9mqr4p2n1igfb1222h5fs83c1jhm"; + url = mirror://sourceforge/indi/libindi_1.1.0.tar.gz; + sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; }; patches = [ ./udev-dir.patch ] ; - propagatedBuildInputs = [ cmake cfitsio libusb zlib boost + buildInputs = [ curl cmake cfitsio libusb zlib boost libnova libjpeg gsl ]; meta = { - homepage = http://indi.sf.net; + homepage = http://www.indilib.org/; + license = stdenv.lib.licenses.lgpl2Plus; + description = "Implementaion of the INDI protocol for POSIX operating systems"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 884924f643db..a9c83594179f 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.3.0"; + name = "libassuan-2.4.2"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0lh4698pgb2wjrrrbdk14llizad5l74f8pdbg4ma4zq4fbsrkjc7"; + sha256 = "086bbcdnvs48qq5g4iac7dpk76j0q3jrp16mchdvyx0b720xq1mv"; }; buildInputs = [ libgpgerror pth ]; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 8c5c8bef3513..09427e2788ac 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 4a34ac6bdec7..048902f4fc49 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ glibc ]; }; + buildInputs = [ gettext ]; + meta = { description = "ELF object file access library"; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 284a09bc9275..bddda9f3eadd 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, python, findutils }: +{ stdenv, fetchurl, autoreconfHook, openssl, python, findutils }: let version = "2.0.22"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; + buildInputs = [ openssl python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; patchPhase = '' patchShebangs event_rpcgen.py diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix index f909d6d8ff2f..4765f0b7d9af 100644 --- a/pkgs/development/libraries/libevhtp/default.nix +++ b/pkgs/development/libraries/libevhtp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libevhtp-${version}"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "ellzey"; repo = "libevhtp"; rev = version; - sha256 = "0z5cxa65zp89vkaj286gp6fpmc5fylr8bmd17g3j1rgc42nysm6a"; + sha256 = "1rlxdp8w4alcy5ryr7pmw5wi6hv7d64885wwbk1zxhvi64s4x4rg"; }; buildInputs = [ cmake openssl libevent ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index ed97952940a9..430743af96ad 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.0.2"; + name = "libinput-1.1.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1fggbi8w8r7mayyk7zwqrqf3ni95y2703vcpggxqq7yjdgw0bld3"; + sha256 = "05yxz3cds65zmzj98yhsrwvnkv8c7n3zs2fksjzs2fy7vlrv9qid"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 4e0178404720..407e218065bb 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xiph.org/ogg/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 53777a0c56f0..a2454aa02f04 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.18"; - sha256 = "0qq96rf31483kxz32h6l6921hy6p2v2pfqfvc74km229g4xw241f"; + version = "1.6.19"; + sha256 = "1s1mmkl79ghiczi2x2rbnp6y70v4c5pr8g3icxn9h5imymbmc71i"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "0g2ljh2vhclas1hacys1c4gk6l6hyy6sngb2yvdsnjz50nyq16kv"; + sha256 = "0bgqkac16yhl0zwjzq2zwkixg2l2x3a6blbk3k0wqz0lza2a6jrh"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index d58607ea2988..68f1fe720856 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://xiph.org/vorbis/; license = licenses.bsd3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index e1809d544d1f..581f956b0afd 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; configureFlags = + stdenv.lib.optional stdenv.isSunOS "--disable-thread-safe" ++ stdenv.lib.optional stdenv.is64bit "--with-pic"; doCheck = true; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index c505d89a6d8f..8817e2c5523b 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -27,12 +27,21 @@ stdenv.mkDerivation rec { "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec"; + # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: + CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; preConfigure = '' configureFlagsArray+=("--includedir=$out/include") export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" + '' + + lib.optionalString stdenv.isSunOS '' + sed -i -e '/-D__EXTENSIONS__/ s/-D_XOPEN_SOURCE=\$cf_XOPEN_SOURCE//' \ + -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \ + configure + CFLAGS=-D_XOPEN_SOURCE_EXTENDED '' + lib.optionalString stdenv.isCygwin '' sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure ''; diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix index 9175da0bca4b..0c9c62dfb92b 100644 --- a/pkgs/development/libraries/openssl/1.0.2.x.nix +++ b/pkgs/development/libraries/openssl/1.0.2.x.nix @@ -8,14 +8,14 @@ let stdenv.cross; in stdenv.mkDerivation rec { - name = "openssl-1.0.2d"; + name = "openssl-1.0.2e"; src = fetchurl { urls = [ "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "d01d17b44663e8ffa6a33a5a30053779d9593c3d"; + sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; }; patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5ed30731a684..21e7706be8cb 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -8,14 +8,14 @@ let stdenv.cross; in stdenv.mkDerivation rec { - name = "openssl-1.0.1p"; + name = "openssl-1.0.1q"; src = fetchurl { urls = [ "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "9d1977cc89242cd11471269ece2ed4650947c046"; + sha256 = "1dvz0hx7fjxag06b51pawy154y6d2xajm5rwxmfnlq7ax628nrdk"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 78669dfdce7a..82bbab5ff87e 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -20,12 +20,14 @@ stdenv.mkDerivation { buildInputs = [ perl python flex bison ] ++ stdenv.lib.optional (qt4 != null) qt4 + ++ stdenv.lib.optional stdenv.isSunOS libiconv ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; prefixKey = "--prefix "; configureFlags = [ "--dot dot" ] + ++ stdenv.lib.optional stdenv.isSunOS "--install install" ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard"; preConfigure = diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 4386e7eaf741..8f687908017f 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.47.2"; + name = "help2man-1.47.3"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0z1zgw6k1fba59fii6ksfi1g2gci6i4ysa3kdfh3j475fdkn1if4"; + sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 6eea0a6d5d6b..c82a626336f6 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -10,9 +10,10 @@ stdenv.mkDerivation (rec { sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68"; }; - buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin) libiconv; + buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; - configureFlags = [ "--with-internal-glib" ]; + configureFlags = [ "--with-internal-glib" ] + ++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; patches = (if vanilla then [] else [ # Process Requires.private properly, see diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix index 5099676f32ba..11e822291e8d 100644 --- a/pkgs/development/tools/misc/texinfo/6.0.nix +++ b/pkgs/development/tools/misc/texinfo/6.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }: +{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, interactive ? false }: stdenv.mkDerivation rec { name = "texinfo-6.0"; @@ -9,14 +9,17 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl xz ] + ++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ] ++ stdenv.lib.optional interactive ncurses; + configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk"; + preInstall = '' installFlags="TEXMF=$out/texmf-dist"; installTargets="install install-tex"; ''; - doCheck = !stdenv.isDarwin && !interactive; + doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/; meta = { homepage = "http://www.gnu.org/software/texinfo/"; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index b38751ba99e4..ee0074140178 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { name = "bison-3.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e"; }; - nativeBuildInputs = [ m4 perl ]; + nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; meta = { diff --git a/pkgs/development/tools/parsing/flex/2.5.39.nix b/pkgs/development/tools/parsing/flex/default.nix similarity index 75% rename from pkgs/development/tools/parsing/flex/2.5.39.nix rename to pkgs/development/tools/parsing/flex/default.nix index 93d54803e7c7..57ce29f51753 100644 --- a/pkgs/development/tools/parsing/flex/2.5.39.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, m4 }: -stdenv.mkDerivation { - name = "flex-2.5.39"; +stdenv.mkDerivation rec { + name = "flex-2.6.0"; src = fetchurl { - url = mirror://sourceforge/flex/flex-2.5.39.tar.bz2; - sha256 = "0zv15giw3gma03y2bzw78hjfy49vyir7vbcgnh9bb3637dgvblmd"; + url = "mirror://sourceforge/flex/${name}.tar.bz2"; + sha256 = "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4"; }; buildInputs = [ bison ]; diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 83560c21f5df..80cc77632665 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { { description = "World class backgammon application"; homepage = http://www.gnubg.org/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 8b9c412eaac8..97b6be9be2ec 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0a4zh66vvkipdrm45gql4mlqpf26mn4m6pl86f02cd1fap58xrk0"; + sha256 = "0qxss5rxzac94z5k16xv84ll0n163sphs88xkgv3z7vwramagffq"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 24083060e546..c18d3f6cc6d3 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -95,8 +95,10 @@ let propagatedBuildInputs = deps; - # Not going to bother being more precise than this... - __propagatedImpureHostDeps = (import ./impure-deps.nix).${name}; + # allows building the symlink tree + __impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ]; + + __propagatedImpureHostDeps = stdenv.lib.optional (name != "Kernel") "/System/Library/Frameworks/${name}.framework/${name}"; meta = with stdenv.lib; { description = "Apple SDK framework ${name}"; @@ -159,6 +161,12 @@ in rec { ''; }); + CoreServices = stdenv.lib.overrideDerivation super.CoreServices (drv: { + __propagatedSandboxProfile = drv.__propagatedSandboxProfile ++ ['' + (allow mach-lookup (global-name "com.apple.CoreServices.coreservicesd")) + '']; + }); + Security = stdenv.lib.overrideDerivation super.Security (drv: { setupHook = ./security-setup-hook.sh; }); diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix index 55c8279340b7..3993a360156a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix @@ -8,13 +8,7 @@ appleDerivation { patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ]; - __propagatedImpureHostDeps = [ - "/System/Library/Frameworks/CoreFoundation.framework" - "/usr/lib/libc++.1.dylib" - "/usr/lib/libc++abi.dylib" - "/usr/lib/libicucore.A.dylib" - "/usr/lib/libz.1.dylib" - ]; + __propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ]; preBuild = '' substituteInPlace Makefile \ @@ -52,5 +46,7 @@ appleDerivation { postInstall = '' mv $out/System/* $out rmdir $out/System + mv $out/Library/Frameworks/CoreFoundation.framework/Versions/A/PrivateHeaders/* \ + $out/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix index 9f6031771c2d..203ca010d62a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CoreOSMakefiles/default.nix @@ -1,7 +1,7 @@ { stdenv, appleDerivation, unifdef }: appleDerivation { - buildinputs = [ unifdef ]; + buildInputs = [ unifdef ]; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 4bc3a7a7fa42..a0261875c102 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,32 +1,87 @@ -{ stdenv, appleDerivation, version }: +{ stdenv, appleDerivation, fetchzip, version, bsdmake, perl, flex, yacc, writeScriptBin +}: + +# this derivation sucks +# locale data was removed after adv_cmds-118, so our base is that because it's easier than +# replicating the bizarre bsdmake file structure +# +# sadly adv_cmds-118 builds a mklocale and colldef that generate files that our libc can no +# longer understand +# +# the more recent adv_cmds release is used for everything else in this package + +let recentAdvCmds = fetchzip { + url = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz"; + sha256 = "0z081kcprzg5jcvqivfnwvvv6wfxzkjg2jc2lagsf8c7j7vgm8nn"; +}; + +in appleDerivation { + buildInputs = [ bsdmake perl yacc flex ]; + + patchPhase = '' + substituteInPlace BSDMakefile \ + --replace chgrp true \ + --replace /Developer/Makefiles/bin/compress-man-pages.pl true \ + --replace "ps.tproj" "" --replace "gencat.tproj" "" --replace "md.tproj" "" \ + --replace "tabs.tproj" "" --replace "cap_mkdb.tproj" "" \ + --replace "!= tconf --test TARGET_OS_EMBEDDED" "= NO" + + substituteInPlace Makefile --replace perl true + + for subproject in colldef mklocale monetdef msgdef numericdef timedef; do + substituteInPlace usr-share-locale.tproj/$subproject/BSDmakefile \ + --replace /usr/share/locale "" \ + --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \ + --replace "rsync -a" "cp -r" + done + ''; + + preBuild = '' + cp -r --no-preserve=all ${recentAdvCmds}/colldef . + pushd colldef + mv locale/collate.h . + flex -t -8 -i scan.l > scan.c + yacc -d parse.y + clang *.c -o colldef -lfl + popd + mv colldef/colldef colldef.tproj/colldef + + cp -r --no-preserve=all ${recentAdvCmds}/mklocale . + pushd mklocale + flex -t -8 -i lex.l > lex.c + yacc -d yacc.y + clang *.c -o mklocale -lfl + popd + mv mklocale/mklocale mklocale.tproj/mklocale + ''; -appleDerivation { - # Will override the name until we provide all of adv_cmds buildPhase = '' - pushd ps - cc -Os -Wall -I. -c -o fmt.o fmt.c - cc -Os -Wall -I. -c -o keyword.o keyword.c - cc -Os -Wall -I. -c -o nlist.o nlist.c - cc -Os -Wall -I. -c -o print.o print.c - cc -Os -Wall -I. -c -o ps.o ps.c - cc -Os -Wall -I. -c -o tasks.o tasks.c - cc -o ps fmt.o keyword.o nlist.o print.o ps.o tasks.o - popd + runHook preBuild - pushd locale - c++ -o locale locale.cc - popd + bsdmake -C usr-share-locale.tproj + + clang ${recentAdvCmds}/ps/*.c -o ps ''; installPhase = '' - mkdir -p $out/bin $out/share/man/man1 + bsdmake -C usr-share-locale.tproj install DESTDIR="$locale/share/locale" - cp ps/ps $out/bin/ps - cp ps/ps.1 $out/share/man/man1 - cp locale/locale $out/bin/locale - cp locale/locale.1 $out/share/man/man1 + # need to get rid of runtime dependency on flex + # install -d 0755 $locale/bin + # install -m 0755 colldef.tproj/colldef $locale/bin + # install -m 0755 mklocale.tproj/mklocale $locale/bin + + install -d 0755 $ps/bin + install ps $ps/bin/ps ''; + outputs = [ + "ps" + "locale" + ]; + + # ps uses this syscall to get process info + propagatedSandboxProfile = stdenv.lib.sandbox.allow "mach-priv-task-port"; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix new file mode 100644 index 000000000000..dcbf8b433088 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -0,0 +1,45 @@ +{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }: + +appleDerivation { + buildInputs = [ makeWrapper ]; + + patchPhase = '' + substituteInPlace mk/bsd.prog.mk \ + --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \ + --replace '-o ''${SCRIPTSOWN_''${.ALLSRC:T}}' "" \ + --replace '-g ''${SCRIPTSGRP_''${.ALLSRC:T}}' "" + substituteInPlace mk/bsd.lib.mk --replace '-o ''${LIBOWN} -g ''${LIBGRP}' "" + substituteInPlace mk/bsd.info.mk --replace '-o ''${INFOOWN} -g ''${INFOGRP}' "" + substituteInPlace mk/bsd.doc.mk --replace '-o ''${BINOWN} -g ''${BINGRP}' "" + substituteInPlace mk/bsd.man.mk --replace '-o ''${MANOWN} -g ''${MANGRP}' "" + substituteInPlace mk/bsd.files.mk \ + --replace '-o ''${''${group}OWN_''${.ALLSRC:T}}' "" \ + --replace '-g ''${''${group}GRP_''${.ALLSRC:T}}' "" \ + --replace '-o ''${''${group}OWN} -g ''${''${group}GRP}' "" + substituteInPlace mk/bsd.incs.mk \ + --replace '-o ''${''${group}OWN_''${.ALLSRC:T}}' "" \ + --replace '-g ''${''${group}GRP_''${.ALLSRC:T}}' "" \ + --replace '-o ''${''${group}OWN} -g ''${''${group}GRP}' "" + ''; + + buildPhase = '' + objs=() + for file in $(find . -name '*.c'); do + obj="$(basename "$file" .c).o" + objs+=("$obj") + cc -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g + done + cc "''${objs[@]}" -o bsdmake + ''; + + installPhase = '' + install -d 0644 $out/bin + install -m 0755 bsdmake $out/bin + install -d 0644 $out/share/mk + install -m 0755 mk/* $out/share/mk + ''; + + preFixup = '' + wrapProgram "$out/bin/bsdmake" --add-flags "-m $out/share/mk" + ''; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 8687f3fe532e..1fbacfb92845 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -7,6 +7,10 @@ appleDerivation { propagatedBuildInputs = [ Security ]; + propagatedSandboxProfile = '' + (allow mach-lookup (global-name "com.apple.SystemConfiguration.configd")) + ''; + patchPhase = '' substituteInPlace SystemConfiguration.fproj/SCNetworkReachabilityInternal.h \ --replace '#include ' "" diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 906e0ad2d544..f1b72b4123ff 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -48,16 +48,19 @@ let IOKitSrcs = stdenv.lib.mapAttrs (name: value: if builtins.isFunction value then value name else value) IOKitSpecs; + adv_cmds = applePackage "adv_cmds" "119" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; + packages = { - adv_cmds = applePackage "adv_cmds" "153" "174v6a4zkcm2pafzgdm6kvs48z5f911zl7k49hv7kjq6gm58w99v" {}; + inherit (adv_cmds) ps locale; architecture = applePackage "architecture" "265" "05wz8wmxlqssfp29x203fwfb8pgbdjj1mpz12v508658166yzqj8" {}; bootstrap_cmds = applePackage "bootstrap_cmds" "86" "0xr0296jm1r3q7kbam98h85g23qlfi763z54ahj563n636kyk2wb" {}; + bsdmake = applePackage "bsdmake" "24" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "9A581" "1hc0yijlpwq39x5bic6nnywqp2m1wj1f11j33m2q7p505h1h740c" {}; CF = applePackage "CF" "855.17" "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {}; CommonCrypto = applePackage "CommonCrypto" "60049" "1azin6w7cnzl0iv8kd2qzgwcp6a45zy64y5z1i6jysjcl6xmlw2h" {}; configd = applePackage "configd" "453.19" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; copyfile = applePackage "copyfile" "103.92.1" "15i2hw5aqx0fklvmq6avin5s00adacvzqc740vviwc2y742vrdcd" {}; - CoreOSMakefiles = applePackage "CoreOSMakefiles" "76" "0sw3w3sjil0kvxz8y86b81sz82rcd1nijayki1a1bsnsf0hz6qbf" {}; + CoreOSMakefiles = applePackage "CoreOSMakefiles" "40" "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {}; Csu = applePackage "Csu" "79" "1hif4dz23isgx85sgh11yg8amvp2ksvvhz3y5v07zppml7df2lnh" {}; dtrace = applePackage "dtrace" "118.1" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {}; dyld = applePackage "dyld" "239.4" "07z7lyv6x0f6gllb5hymccl31zisrdhz4gqp722xcs9nhsqaqvn7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 4a739032e2ae..ccce7448e5db 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -30,6 +30,9 @@ name: version: sha256: args: let ''; buildInputs = [ pkgs.gnustep-make + pkgs.darwin.apple_sdk.frameworks.AppKit + pkgs.darwin.apple_sdk.frameworks.Foundation + pkgs.darwin.cf-private ]; makeFlags = [ "-f${makeFile}" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index 23ac246b4afa..9de1d120cc94 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -14,6 +14,9 @@ appleDerivation { substituteInPlace lib/debugging.cpp --replace PATH_MAX 1024 substituteInPlace lib/superblob.h --replace 'result->at' 'result->template at' substituteInPlace lib/ccaudit.cpp --replace '' '"bsm/libbsm.h"' + substituteInPlace lib/powerwatch.h --replace \ + '' \ + '"${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/PrivateHeaders/pwr_mgt/IOPMLibPrivate.h"' cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib diff --git a/pkgs/os-specific/darwin/cf-private/setup-hook.sh b/pkgs/os-specific/darwin/cf-private/setup-hook.sh index a83a1323bf83..7594c07977b9 100644 --- a/pkgs/os-specific/darwin/cf-private/setup-hook.sh +++ b/pkgs/os-specific/darwin/cf-private/setup-hook.sh @@ -6,7 +6,7 @@ linkWithRealCF() { # gross! many symbols (such as _OBJC_CLASS_$_NSArray) are defined in system CF, but not # in the opensource release # if the package needs private headers, we assume they also want to link with system CF - NIX_LDFLAGS+=" /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" + NIX_LDFLAGS+=" /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation" } preConfigureHooks+=(prependSearchPath linkWithRealCF) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 62c883b6ab89..46b749f55e87 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -8,6 +8,12 @@ , ibmSupport ? true # IBM/Lenovo notebooks # optional features with extra dependencies + +# ouch, this is ugly, but this gives the man page +, docsSupport ? true, docbook2x, libxslt ? null + , man ? null, less ? null + , docbook_xsl ? null , docbook_xml_dtd_44 ? null + , ncursesSupport ? true , ncurses ? null , x11Support ? true , xlibsWrapper ? null , xdamageSupport ? x11Support, libXdamage ? null @@ -27,6 +33,10 @@ , libxml2 ? null }: +assert docsSupport -> docbook2x != null && libxslt != null + && man != null && less != null + && docbook_xsl != null && docbook_xml_dtd_44 != null; + assert ncursesSupport -> ncurses != null; assert x11Support -> xlibsWrapper != null; @@ -63,11 +73,20 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake + '' + optionalString docsSupport '' + # Drop examples, since they contain non-ASCII characters that break docbook2x :( + sed -i 's/ Example: .*$//' doc/config_settings.xml + + substituteInPlace cmake/Docbook.cmake \ + --replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl" + substituteInPlace doc/docs.xml \ + --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" ''; NIX_LDFLAGS = "-lgcc_s"; buildInputs = [ pkgconfig glib cmake ] + ++ optionals docsSupport [ docbook2x libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage @@ -82,6 +101,7 @@ stdenv.mkDerivation rec { ; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] + ++ optional docsSupport "-DMAINTAINER_MODE=ON" ++ optional curlSupport "-DBUILD_CURL=ON" ++ optional (!ibmSupport) "-DBUILD_IBM=OFF" ++ optional imlib2Support "-DBUILD_IMLIB2=ON" diff --git a/pkgs/servers/certificate-transparency/default.nix b/pkgs/servers/certificate-transparency/default.nix new file mode 100644 index 000000000000..ebfa7427fc00 --- /dev/null +++ b/pkgs/servers/certificate-transparency/default.nix @@ -0,0 +1,57 @@ +{ stdenv, pkgs, ...}: + +stdenv.mkDerivation rec { + name = "certificate-transparency-${version}"; + + version = "2015-11-27"; + rev = "dc5a51e55af989ff5871a6647166d00d0de478ab"; + + meta = with stdenv.lib; { + homepage = https://www.certificate-transparency.org/; + description = "Auditing for TLS certificates."; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ philandstuff ]; + }; + + src = pkgs.fetchFromGitHub { + owner = "google"; + repo = "certificate-transparency"; + rev = rev; + sha256 = "14sgc2kcjjsnrykwcjin21h1f3v4kg83w6jqiq9qdm1ha165yhvx"; + }; + + # need to disable regex support in evhtp or building will fail + libevhtp_without_regex = stdenv.lib.overrideDerivation pkgs.libevhtp + (oldAttrs: { + cmakeFlags="-DEVHTP_DISABLE_REGEX:STRING=ON -DCMAKE_C_FLAGS:STRING=-fPIC"; + }); + + buildInputs = with pkgs; [ + autoconf automake clang_34 pkgconfig + glog gmock google-gflags gperftools gtest json_c leveldb + libevent libevhtp_without_regex openssl protobuf sqlite + ]; + + patches = [ + ./protobuf-include-from-env.patch + ]; + + doCheck = false; + + preConfigure = '' + ./autogen.sh + configureFlagsArray=( + CC=clang + CXX=clang++ + GMOCK_DIR=${pkgs.gmock} + GTEST_DIR=${pkgs.gtest} + ) + ''; + + # the default Makefile constructs BUILD_VERSION from `git describe` + # which isn't available in the nix build environment + makeFlags = "BUILD_VERSION=${version}-${rev}"; + + protocFlags = "-I ${pkgs.protobuf}/include"; +} diff --git a/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch b/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch new file mode 100644 index 000000000000..a1f9a1849b63 --- /dev/null +++ b/pkgs/servers/certificate-transparency/protobuf-include-from-env.patch @@ -0,0 +1,14 @@ +Get protobuf include path from environment + +--- a/python/Makefile ++++ b/python/Makefile +@@ -5,7 +5,7 @@ all: ct/proto/client_pb2.py ct/proto/ct_pb2.py ct/proto/tls_options_pb2.py \ + ct/proto/test_message_pb2.py ct/proto/certificate_pb2.py + + ct/proto/%_pb2.py: ct/proto/%.proto +- $(PROTOC) $^ -I/usr/include/ -I/usr/local/include -I$(INSTALL_DIR)/include -I. --python_out=. ++ $(PROTOC) $^ $(protocFlags) -I. --python_out=. + + ct/proto/ct_pb2.py: ../proto/ct.proto + $(PROTOC) --python_out=ct/proto -I../proto ../proto/ct.proto + diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 41e3b547f70e..82d18091050b 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = http://www.musicpd.org/libs/libmpdclient/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ mornfall emery ]; + maintainers = with maintainers; [ mornfall ehmry ]; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index bf968ae4b398..b672083340eb 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -21,7 +21,7 @@ , jackSupport ? true, libjack2 , gmeSupport ? true, game-music-emu , icuSupport ? true, icu -, clientSupport ? false, mpd_clientlib +, clientSupport ? true, mpd_clientlib , opusSupport ? true, libopus }: @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl fuuzetsu emery ]; + maintainers = with maintainers; [ astsmtl fuuzetsu ehmry ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index 4122e940c767..0351df9718b4 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -37,8 +37,8 @@ in { }; owncloud70 = common { - versiona = "7.0.10"; - sha256 = "7e77f27137f37a721a8827b0436a9e71c100406d9745c4251c37c14bcaf31d0b"; + versiona = "7.0.11"; + sha256 = "21dd75de4ed832f16f577eb6763d04c663ef13251153ba2e8847e3f5799d2ad2"; }; owncloud80 = common { @@ -52,8 +52,8 @@ in { }; owncloud82 = common { - versiona = "8.2.0"; - sha256 = "fcfe99cf1c3aa06ff369e5b1a602147c08dd977af11800fe06c6a661fa5f770c"; + versiona = "8.2.1"; + sha256 = "5390b2172562a5bf97a46e9a621d1dd92f9b74efaccbb77978c39eb90d6988d4"; }; } diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index 08ccbbd06c6b..1ca18d7d3a74 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.pps.jussieu.fr/~jch/software/polipo/; description = "A small and fast caching web proxy"; license = licenses.mit; - maintainers = with maintainers; [ phreedom emery ]; + maintainers = with maintainers; [ phreedom ehmry ]; platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 808f181442a9..7f9f08af002c 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; homepage = https://ripple.com; - maintainers = with maintainers; [ emery offline ]; + maintainers = with maintainers; [ ehmry offline ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 37a546770a0d..ed859ac344b8 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pam, openssl, openssh, shadow, makeWrapper }: stdenv.mkDerivation rec { - version = "2.16"; + version = "2.19"; name = "shellinabox-${version}"; src = fetchFromGitHub { owner = "shellinabox"; repo = "shellinabox"; - rev = "8ac3a4efcf20f7b66d3f1eb1d4f3054aef6e196b"; - sha256 = "1pp6nk0279d2q7l1cvx8jc73skfjv0s42wxb2m00x0bg9i1fvs5j"; + rev = "1a8010f2c94a62e7398c4fa130dfe9e099dc55cd"; + sha256 = "16cr7gbnh6vzsxlhg9j9avqrxbhbkqhsbvh197b0ccdwbb04ysan"; }; patches = [ ./shellinabox-minus.patch ]; diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index e60a74eaf89f..b42fe004af33 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { { description = "Serve 9P from Unix"; homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs; license = licenses.free; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index a6e0d474d897..0d276c18f2d7 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "High performance peer-to-peer hub for the ADC network"; homepage = https://www.uhub.org/; license = licenses.gpl3; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; }; } \ No newline at end of file diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix new file mode 100644 index 000000000000..4151144e3ab7 --- /dev/null +++ b/pkgs/servers/ums/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, makeWrapper +, libzen, libmediainfo , jre8 +}: + +stdenv.mkDerivation rec { + name = "ums-${version}"; + version = "5.3.1"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz"; + sha256 = "197lrfqk4n6fffrabj0607a9a5wc1j662s46anc0mkyqbb4r3avh"; + name = "${name}-${version}.tgz"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + cp -a . $out/ + mkdir $out/bin + mv $out/documentation /$out/doc + + makeWrapper "$out/UMS.sh" "$out/bin/ums" \ + --prefix LD_LIBRARY_PATH ":" "${libzen}/lib:${libmediainfo}/lib" \ + --set JAVA_HOME "${jre8}" + ''; + + meta = { + description = "Universal Media Server: a DLNA-compliant UPnP Media Server."; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thall ]; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d1764108e4ad..75feb46a7fa0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2108,11 +2108,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.17.2"; + name = "xorg-server-1.17.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2; - sha256 = "14vr4mm0x94a9bd3sfx9mdh8qhvk48zcml3i8q1wbwi84xhj04gn"; + url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; + sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; diff --git a/pkgs/servers/x11/xorg/fix_segfault.patch b/pkgs/servers/x11/xorg/fix_segfault.patch deleted file mode 100644 index b3a7d2ed5e00..000000000000 --- a/pkgs/servers/x11/xorg/fix_segfault.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001 -From: Martin Peres -Date: Fri, 17 Jul 2015 17:21:26 +0300 -Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized - before use - -In WaitForSomething(), the fd_set clientsWritable may be used unitialized when -the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to -a crash in FlushAllOutput() after x11proto's commit -2c94cdb453bc641246cc8b9a876da9799bee1ce7. - -The problem did not manifest before because both the XFD_SIZE and the maximum -number of clients were set to 256. As the connectionTranslation table was -initalized for the 256 clients to 0, the test on the index not being 0 was -aborting before dereferencing the client #0. - -As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE -got bumped to 512. This lead the OutputPending fd_set to have any fd above 256 -to be uninitialized which in turns lead to reading an index after the end of -the ConnectionTranslation table. This index would then be used to find the -client corresponding to the fd marked as pending writes and would also result -to an out-of-bound access which would usually be the fatal one. - -Fix this by zeroing the clientsWritable fd_set at the beginning of -WaitForSomething(). In this case, the bottom part of the loop, which would -indirectly call FlushAllOutput, will not do any work but the next call to -select will result in the execution of the right codepath. This is exactly what -we want because we need to know the writable clients before handling them. In -the end, it also makes sure that the fds above MaxClient are initialized, -preventing the crash in FlushAllOutput(). - -Thanks to everyone involved in tracking this one down! - -Reported-by: Karol Herbst -Reported-by: Tobias Klausmann -Signed-off-by: Martin Peres -Tested-by: Martin Peres -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316 -Cc: Ilia Mirkin -Cc: Martin Peres -Cc: Olivier Fourdan -Cc: Alan Coopersmith ---- - os/WaitFor.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/os/WaitFor.c b/os/WaitFor.c -index 431f1a6..993c14e 100644 ---- a/os/WaitFor.c -+++ b/os/WaitFor.c -@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady) - Bool someReady = FALSE; - - FD_ZERO(&clientsReadable); -+ FD_ZERO(&clientsWritable); - - if (nready) - SmartScheduleStopTimer(); --- -2.4.5 - diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1339e51eb232..78be046366db 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -291,7 +291,7 @@ in dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316 - commonPatches = [ ./xorgserver-xkbcomp-path.patch ./fix_segfault.patch ]; + commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. darwinOtherX = overrideDerivation xorgserver (oldAttrs: { diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 7b12ab7cab81..5ce686cb8fcf 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.1.1"; + version = "5.2"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0p99dr7kck0a6im1w9qiiz2ai78mgy53gbbn87bam9ya2885gf05"; + sha256 = "1r9r91gmrrflzl0yq10bib9gxbqyhycb09hcx28m2g3vv9skmccj"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl"; + sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"; }; buildInputs = [ ncurses coreutils pcre ]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 1a2ca5038b20..8e6bf2be63f6 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -12,6 +12,8 @@ let lib = import ../../../lib; in lib.makeOverridable ( , extraBuildInputs ? [] , __stdenvImpureHostDeps ? [] , __extraImpureHostDeps ? [] +, stdenvSandboxProfile ? "" +, extraSandboxProfile ? "" }: let @@ -100,6 +102,8 @@ let , outputs ? [ "out" ] , __impureHostDeps ? [] , __propagatedImpureHostDeps ? [] + , sandboxProfile ? "" + , propagatedSandboxProfile ? "" , ... } @ attrs: let pos' = @@ -165,9 +169,13 @@ let lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos" - "__impureHostDeps" "__propagatedImpureHostDeps"]) + "__impureHostDeps" "__propagatedImpureHostDeps" + "sandboxProfile" "propagatedSandboxProfile"]) // (let - # TODO: remove lib.unique once nix has a list canonicalization primitive + computedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs); + computedPropagatedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs); computedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs)); computedPropagatedImpureHostDeps = @@ -189,6 +197,12 @@ let propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (if crossConfig == null then propagatedBuildInputs else []); } // ifDarwin { + # TODO: remove lib.unique once nix has a list canonicalization primitive + __sandboxProfile = + let profiles = [ extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; + final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); + in final; + __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [ "/dev/zero" "/dev/random" @@ -232,6 +246,7 @@ let inherit preHook initialPath shell defaultNativeBuildInputs; } // ifDarwin { + __sandboxProfile = stdenvSandboxProfile; __impureHostDeps = __stdenvImpureHostDeps; }) diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix index d13dc98cd742..bc3b433e9226 100644 --- a/pkgs/stdenv/pure-darwin/default.nix +++ b/pkgs/stdenv/pure-darwin/default.nix @@ -5,18 +5,9 @@ }: let - # libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land - libSystemClosure = [ - "/usr/lib/libSystem.dylib" - "/usr/lib/libSystem.B.dylib" - "/usr/lib/libobjc.A.dylib" - "/usr/lib/libobjc.dylib" - "/usr/lib/libauto.dylib" - "/usr/lib/libc++abi.dylib" - "/usr/lib/libc++.1.dylib" - "/usr/lib/libDiagnosticMessagesClient.dylib" - "/usr/lib/system" - ]; + libSystemProfile = '' + (import "${./standard-sandbox.sb}") + ''; fetch = { file, sha256, executable ? true }: import { url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/4f07c88d467216d9692fefc951deb5cd3c4cc722/${file}"; @@ -46,7 +37,9 @@ in rec { ''; # The one dependency of /bin/sh :( - binShClosure = [ "/usr/lib/libncurses.5.4.dylib" ]; + binShClosure = '' + (allow file-read* (literal "/usr/lib/libncurses.5.4.dylib")) + ''; bootstrapTools = derivation rec { inherit system tarball; @@ -57,7 +50,7 @@ in rec { inherit (bootstrapFiles) mkdir bzip2 cpio; - __impureHostDeps = binShClosure ++ libSystemClosure; + __sandboxProfile = binShClosure + libSystemProfile; }; stageFun = step: last: {shell ? "${bootstrapTools}/bin/sh", @@ -100,8 +93,8 @@ in rec { }; # The stdenvs themselves don't use mkDerivation, so I need to specify this here - __stdenvImpureHostDeps = binShClosure ++ libSystemClosure; - __extraImpureHostDeps = binShClosure ++ libSystemClosure; + stdenvSandboxProfile = binShClosure + libSystemProfile; + extraSandboxProfile = binShClosure + libSystemProfile; extraAttrs = { inherit platform; }; overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; @@ -178,10 +171,14 @@ in rec { }; stage2 = with stage1; stageFun 2 stage1 { + extraPreHook = '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; + allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ xz libcxx libcxxabi icu ]) ++ - (with pkgs.darwin; [ dyld Libsystem CF ]); + (with pkgs.darwin; [ dyld Libsystem CF locale ]); overrides = persistent1; }; @@ -196,7 +193,7 @@ in rec { darwin = orig.darwin // { inherit (darwin) - dyld Libsystem xnu configd libdispatch libclosure launchd libiconv; + dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale; }; }; @@ -209,10 +206,14 @@ in rec { # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first. extraInitialPath = [ pkgs.bash ]; + extraPreHook = '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; + allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ icu bash libcxx libcxxabi ]) ++ - (with pkgs.darwin; [ dyld Libsystem ]); + (with pkgs.darwin; [ dyld Libsystem locale ]); overrides = persistent2; }; @@ -230,13 +231,16 @@ in rec { }; darwin = orig.darwin // { - inherit (darwin) dyld Libsystem libiconv; + inherit (darwin) dyld Libsystem libiconv locale; }; }; stage4 = with stage3; stageFun 4 stage3 { shell = "${pkgs.bash}/bin/bash"; extraInitialPath = [ pkgs.bash ]; + extraPreHook = '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; overrides = persistent3; }; @@ -251,7 +255,7 @@ in rec { }; darwin = orig.darwin // { - inherit (darwin) dyld Libsystem cctools CF libiconv; + inherit (darwin) dyld Libsystem cctools libiconv; }; }; @@ -261,10 +265,12 @@ in rec { name = "stdenv-darwin"; - preHook = commonPreHook; + preHook = commonPreHook + '' + export PATH_LOCALE=${pkgs.darwin.locale}/share/locale + ''; - __stdenvImpureHostDeps = binShClosure ++ libSystemClosure; - __extraImpureHostDeps = binShClosure ++ libSystemClosure; + stdenvSandboxProfile = binShClosure + libSystemProfile; + extraSandboxProfile = binShClosure + libSystemProfile; initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; @@ -292,7 +298,7 @@ in rec { coreutils ed diffutils gnutar gzip ncurses gnused bash gawk gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext ]) ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools libiconv + dyld Libsystem CF cctools libiconv locale ]); overrides = orig: persistent4 orig // { diff --git a/pkgs/stdenv/pure-darwin/standard-sandbox.sb b/pkgs/stdenv/pure-darwin/standard-sandbox.sb new file mode 100644 index 000000000000..b87be89f35f2 --- /dev/null +++ b/pkgs/stdenv/pure-darwin/standard-sandbox.sb @@ -0,0 +1,72 @@ +(define TMPDIR (param "_GLOBAL_TMP_DIR")) + +; obvious +(allow process-fork) + +; allow reading system information like #CPUs, etc. +(allow sysctl-read) + +; IPC +(allow ipc-posix*) + +; Unix sockets +(allow system-socket) + +; all runtime dependencies of libSystem.dylib +(allow file-read* + (literal "/usr/lib/libSystem.dylib") + (literal "/usr/lib/libSystem.B.dylib") + (literal "/usr/lib/libobjc.A.dylib") + (literal "/usr/lib/libobjc.dylib") + (literal "/usr/lib/libauto.dylib") + (literal "/usr/lib/libc++abi.dylib") + (literal "/usr/lib/libc++.1.dylib") + (literal "/usr/lib/libDiagnosticMessagesClient.dylib") + (subpath "/usr/lib/system")) + +; tmp +(allow file* process-exec (literal "/tmp") (subpath TMPDIR)) + +; clang likes to read the system version +(allow file-read* (literal "/System/Library/CoreServices/SystemVersion.plist")) + +; used for bootstrap builders +(allow process-exec* (literal "/bin/sh")) + +; without this line clang cannot write to /dev/null, breaking some configure tests +(allow file-read-metadata (literal "/dev")) + +; standard devices +(allow file* + (literal "/dev/null") + (literal "/dev/random") + (literal "/dev/stdin") + (literal "/dev/stdout") + (literal "/dev/tty") + (literal "/dev/urandom") + (literal "/dev/zero") + (subpath "/dev/fd")) + +; does nothing, but reduces build noise +(allow file* (literal "/dev/dtracehelper")) + +; ICU data and zoneinfo data are hardcoded +; both are in libicucore and zoneinfo is in libsystem_c as well +(allow file-read* (subpath "/usr/share/icu") (subpath "/usr/share/zoneinfo")) + +; no idea what this is +(allow file-read-data (literal "/dev/autofs_nowait")) + +; lots of autoconf projects want to list this directory +(allow file-read-metadata (literal "/var") (literal "/private/var/tmp")) + +; send signals +(allow signal (target same-sandbox)) + +; allow getpwuid (for git and other packages) +(allow mach-lookup + (global-name "com.apple.system.notification_center") + (global-name "com.apple.system.opendirectoryd.libinfo")) + +; allow networking on localhost +(allow network* (local ip) (remote unix-socket)) diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index d314c7857ea6..d1f0ce93ab48 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,89 +16,63 @@ # # To use at startup, see hardware.bumblebee options. -# This nix expression supports for now only the native nvidia driver. -# It should not be hard to generalize this approach to support the -# nouveau driver as well (parameterize hostEnv, i686Env over the -# module package, and parameterize the two wrappers as well) - -{ stdenv, fetchurl, pkgconfig, help2man -, libX11, glibc, glib, libbsd -, makeWrapper, buildEnv, module_init_tools -, xorg, xkeyboard_config -, nvidia_x11, virtualgl +{ stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper +, glib, libbsd +, libX11, libXext, xorgserver, xkbcomp, module_init_tools, xkeyboard_config, xf86videonouveau +, nvidia_x11, virtualgl, primusLib # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? , nvidia_x11_i686 ? null -, virtualgl_i686 ? null +, primusLib_i686 ? null , useDisplayDevice ? false -, extraDeviceOptions ? "" +, extraNvidiaDeviceOptions ? "" +, extraNouveauDeviceOptions ? "" +, useNvidia ? true }: -with stdenv.lib; + let version = "3.2.1"; + + primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + + primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686); + + nvidia_x11s = [nvidia_x11] ++ lib.optional (nvidia_x11_i686 != null) nvidia_x11_i686; + + nvidiaLibs = lib.makeLibraryPath nvidia_x11s; + + bbdPath = lib.makeSearchPath "bin" [ module_init_tools xorgserver ]; + bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; + + xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); + +in stdenv.mkDerivation rec { name = "bumblebee-${version}"; - # Isolated X11 environment without the acceleration driver module. - # Includes the rest of the components needed for bumblebeed and - # optirun to spawn the second X server and to connect to it. - x11Env = buildEnv { - name = "bumblebee-env"; - paths = [ - module_init_tools - xorg.xorgserver - xorg.xrandr - xorg.xrdb - xorg.setxkbmap - xorg.libX11 - xorg.libXext - xorg.xf86inputevdev - ]; - }; - - # The environment for the host architecture. - hostEnv = buildEnv { - name = "bumblebee-x64-env"; - paths = [ - nvidia_x11 - virtualgl - ]; - }; - - # The environment for the sub architecture, i686, if there is one - i686Env = if virtualgl_i686 != null - then buildEnv { - name = "bumblebee-i686-env"; - paths = [ - nvidia_x11_i686 - virtualgl_i686 - ]; - } - else null; - - allEnvs = [hostEnv] ++ optional (i686Env != null) i686Env; - ldPathString = makeLibraryPath allEnvs; - - # By default we don't want to use a display device - deviceOptions = if useDisplayDevice - then "" - else '' - - # Disable display device - Option "UseEDID" "false" - Option "UseDisplayDevice" "none" - '' - + extraDeviceOptions; - -in stdenv.mkDerivation { - inherit name deviceOptions; - src = fetchurl { url = "http://bumblebee-project.org/${name}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; - patches = [ ./xopts.patch ./nvidia-conf.patch]; + patches = [ ./nixos.patch ]; + + # By default we don't want to use a display device + nvidiaDeviceOptions = lib.optionalString (!useDisplayDevice) '' + # Disable display device + Option "UseEDID" "false" + Option "UseDisplayDevice" "none" + '' + extraNvidiaDeviceOptions; + + nouveauDeviceOptions = extraNouveauDeviceOptions; + + # the have() function is deprecated and not available to bash completions the + # way they are currently loaded in NixOS, so use _have. See #10936 + patchPhase = '' + substituteInPlace scripts/bash_completion/bumblebee \ + --replace "have optirun" "_have optirun" + ''; preConfigure = '' # Substitute the path to the actual modinfo program in module.c. @@ -114,12 +88,16 @@ in stdenv.mkDerivation { # Apply configuration options substituteInPlace conf/xorg.conf.nvidia \ - --subst-var deviceOptions + --subst-var nvidiaDeviceOptions + + substituteInPlace conf/xorg.conf.nouveau \ + --subst-var nouveauDeviceOptions ''; # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 glib libbsd ]; + buildInputs = [ libX11 glib libbsd ]; + nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. @@ -130,33 +108,33 @@ in stdenv.mkDerivation { # include the sub architecture components. configureFlags = [ "--with-udev-rules=$out/lib/udev/rules.d" - "CONF_DRIVER=nvidia" - "CONF_DRIVER_MODULE_NVIDIA=nvidia" - "CONF_LDPATH_NVIDIA=${x11Env}/lib:${ldPathString}" - "CONF_MODPATH_NVIDIA=${hostEnv}/lib/xorg/modules,${x11Env}/lib/xorg/modules" + # see #10282 + #"CONF_PRIMUS_LD_PATH=${primusLibs}" + ] ++ lib.optionals useNvidia [ + "CONF_LDPATH_NVIDIA=${nvidiaLibs}" + "CONF_MODPATH_NVIDIA=${nvidia_x11}/lib/xorg/modules" + ]; + + CFLAGS = [ + "-DX_MODULE_APPENDS=\\\"${xmodules}\\\"" + "-DX_XKB_DIR=\\\"${xkeyboard_config}/etc/X11/xkb\\\"" ]; - # create a wrapper environment for bumblebeed and optirun postInstall = '' wrapProgram "$out/sbin/bumblebeed" \ - --prefix PATH : "${x11Env}/sbin:${x11Env}/bin:${hostEnv}/bin:\$PATH" \ - --prefix LD_LIBRARY_PATH : "${x11Env}/lib:${hostEnv}/lib:\$LD_LIBRARY_PATH" \ - --set FONTCONFIG_FILE "/etc/fonts/fonts.conf" \ - --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ - --set XKB_DIR "${xkeyboard_config}/etc/X11/xkb" + --set XKB_BINDIR "${xkbcomp}/bin" \ + --prefix PATH : "${bbdPath}" \ + --prefix LD_LIBRARY_PATH : "${bbdLibs}" wrapProgram "$out/bin/optirun" \ - --prefix PATH : "${hostEnv}/bin" - '' + (if i686Env == null - then "" - else '' - makeWrapper "$out/bin/.optirun-wrapped" "$out/bin/optirun32" \ - --prefix PATH : "${i686Env}/bin" - ''); + --prefix PATH : "${virtualgl}/bin" + ''; - meta = { + meta = with stdenv.lib; { homepage = http://github.com/Bumblebee-Project/Bumblebee; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; - license = stdenv.lib.licenses.gpl3; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/tools/X11/bumblebee/nixos.patch new file mode 100644 index 000000000000..00fb8ad7a535 --- /dev/null +++ b/pkgs/tools/X11/bumblebee/nixos.patch @@ -0,0 +1,81 @@ +diff --git a/conf/xorg.conf.nouveau b/conf/xorg.conf.nouveau +index 87e48cb..60d6eaf 100644 +--- a/conf/xorg.conf.nouveau ++++ b/conf/xorg.conf.nouveau +@@ -15,4 +15,5 @@ Section "Device" + # This Setting is needed on Ubuntu 13.04. + # BusID "PCI:01:00:0" + ++@nouveauDeviceOptions@ + EndSection +diff --git a/conf/xorg.conf.nvidia b/conf/xorg.conf.nvidia +index c3107f9..17072f4 100644 +--- a/conf/xorg.conf.nvidia ++++ b/conf/xorg.conf.nvidia +@@ -29,6 +29,6 @@ Section "Device" + Option "ProbeAllGpus" "false" + + Option "NoLogo" "true" +- Option "UseEDID" "false" +- Option "UseDisplayDevice" "none" ++ ++@nvidiaDeviceOptions@ + EndSection +diff --git a/src/bbsecondary.c b/src/bbsecondary.c +index 71a6b73..a682d8a 100644 +--- a/src/bbsecondary.c ++++ b/src/bbsecondary.c +@@ -145,6 +145,23 @@ bool start_secondary(bool need_secondary) { + } + + bb_log(LOG_INFO, "Starting X server on display %s.\n", bb_config.x_display); ++ const char mod_appends[] = X_MODULE_APPENDS; ++ ++ char *mod_path; ++ int pathlen = strlen(bb_config.mod_path); ++ if (pathlen == 0) { ++ mod_path = mod_appends; ++ } else { ++ mod_path = malloc(pathlen + 1 + sizeof(mod_appends)); ++ if (!mod_path) { ++ set_bb_error("Could not allocate memory for modules path\n"); ++ return false; ++ } ++ strcpy(mod_path, bb_config.mod_path); ++ mod_path[pathlen] = ','; ++ strcpy(mod_path + pathlen + 1, mod_appends); ++ } ++ + char *x_argv[] = { + XORG_BINARY, + bb_config.x_display, +@@ -153,24 +170,25 @@ bool start_secondary(bool need_secondary) { + "-sharevts", + "-nolisten", "tcp", + "-noreset", ++ "-logfile", "/var/log/X.bumblebee.log", ++ "-xkbdir", X_XKB_DIR, + "-verbose", "3", + "-isolateDevice", pci_id, +- "-modulepath", bb_config.mod_path, // keep last ++ "-modulepath", mod_path, + NULL + }; + enum {n_x_args = sizeof(x_argv) / sizeof(x_argv[0])}; +- if (!*bb_config.mod_path) { +- x_argv[n_x_args - 3] = 0; //remove -modulepath if not set +- } + //close any previous pipe, if it (still) exists + if (bb_status.x_pipe[0] != -1){close(bb_status.x_pipe[0]); bb_status.x_pipe[0] = -1;} + if (bb_status.x_pipe[1] != -1){close(bb_status.x_pipe[1]); bb_status.x_pipe[1] = -1;} + //create a new pipe + if (pipe2(bb_status.x_pipe, O_NONBLOCK | O_CLOEXEC)){ + set_bb_error("Could not create output pipe for X"); ++ if (pathlen > 0) free(mod_path); + return false; + } + bb_status.x_pid = bb_run_fork_ld_redirect(x_argv, bb_config.ld_path, bb_status.x_pipe[1]); ++ if (pathlen > 0) free(mod_path); + //close the end of the pipe that is not ours + if (bb_status.x_pipe[1] != -1){close(bb_status.x_pipe[1]); bb_status.x_pipe[1] = -1;} + } diff --git a/pkgs/tools/X11/bumblebee/nvidia-conf.patch b/pkgs/tools/X11/bumblebee/nvidia-conf.patch deleted file mode 100644 index f5535c417cfb..000000000000 --- a/pkgs/tools/X11/bumblebee/nvidia-conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bumblebee-3.2.1/conf/xorg.conf.nvidia -+++ bumblebee-3.2.1/conf/xorg.conf.nvidia -@@ -29,6 +29,5 @@ Section "Device" - Option "ProbeAllGpus" "false" - - Option "NoLogo" "true" -- Option "UseEDID" "false" -- Option "UseDisplayDevice" "none" -+@deviceOptions@ - EndSection - diff --git a/pkgs/tools/X11/bumblebee/xopts.patch b/pkgs/tools/X11/bumblebee/xopts.patch deleted file mode 100644 index 6fd3a6a0483e..000000000000 --- a/pkgs/tools/X11/bumblebee/xopts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bumblebee-3.2.1/src/bbsecondary.c 2012-02-05 00:03:06.003439638 +0100 -+++ bumblebee-3.2.1/src/bbsecondary.c 2012-02-05 00:46:38.017382619 +0100 -@@ -149,6 +149,8 @@ - "-sharevts", - "-nolisten", "tcp", - "-noreset", -+ "-xkbdir", getenv("XKB_DIR"), -+ "-logfile", "/var/log/X.bumblebee.log", - "-verbose", "3", - "-isolateDevice", pci_id, - "-modulepath", diff --git a/pkgs/tools/X11/primus/builder.sh b/pkgs/tools/X11/primus/builder.sh deleted file mode 100644 index 3c6b6afdc09f..000000000000 --- a/pkgs/tools/X11/primus/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -cp -r $src src -cd src - -export LIBDIR=$out/lib -export PRIMUS_libGLa=$nvidia/lib/libGL.so -export PRIMUS_libGLd=$mesa/lib/libGL.so -export PRIMUS_LOAD_GLOBAL=$mesa/lib/libglapi.so - -make -ln -s $LIBDIR/libGL.so.1 $LIBDIR/libGL.so diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 1aa7909a43d6..f0a971dde18f 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -5,31 +5,18 @@ # Other distributions do the same. { stdenv , primusLib -, writeScript +, writeScriptBin , primusLib_i686 ? null +, useNvidia ? true }: -with stdenv.lib; + let - version = "1.0.0748176"; - ldPath = makeLibraryPath ([primusLib] ++ optional (primusLib_i686 != null) primusLib_i686); - primusrun = writeScript "primusrun" -'' + primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); + +in writeScriptBin "primusrun" '' + #!${stdenv.shell} export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" -''; -in -stdenv.mkDerivation { - name = "primus-${version}"; - builder = writeScript "builder" - '' - source $stdenv/setup - mkdir -p $out/bin - cp ${primusrun} $out/bin/primusrun - ''; - - meta = { - homepage = https://github.com/amonakov/primus; - description = "Faster OpenGL offloading for Bumblebee"; - maintainers = with maintainers; [ coconnor ]; - }; -} +'' diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index 96a4ac16c9b1..ce8059331092 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,20 +1,35 @@ { stdenv, fetchgit , xlibsWrapper, mesa -, nvidia +, nvidia_x11 ? null +, libX11 }: -let - version = "1.0.0748176"; -in + stdenv.mkDerivation { - name = "primus-lib-${version}"; + name = "primus-lib-20151204"; + src = fetchgit { url = git://github.com/amonakov/primus.git; - rev = "074817614c014e3a99259388cb18fd54648b659a"; - sha256 = "0mrh432md6zrm16avxyk57mgszrqpgwdjahspchvlaccqxp3x82v"; + rev = "d1afbf6fce2778c0751eddf19db9882e04f18bfd"; + sha256 = "8f095b5e2030cdb155a42a49873832843c1e4dc3087a6fb94d198de982609923"; }; - inherit nvidia mesa; + buildInputs = [ libX11 mesa ]; - buildInputs = [ xlibsWrapper mesa ]; - builder = ./builder.sh; + makeFlags = [ "LIBDIR=$(out)/lib" + "PRIMUS_libGLa=${if nvidia_x11 == null then mesa else nvidia_x11}/lib/libGL.so" + "PRIMUS_libGLd=${mesa}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" + ]; + + installPhase = '' + ln -s $out/lib/libGL.so.1 $out/lib/libGL.so + ''; + + meta = with stdenv.lib; { + description = "Low-overhead client-side GPU offloading"; + homepage = https://github.com/amonakov/primus; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; } diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index ceeadbaafaa7..7203229c47b5 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -1,33 +1,22 @@ -{ stdenv, fetchurl, mesa, libX11, openssl, libXext -, libjpeg_turbo, cmake }: +{ lib, buildEnv +, virtualglLib +, virtualglLib_i686 ? null +}: -let - version = "2.3.2"; -in -stdenv.mkDerivation { - name = "virtualgl-${version}"; - src = fetchurl { - url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "062lrhd8yr13ch4wpgzxdabqs92j4q7fcl3a0c3sdlav4arspqmy"; - }; +buildEnv { + name = "virtualgl-${lib.getVersion virtualglLib}"; - patches = [ ./xshm.patch ./fixturbopath.patch ]; + paths = [ virtualglLib ]; - prePatch = '' - sed -i s,LD_PRELOAD=lib,LD_PRELOAD=$out/lib/lib, server/vglrun + postBuild = lib.optionalString (virtualglLib_i686 != null) '' + rm $out/fakelib + # workaround for #4621 + rm $out/bin + mkdir $out/bin + for i in ${virtualglLib}/bin/*; do + ln -s $i $out/bin + done + ln -s ${virtualglLib}/bin/.vglrun.vars64 $out/bin + ln -s ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin ''; - - cmakeFlags = [ "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; - - preInstall = '' - export makeFlags="prefix=$out" - ''; - - buildInputs = [ cmake mesa libX11 openssl libXext libjpeg_turbo ]; - - meta = { - homepage = http://www.virtualgl.org/; - description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; - license = stdenv.lib.licenses.free; # many parts under different free licenses - }; } diff --git a/pkgs/tools/X11/virtualgl/fixturbopath.patch b/pkgs/tools/X11/virtualgl/fixturbopath.patch deleted file mode 100644 index 2177555e33ae..000000000000 --- a/pkgs/tools/X11/virtualgl/fixturbopath.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- VirtualGL-2.3/cmakescripts/FindTurboJPEG.cmake.orig 2012-02-02 17:33:49.496283001 +0100 -+++ VirtualGL-2.3/cmakescripts/FindTurboJPEG.cmake 2012-02-02 17:44:18.772483239 +0100 -@@ -40,8 +40,11 @@ - endif() - endif() - --set(TJPEG_LIBRARY ${DEFAULT_TJPEG_LIBRARY} CACHE PATH -- "TurboJPEG library path (default: ${DEFAULT_TJPEG_LIBRARY})") -+if(NOT TJPEG_LIBRARY) -+ message(STATUS "TJPEG_LIBRARY environment variable not set") -+ set(TJPEG_LIBRARY ${DEFAULT_TJPEG_LIBRARY} CACHE PATH -+ "TurboJPEG library path (default: ${DEFAULT_TJPEG_LIBRARY})") -+endif() - - if(WIN32) - set(CMAKE_REQUIRED_DEFINITIONS -MT) diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix new file mode 100644 index 000000000000..5c4456f6348d --- /dev/null +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }: + +let + version = "2.4.1"; +in +stdenv.mkDerivation { + name = "virtualgl-lib-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; + sha256 = "0bngb4hrl0kn19qb3sa6mg6dbaahfk09gx2ng18l00xm6pmwd298"; + }; + + cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ]; + + meta = with stdenv.lib; { + homepage = http://www.virtualgl.org/; + description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; + license = licenses.free; # many parts under different free licenses + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/X11/virtualgl/xshm.patch b/pkgs/tools/X11/virtualgl/xshm.patch deleted file mode 100644 index 2ca81b559ea6..000000000000 --- a/pkgs/tools/X11/virtualgl/xshm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/util/fbx.c b/util/fbx.c -index 06ea835..0d89842 100644 ---- a/util/fbx.c -+++ b/util/fbx.c -@@ -15,6 +15,8 @@ - // This library abstracts fast frame buffer access - #include - #include -+#include -+#include - #include "fbx.h" - - #define MINWIDTH 160 diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index 5481ad3aaf70..2c74a677b913 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -1,27 +1,13 @@ { stdenv, pythonPackages, fetchurl, dialog }: -let +pythonPackages.buildPythonPackage rec { + version = "0.1.0"; + name = "letsencrypt-${version}"; + src = fetchurl { url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz"; sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw"; }; - version = "0.1.0"; - acme = pythonPackages.buildPythonPackage rec { - name = "acme-${version}"; - inherit src version; - - propagatedBuildInputs = with pythonPackages; [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock - ndg-httpsclient - ]; - - buildInputs = with pythonPackages; [ nose ]; - - sourceRoot = "letsencrypt-${version}/acme"; - }; -in pythonPackages.buildPythonPackage rec { - name = "letsencrypt-${version}"; - inherit src version; propagatedBuildInputs = with pythonPackages; [ zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix new file mode 100644 index 000000000000..5f945309aac0 --- /dev/null +++ b/pkgs/tools/admin/simp_le/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "simp_le-20151205"; + + src = fetchFromGitHub { + owner = "kuba"; + repo = "simp_le"; + rev = "976a33830759e66610970f92f6ec1a656a2c8335"; + sha256 = "0bfa5081rmjjg9sii6pn2dskd1wh0dgrf9ic9hpisawrk0y0739i"; + }; + + propagatedBuildInputs = with pythonPackages; [ acme cryptography pytz requests2 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/kuba/simp_le; + description = "Simple Let's Encrypt client"; + license = licenses.gpl3; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index eb0d3a3bd833..404927e09397 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Utility for RAR archives"; homepage = http://www.rarlab.com/; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index bc3eaf9bf534..4875ebf504b4 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/ehmry/dir2opus; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; license = licenses.gpl2; }; } \ No newline at end of file diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 859fe4bb1830..eeebea5d7475 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Swiss-army knife for multimedia streaming"; homepage = http://liquidsoap.fm/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = ocaml.meta.platforms; }; diff --git a/pkgs/tools/backup/backup/Gemfile b/pkgs/tools/backup/backup/Gemfile new file mode 100644 index 000000000000..2f1825b590ea --- /dev/null +++ b/pkgs/tools/backup/backup/Gemfile @@ -0,0 +1,23 @@ +source "https://rubygems.org" + +gem 'backup' +gem 'thor' +gem 'open4' +gem 'fog' +gem 'unf' +gem 'dropbox-sdk', '= 1.5.1' # patched +gem 'net-ssh' +gem 'net-scp' +gem 'net-sftp' +gem 'mail', '= 2.5.4' # patched +gem 'pagerduty' +gem 'twitter' +gem 'hipchat' +gem 'flowdock' +gem 'json' +gem 'dogapi' +gem 'aws-ses' +gem 'rspec' +gem 'fuubar' +gem 'mocha' +gem 'timecop' diff --git a/pkgs/tools/backup/backup/Gemfile.lock b/pkgs/tools/backup/backup/Gemfile.lock new file mode 100644 index 000000000000..0725ded8add0 --- /dev/null +++ b/pkgs/tools/backup/backup/Gemfile.lock @@ -0,0 +1,276 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.1) + addressable (2.3.5) + atomic (1.1.14) + aws-ses (0.5.0) + builder + mail (> 2.2.5) + mime-types + xml-simple + backup (4.2.2) + CFPropertyList (= 2.3.1) + addressable (= 2.3.5) + atomic (= 1.1.14) + aws-ses (= 0.5.0) + buftok (= 0.2.0) + builder (= 3.2.2) + descendants_tracker (= 0.0.3) + dogapi (= 1.11.0) + dropbox-sdk (= 1.5.1) + equalizer (= 0.0.9) + excon (= 0.44.4) + faraday (= 0.8.8) + fission (= 0.5.0) + flowdock (= 0.4.0) + fog (= 1.28.0) + fog-atmos (= 0.1.0) + fog-aws (= 0.1.1) + fog-brightbox (= 0.7.1) + fog-core (= 1.29.0) + fog-ecloud (= 0.0.2) + fog-json (= 1.0.0) + fog-profitbricks (= 0.0.2) + fog-radosgw (= 0.0.3) + fog-riakcs (= 0.1.0) + fog-sakuracloud (= 1.0.0) + fog-serverlove (= 0.1.1) + fog-softlayer (= 0.4.1) + fog-storm_on_demand (= 0.1.0) + fog-terremark (= 0.0.4) + fog-vmfusion (= 0.0.1) + fog-voxel (= 0.0.2) + fog-xml (= 0.1.1) + formatador (= 0.2.5) + hipchat (= 1.0.1) + http (= 0.5.0) + http_parser.rb (= 0.6.0) + httparty (= 0.12.0) + inflecto (= 0.0.2) + ipaddress (= 0.8.0) + json (= 1.8.2) + mail (= 2.5.4) + memoizable (= 0.4.0) + mime-types (= 1.25.1) + mini_portile (= 0.6.2) + multi_json (= 1.10.1) + multi_xml (= 0.5.5) + multipart-post (= 1.2.0) + net-scp (= 1.2.1) + net-sftp (= 2.1.2) + net-ssh (= 2.9.2) + nokogiri (= 1.6.6.2) + open4 (= 1.3.0) + pagerduty (= 2.0.0) + polyglot (= 0.3.3) + simple_oauth (= 0.2.0) + thor (= 0.18.1) + thread_safe (= 0.1.3) + treetop (= 1.4.15) + twitter (= 5.5.0) + unf (= 0.1.3) + unf_ext (= 0.0.6) + xml-simple (= 1.1.4) + buftok (0.2.0) + builder (3.2.2) + descendants_tracker (0.0.3) + diff-lcs (1.2.5) + dogapi (1.11.0) + json (>= 1.5.1) + dropbox-sdk (1.5.1) + json + equalizer (0.0.9) + excon (0.44.4) + faraday (0.8.8) + multipart-post (~> 1.2.0) + fission (0.5.0) + CFPropertyList (~> 2.2) + flowdock (0.4.0) + httparty (~> 0.7) + multi_json + fog (1.28.0) + fog-atmos + fog-aws (~> 0.0) + fog-brightbox (~> 0.4) + fog-core (~> 1.27, >= 1.27.3) + fog-ecloud + fog-json + fog-profitbricks + fog-radosgw (>= 0.0.2) + fog-riakcs + fog-sakuracloud (>= 0.0.4) + fog-serverlove + fog-softlayer + fog-storm_on_demand + fog-terremark + fog-vmfusion + fog-voxel + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) + nokogiri (~> 1.5, >= 1.5.11) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (0.1.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.7.1) + fog-core (~> 1.22) + fog-json + inflecto (~> 0.0.2) + fog-core (1.29.0) + builder + excon (~> 0.38) + formatador (~> 0.2) + mime-types + net-scp (~> 1.1) + net-ssh (>= 2.1.3) + fog-ecloud (0.0.2) + fog-core + fog-xml + fog-json (1.0.0) + multi_json (~> 1.0) + fog-profitbricks (0.0.2) + fog-core + fog-xml + nokogiri + fog-radosgw (0.0.3) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.0.0) + fog-core + fog-json + fog-serverlove (0.1.1) + fog-core + fog-json + fog-softlayer (0.4.1) + fog-core + fog-json + fog-storm_on_demand (0.1.0) + fog-core + fog-json + fog-terremark (0.0.4) + fog-core + fog-xml + fog-vmfusion (0.0.1) + fission + fog-core + fog-voxel (0.0.2) + fog-core + fog-xml + fog-xml (0.1.1) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + hipchat (1.0.1) + httparty + http (0.5.0) + http_parser.rb + http_parser.rb (0.6.0) + httparty (0.12.0) + json (~> 1.8) + multi_xml (>= 0.5.2) + inflecto (0.0.2) + ipaddress (0.8.0) + json (1.8.2) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + memoizable (0.4.0) + thread_safe (~> 0.1.3) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile (0.6.2) + mocha (1.1.0) + metaclass (~> 0.0.1) + multi_json (1.10.1) + multi_xml (0.5.5) + multipart-post (1.2.0) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.9.2) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + open4 (1.3.0) + pagerduty (2.0.0) + json (>= 1.7.7) + polyglot (0.3.3) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.1) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-mocks (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + ruby-progressbar (1.7.5) + simple_oauth (0.2.0) + thor (0.18.1) + thread_safe (0.1.3) + atomic + timecop (0.8.0) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + twitter (5.5.0) + addressable (~> 2.3) + buftok (~> 0.2.0) + descendants_tracker (~> 0.0.3) + equalizer (~> 0.0.9) + faraday (>= 0.8, < 0.10) + http (~> 0.5.0) + http_parser.rb (~> 0.6.0) + json (~> 1.8) + memoizable (~> 0.4.0) + simple_oauth (~> 0.2.0) + unf (0.1.3) + unf_ext + unf_ext (0.0.6) + xml-simple (1.1.4) + +PLATFORMS + ruby + +DEPENDENCIES + aws-ses + backup + dogapi + dropbox-sdk (= 1.5.1) + flowdock + fog + fuubar + hipchat + json + mail (= 2.5.4) + mocha + net-scp + net-sftp + net-ssh + open4 + pagerduty + rspec + thor + timecop + twitter + unf + +BUNDLED WITH + 1.10.6 diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix new file mode 100644 index 000000000000..1890e8121c18 --- /dev/null +++ b/pkgs/tools/backup/backup/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby_2_1, curl }: + +bundlerEnv { + name = "backup_v4"; + + ruby = ruby_2_1; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Easy full stack backup operations on UNIX-like systems"; + homepage = http://backup.github.io/backup/v4/; + license = licenses.mit; + maintainers = [ maintainers.palo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/backup/backup/gemset.nix b/pkgs/tools/backup/backup/gemset.nix new file mode 100644 index 000000000000..e2de995996e1 --- /dev/null +++ b/pkgs/tools/backup/backup/gemset.nix @@ -0,0 +1,778 @@ +{ + "CFPropertyList" = { + version = "2.3.1"; + source = { + type = "gem"; + sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k"; + }; + }; + "addressable" = { + version = "2.3.5"; + source = { + type = "gem"; + sha256 = "11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7"; + }; + }; + "atomic" = { + version = "1.1.14"; + source = { + type = "gem"; + sha256 = "09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4"; + }; + }; + "aws-ses" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "1kpfcdnakngypgkzn1f8cl8p4jg1rvmx3ag4ggcl0c7gs91ki8k3"; + }; + dependencies = [ + "builder" + "mail" + "mime-types" + "xml-simple" + ]; + }; + "backup" = { + version = "4.2.2"; + source = { + type = "gem"; + sha256 = "0fj5jq6s1kpgp4bl1sr7qw1dgyc9zk0afh6mrfgbscg82irfxi1p"; + }; + dependencies = [ + "CFPropertyList" + "addressable" + "atomic" + "aws-ses" + "buftok" + "builder" + "descendants_tracker" + "dogapi" + "dropbox-sdk" + "equalizer" + "excon" + "faraday" + "fission" + "flowdock" + "fog" + "fog-atmos" + "fog-aws" + "fog-brightbox" + "fog-core" + "fog-ecloud" + "fog-json" + "fog-profitbricks" + "fog-radosgw" + "fog-riakcs" + "fog-sakuracloud" + "fog-serverlove" + "fog-softlayer" + "fog-storm_on_demand" + "fog-terremark" + "fog-vmfusion" + "fog-voxel" + "fog-xml" + "formatador" + "hipchat" + "http" + "http_parser.rb" + "httparty" + "inflecto" + "ipaddress" + "json" + "mail" + "memoizable" + "mime-types" + "mini_portile" + "multi_json" + "multi_xml" + "multipart-post" + "net-scp" + "net-sftp" + "net-ssh" + "nokogiri" + "open4" + "pagerduty" + "polyglot" + "simple_oauth" + "thor" + "thread_safe" + "treetop" + "twitter" + "unf" + "unf_ext" + "xml-simple" + ]; + }; + "buftok" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + }; + }; + "builder" = { + version = "3.2.2"; + source = { + type = "gem"; + sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; + }; + }; + "descendants_tracker" = { + version = "0.0.3"; + source = { + type = "gem"; + sha256 = "0819j80k85j62qjg90v8z8s3h4nf3v6afxxz73hl6iqxr2dhgmq1"; + }; + }; + "diff-lcs" = { + version = "1.2.5"; + source = { + type = "gem"; + sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; + }; + }; + "dogapi" = { + version = "1.11.0"; + source = { + type = "gem"; + sha256 = "01v5jphxbqdn8h0pifgl97igcincd1pjwd177a80ig9fpwndd19d"; + }; + dependencies = [ + "json" + ]; + }; + "dropbox-sdk" = { + version = "1.5.1"; + source = { + type = "gem"; + sha256 = "1zrzxzjfgwkdnn5vjvkhhjh10azyy28982hpkw5xv0kwrqg07axj"; + }; + dependencies = [ + "json" + ]; + }; + "equalizer" = { + version = "0.0.9"; + source = { + type = "gem"; + sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr"; + }; + }; + "excon" = { + version = "0.44.4"; + source = { + type = "gem"; + sha256 = "062ynrdazix4w1lz6n8qgm3dasi2837sfn88ma96pbp4sk11gbp5"; + }; + }; + "faraday" = { + version = "0.8.8"; + source = { + type = "gem"; + sha256 = "1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "fission" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh"; + }; + dependencies = [ + "CFPropertyList" + ]; + }; + "flowdock" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "1myza5n6wqk550ky3ld4np89cd491prndqy0l1fqsddxpap6pp60"; + }; + dependencies = [ + "httparty" + "multi_json" + ]; + }; + "fog" = { + version = "1.28.0"; + source = { + type = "gem"; + sha256 = "12b03r77vdicbsc7j6by2gysm16wij32z65qp6bkrxkfba9yb37h"; + }; + dependencies = [ + "fog-atmos" + "fog-aws" + "fog-brightbox" + "fog-core" + "fog-ecloud" + "fog-json" + "fog-profitbricks" + "fog-radosgw" + "fog-riakcs" + "fog-sakuracloud" + "fog-serverlove" + "fog-softlayer" + "fog-storm_on_demand" + "fog-terremark" + "fog-vmfusion" + "fog-voxel" + "fog-xml" + "ipaddress" + "nokogiri" + ]; + }; + "fog-atmos" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-aws" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "17a3sspf81bgvkrrrmwx7aci7fjy1m7b3w61ljc2mpqbafz80v7i"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + "ipaddress" + ]; + }; + "fog-brightbox" = { + version = "0.7.1"; + source = { + type = "gem"; + sha256 = "1cpa92q2ls51gidxzn407x53f010k0hmrl94ipw7rdzdapp8c4cn"; + }; + dependencies = [ + "fog-core" + "fog-json" + "inflecto" + ]; + }; + "fog-core" = { + version = "1.29.0"; + source = { + type = "gem"; + sha256 = "0ayv9j3i7jy2d1l4gw6sfchgb8l62590a6fpvpr7qvdjc79mvm3p"; + }; + dependencies = [ + "builder" + "excon" + "formatador" + "mime-types" + "net-scp" + "net-ssh" + ]; + }; + "fog-ecloud" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0lhxjp6gi48zanqmkblyhxjp0lknl1akifgfk5lq3j3vj2d3pnr8"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-json" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1517sm8bl0bmaw2fbaf5ra6midq3wzgkpm55lb9rw6jm5ys23lyw"; + }; + dependencies = [ + "multi_json" + ]; + }; + "fog-profitbricks" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0hk290cw99qx727sxfhxlmczv9kv15hlnrflh00wfprqxk4r8rd4"; + }; + dependencies = [ + "fog-core" + "fog-xml" + "nokogiri" + ]; + }; + "fog-radosgw" = { + version = "0.0.3"; + source = { + type = "gem"; + sha256 = "1fbpi0sfff5f5hrn4f7ish260cykzcqvzwmvm61i6mprfrfnx10r"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + ]; + }; + "fog-riakcs" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm"; + }; + dependencies = [ + "fog-core" + "fog-json" + "fog-xml" + ]; + }; + "fog-sakuracloud" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1805m44x2pclhjyvdrpj6zg8l9dldgnc20h0g61r7hqxpydz066x"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-serverlove" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "094plkkr6xiss8k85fp66g7z544kxgfx1ck0f3sqndk27miw26jk"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-softlayer" = { + version = "0.4.1"; + source = { + type = "gem"; + sha256 = "1cf6y6xxjjpjglz31kf6jmmyh687x7sxhn4bx3hlr1nb1hcy19sq"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-storm_on_demand" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "0rrfv37x9y07lvdd03pbappb8ybvqb6g8rxzwvgy3mmbmbc6l6d2"; + }; + dependencies = [ + "fog-core" + "fog-json" + ]; + }; + "fog-terremark" = { + version = "0.0.4"; + source = { + type = "gem"; + sha256 = "0bxznlc904zaw3qaxhkvhqqbrv9n6nf5idih8ra9dihvacifwhvc"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-vmfusion" = { + version = "0.0.1"; + source = { + type = "gem"; + sha256 = "0x1vxc4a627g7ambcprhxiqvywy64li90145r96b2ig9z23hmy7g"; + }; + dependencies = [ + "fission" + "fog-core" + ]; + }; + "fog-voxel" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "0by7cs0c044b8dkcmcf3pjzydnrakj8pnbcxzhw8hwlgqr0jfqgn"; + }; + dependencies = [ + "fog-core" + "fog-xml" + ]; + }; + "fog-xml" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "0kgxjwz0mzyp7bgj1ycl9jyfmzfqc1fjdz9sm57fgj5w31jfvxw5"; + }; + dependencies = [ + "fog-core" + "nokogiri" + ]; + }; + "formatador" = { + version = "0.2.5"; + source = { + type = "gem"; + sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + }; + }; + "fuubar" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv"; + }; + dependencies = [ + "rspec" + "ruby-progressbar" + ]; + }; + "hipchat" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "1khcb6cxrr1qn104rl87wq85anigykf45x7knxnyqfpwnbda2nh1"; + }; + dependencies = [ + "httparty" + ]; + }; + "http" = { + version = "0.5.0"; + source = { + type = "gem"; + sha256 = "1vw10xxs0i7kn90lx3b2clfkm43nb59jjph902bafpsaarqsai8d"; + }; + dependencies = [ + "http_parser.rb" + ]; + }; + "http_parser.rb" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + }; + }; + "httparty" = { + version = "0.12.0"; + source = { + type = "gem"; + sha256 = "10y3znh7s1fx88lbnbsmyx5zri6jr1gi48zzzq89wir8q9zlp28c"; + }; + dependencies = [ + "json" + "multi_xml" + ]; + }; + "inflecto" = { + version = "0.0.2"; + source = { + type = "gem"; + sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4"; + }; + }; + "ipaddress" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; + }; + }; + "json" = { + version = "1.8.2"; + source = { + type = "gem"; + sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; + }; + }; + "mail" = { + version = "2.5.4"; + source = { + type = "gem"; + sha256 = "0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4"; + }; + dependencies = [ + "mime-types" + "treetop" + ]; + }; + "memoizable" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "0xhg8c9qw4y35qp1k8kv20snnxk6rlyilx354n1d72r0y10s7qcr"; + }; + dependencies = [ + "thread_safe" + ]; + }; + "metaclass" = { + version = "0.0.4"; + source = { + type = "gem"; + sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; + }; + }; + "mime-types" = { + version = "1.25.1"; + source = { + type = "gem"; + sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + }; + }; + "mini_portile" = { + version = "0.6.2"; + source = { + type = "gem"; + sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w"; + }; + }; + "mocha" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi"; + }; + dependencies = [ + "metaclass" + ]; + }; + "multi_json" = { + version = "1.10.1"; + source = { + type = "gem"; + sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; + }; + }; + "multi_xml" = { + version = "0.5.5"; + source = { + type = "gem"; + sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8"; + }; + }; + "multipart-post" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc"; + }; + }; + "net-scp" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + }; + dependencies = [ + "net-ssh" + ]; + }; + "net-sftp" = { + version = "2.1.2"; + source = { + type = "gem"; + sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + }; + dependencies = [ + "net-ssh" + ]; + }; + "net-ssh" = { + version = "2.9.2"; + source = { + type = "gem"; + sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; + }; + }; + "nokogiri" = { + version = "1.6.6.2"; + source = { + type = "gem"; + sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30"; + }; + dependencies = [ + "mini_portile" + ]; + }; + "open4" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "12jyp97p7pq29q1zmkdrhzvg5cg2x3hlfdbq6asnb9nqlkx6vhf2"; + }; + }; + "pagerduty" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "1ads8bj2swm3gbhr6193ls83pnwsy39xyh3i8sw6rl8fxfdf717v"; + }; + dependencies = [ + "json" + ]; + }; + "polyglot" = { + version = "0.3.3"; + source = { + type = "gem"; + sha256 = "082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v"; + }; + }; + "rspec" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s"; + }; + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + }; + "rspec-core" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn"; + }; + dependencies = [ + "rspec-support" + ]; + }; + "rspec-expectations" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-mocks" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-support" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr"; + }; + }; + "ruby-progressbar" = { + version = "1.7.5"; + source = { + type = "gem"; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + }; + }; + "simple_oauth" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "1vsjhxybif9r53jx4dhhwf80qjkg7gbwpfmskjqns223qrhwsxig"; + }; + }; + "thor" = { + version = "0.18.1"; + source = { + type = "gem"; + sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3"; + }; + }; + "thread_safe" = { + version = "0.1.3"; + source = { + type = "gem"; + sha256 = "0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq"; + }; + dependencies = [ + "atomic" + ]; + }; + "timecop" = { + version = "0.8.0"; + source = { + type = "gem"; + sha256 = "0zf46hkd36y2ywysjfgkvpcc5v04s2rwlg2k7k8j23bh7k8sgiqs"; + }; + }; + "treetop" = { + version = "1.4.15"; + source = { + type = "gem"; + sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz"; + }; + dependencies = [ + "polyglot" + "polyglot" + ]; + }; + "twitter" = { + version = "5.5.0"; + source = { + type = "gem"; + sha256 = "0yl1im3s4svl4hxxsyc60mm7cxvwz538amc9y0vzw6lkiii5f197"; + }; + dependencies = [ + "addressable" + "buftok" + "descendants_tracker" + "equalizer" + "faraday" + "http" + "http_parser.rb" + "json" + "memoizable" + "simple_oauth" + ]; + }; + "unf" = { + version = "0.1.3"; + source = { + type = "gem"; + sha256 = "1f2q8mxxngg8q608r6xajpharp9zz1ia3336y1lsg1asn2ach2sm"; + }; + dependencies = [ + "unf_ext" + ]; + }; + "unf_ext" = { + version = "0.0.6"; + source = { + type = "gem"; + sha256 = "07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg"; + }; + }; + "xml-simple" = { + version = "1.1.4"; + source = { + type = "gem"; + sha256 = "0x5c3mqhahh8hzqqq41659bxj0wn3n6bhj5p6b4hsia2k4akzg6s"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh deleted file mode 100644 index a598dfcf808c..000000000000 --- a/pkgs/tools/compression/bzip2/builder.sh +++ /dev/null @@ -1,24 +0,0 @@ -source $stdenv/setup -installFlags="PREFIX=$out" - -if test -n "$sharedLibrary"; then - - preBuild() { - make -f Makefile-libbz2_so - } - - preInstall() { - mkdir -p $out/lib - mv libbz2.so* $out/lib - (cd $out/lib && ln -s libbz2.so.1.0.? libbz2.so && ln -s libbz2.so.1.0.? libbz2.so.1); - } - -fi - -postInstall() { - rm $out/bin/bunzip2* $out/bin/bzcat* - ln -s bzip2 $out/bin/bunzip2 - ln -s bzip2 $out/bin/bzcat -} - -genericBuild diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 74da91431a43..3e835c30e3d7 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,36 +1,72 @@ -{ stdenv, fetchurl, linkStatic ? false }: +{ stdenv, fetchurl, libtool, autoconf, automake, gnum4, linkStatic ? false }: -let version = "1.0.6"; in +let + version = "1.0.6"; -stdenv.mkDerivation { + sharedLibrary = !stdenv.isDarwin && !(stdenv ? isStatic) + && stdenv.system != "i686-cygwin" && !linkStatic; + +in stdenv.mkDerivation { name = "bzip2-${version}"; - builder = ./builder.sh; - src = fetchurl { url = "http://www.bzip.org/${version}/bzip2-${version}.tar.gz"; sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152"; }; crossAttrs = { - patchPhase = '' + buildInputs = [ libtool autoconf automake gnum4 ]; + patches = [ + # original upstream for the autoconf patch is here: + # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch + # but we get the mingw-builds version of the patch, which fixes + # a few more issues + (fetchurl { + url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch"; + sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp"; + }) + ]; + patchFlags = "-p0"; + postPatch = '' sed -i -e '//s|\\|/|' bzip2.c - sed -i -e 's/CC=gcc/CC=${stdenv.cross.config}-gcc/' \ - -e 's/AR=ar/AR=${stdenv.cross.config}-ar/' \ - -e 's/RANLIB=ranlib/RANLIB=${stdenv.cross.config}-ranlib/' \ - -e 's/bzip2recover test/bzip2recover/' \ - Makefile* ''; + preConfigure = "sh ./autogen.sh"; + # clear native hooks that are not needed with autoconf + preBuild = ""; + preInstall = ""; + postInstall = ""; }; - sharedLibrary = - !stdenv.isDarwin && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; + preBuild = stdenv.lib.optionalString sharedLibrary '' + make -f Makefile-libbz2_so + ''; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin "substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'"; + preInstall = stdenv.lib.optionalString sharedLibrary '' + mkdir -p $out/lib + mv libbz2.so* $out/lib + ( cd $out/lib && + ln -s libbz2.so.1.0.? libbz2.so && + ln -s libbz2.so.1.0.? libbz2.so.1 + ) + ''; - preConfigure = "substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'"; + installFlags = [ "PREFIX=$(out)" ]; - makeFlags = if linkStatic then "LDFLAGS=-static" else ""; + postInstall = '' + rm $out/bin/bunzip2* $out/bin/bzcat* + ln -s bzip2 $out/bin/bunzip2 + ln -s bzip2 $out/bin/bzcat + ''; + + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang' + ''; + + preConfigure = '' + substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man' + ''; + + makeFlags = stdenv.lib.optional linkStatic "LDFLAGS=-static"; inherit linkStatic; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index f8fa5cc264d1..073dc585e74d 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ emery jagajaga ]; + maintainers = with maintainers; [ ehmry jagajaga ]; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 6463d8f89440..baa3900ad97a 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -37,6 +37,8 @@ let touch -r src/stat.c src/tail.c ''; + configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no"; + nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ optional aclSupport acl @@ -81,6 +83,7 @@ let enableParallelBuilding = false; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; + FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1"; makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; @@ -115,6 +118,3 @@ let }; in self - // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { - FORCE_UNSAFE_CONFIGURE = 1; - } diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 220063107803..4b4eb87b0ea7 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Multi-algo CPUMiner"; homepage = https://github.com/wolf9466/cpuminer-multi; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index ec9458e70aeb..e4c161b2e51c 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { { description = "Network boot firmware"; homepage = http://ipxe.org/; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index af8a0dd7d81b..75e00635320a 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.greenwoodsoftware.com/less/; description = "A more advanced file pager than ‘more’"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index 03c913b72244..dc66976720d0 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { description = "Create bootable USB disks using the FAT filesystem and syslinux"; homepage = "http://advancemame.sourceforge.net/boot-readme.html"; license = licenses.gpl2; - maintainers = [ maintainers.emery ]; + maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 52d79a9bd5d2..d21b4fb2f3f8 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils -, kmod, pciutils, smartmontools, x86_energy_perf_policy +, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy , enableRDW ? false, networkmanager }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation { buildInputs = [ perl ]; paths = lib.makeSearchPath "bin" - ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools + ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools x86_energy_perf_policy ] ++ lib.optional enableRDW networkmanager diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/tools/misc/xapian-omega/default.nix new file mode 100644 index 000000000000..68241ac0e907 --- /dev/null +++ b/pkgs/tools/misc/xapian-omega/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib }: + +stdenv.mkDerivation rec { + name = "xapian-omega-${version}"; + version = "1.2.21"; + + src = fetchurl { + url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; + sha256 = "0zjjr4ypanwrjkcpgi37d72v2jjcfwnw8lgddv0i7z2jf1fklbc6"; + }; + + buildInputs = [ pkgconfig xapian perl pcre zlib ]; + + meta = with stdenv.lib; { + description = "Indexer and CGI search front-end built on Xapian library"; + homepage = http://xapian.org/; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 86c3ea4f919b..906ca5f39dd3 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; license = licenses.gpl3; - maintainers = with maintainers; [ viric emery ]; + maintainers = with maintainers; [ viric ehmry ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 14687817835a..3c77d2a6c8d6 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--disable-manual" ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index de8488ab3a8e..f6201b44b3ea 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl, openssl }: +{ stdenv, pkgs, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { majorVersion = "1.5"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "16cg1jmy2d8mq2ypwifsvhbyp4pyrj0zm0r818sx0r4hchwdsrcm"; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl zlib ]; # TODO: make it work on darwin/bsd as well preConfigure = '' - export makeFlags="TARGET=linux2628 PREFIX=$out USE_OPENSSL=yes" + export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else "linux2628"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes" ''; meta = { diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 298e22513681..e3e31e5408b2 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,13 +1,13 @@ { pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { - version = "6.5.7"; + version = "6.6.0"; name = "offlineimap-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"; - sha256 = "18whwc4f8nk8gi3mjw9153c9cvwd3i9i7njmpdbhcplrv33m5pmp"; + sha256 = "1x33zxjm3y2p54lbcsgflrs6v2zq785y2k0xi6xia6akrvjmh4n4"; }; doCheck = false; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index d702e3b9700f..ccb004ffb8c8 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ]; - configureFlags = "--with-xmlrpc-c"; + configureFlags = [ "--with-xmlrpc-c" "--with-posix-fallocate" ]; # postInstall = '' # mkdir -p $out/share/man/man1 $out/share/rtorrent diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index e356d6d65376..b15473ddf4c9 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Validating, recursive, and caching DNS resolver"; license = stdenv.lib.licenses.bsd3; homepage = http://www.unbound.net; - maintainers = [ stdenv.lib.maintainers.emery ]; + maintainers = [ stdenv.lib.maintainers.ehmry ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 5fbd6e83970c..9390207e14ad 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,16 +13,16 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.9"; + name = "gnupg-2.1.10"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1dpp555glln6fldk72ad7lkrn8h3cr2bg714z5kfn2qrawx67dqw"; + sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck"; }; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; + ''; #" fix Emacs syntax highlighting :-( buildInputs = [ pkgconfig libgcrypt libassuan libksba libiconv npth diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index 732cf7046610..24a7ea51a82c 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; homepage = http://pdos.csail.mit.edu/mbox/; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 525259bdb029..9e73c7d4053f 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }: stdenv.mkDerivation rec { - name = "tor-0.2.6.10"; + name = "tor-0.2.7.5"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d"; + sha256 = "0pxayvcab4cb107ynbpzx4g0qyr1mjfba2an76wdx6dxn56rwakx"; }; # Note: torsocks is specified as a dependency, as the distributed diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 001a50458e29..f865b69cfeda 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { doCheck = !( stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 || stdenv.isDarwin # XXX: `locale' segfaults + || stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff? ); buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index e8352e318b9b..242ce36780d1 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ pcre libiconv ]; # cygwin: FAIL: multibyte-white-space - doCheck = !stdenv.isDarwin && !stdenv.isCygwin; + doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin; # On Mac OS X, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 3337fa62a289..67d2df103639 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { { description = "Interpreter for the AWK Programming Language"; homepage = http://invisible-island.net/mawk/mawk.html; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2943469147c4..b412bf1d3f72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16,6 +16,7 @@ # outside of the store. Thus, GCC, GFortran, & co. must always look for # files in standard system directories (/usr/include, etc.) noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-solaris" && system != "x86_64-kfreebsd-gnu") # More flags for the bootstrapping of stdenv. @@ -656,6 +657,8 @@ let azureus = callPackage ../tools/networking/p2p/azureus { }; + backup = callPackage ../tools/backup/backup { }; + basex = callPackage ../tools/text/xml/basex { }; babeld = callPackage ../tools/networking/babeld { }; @@ -761,6 +764,8 @@ let gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + certificate-transparency = callPackage ../servers/certificate-transparency { }; + image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; ccnet = callPackage ../tools/networking/ccnet { }; @@ -929,6 +934,7 @@ let asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; + w3m = w3m-batch; enableStandardFeatures = false; }; @@ -1565,7 +1571,7 @@ let garmintools = callPackage ../development/libraries/garmintools {}; gawk = callPackage ../tools/text/gawk { - locale = darwin.adv_cmds; + inherit (darwin) locale; }; gawkInteractive = appendToName "interactive" @@ -3155,7 +3161,9 @@ let stricat = callPackage ../tools/security/stricat { }; - privoxy = callPackage ../tools/networking/privoxy { }; + privoxy = callPackage ../tools/networking/privoxy { + w3m = w3m-batch; + }; swaks = callPackage ../tools/networking/swaks { }; @@ -3607,7 +3615,7 @@ let xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { }; xmlto = callPackage ../tools/typesetting/xmlto { - w3m = w3m.override { graphicsSupport = false; }; + w3m = w3m-batch; }; xmltv = callPackage ../tools/misc/xmltv { }; @@ -3920,7 +3928,7 @@ let inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64)); # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -4222,6 +4230,8 @@ let openblas = openblasCompat; }; + kotlin = callPackage ../development/compilers/kotlin { }; + lazarus = callPackage ../development/compilers/fpc/lazarus.nix { fpc = fpc; }; @@ -4786,7 +4796,11 @@ let rtags = callPackage ../development/tools/rtags/default.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; - rustc = callPackage ../development/compilers/rustc {}; + rustc = callPackage ../development/compilers/rustc { + callPackage = newScope ({ + procps = if stdenv.isDarwin then darwin.ps else procps; + }); + }; rustPlatform = rustStable; @@ -5506,12 +5520,12 @@ let cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { wantPS = stdenv.isDarwin; - ps = if stdenv.isDarwin then darwin.adv_cmds else null; + inherit (darwin) ps; }; cmake = callPackage ../development/tools/build-managers/cmake { wantPS = stdenv.isDarwin; - ps = if stdenv.isDarwin then darwin.adv_cmds else null; + inherit (darwin) ps; }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -5632,8 +5646,7 @@ let jdepend = callPackage ../development/tools/analysis/jdepend { }; flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; - flex_2_5_39 = callPackage ../development/tools/parsing/flex/2.5.39.nix { }; - flex = flex_2_5_39; + flex = callPackage ../development/tools/parsing/flex/default.nix { }; flexcpp = callPackage ../development/tools/parsing/flexc++ { }; @@ -8341,6 +8354,8 @@ let simgear = callPackage ../development/libraries/simgear { }; + simp_le = callPackage ../tools/admin/simp_le { }; + sfml = callPackage ../development/libraries/sfml { }; signon = callPackage ../development/libraries/signon/old.nix {}; @@ -8674,6 +8689,8 @@ let xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix { # TODO perl php Java, tcl, C#, python }; + xapian-omega = callPackage ../tools/misc/xapian-omega {}; + xavs = callPackage ../development/libraries/xavs { }; Xaw3d = callPackage ../development/libraries/Xaw3d { }; @@ -9248,7 +9265,7 @@ let mpd = callPackage ../servers/mpd { aacSupport = config.mpd.aacSupport or true; - clientSupport = config.mpd.clientSupport or false; + clientSupport = config.mpd.clientSupport or true; ffmpegSupport = config.mpd.ffmpegSupport or true; opusSupport = config.mpd.opusSupport or true; @@ -11227,7 +11244,12 @@ let pulseSupport = config.pulseaudio or true; }; - cmus = callPackage ../applications/audio/cmus { }; + cmus = callPackage ../applications/audio/cmus { + libjack = libjack2; + libcdio = libcdio082; + + pulseaudioSupport = config.pulseaudio or false; + }; CompBus = callPackage ../applications/audio/CompBus { }; @@ -11278,6 +11300,8 @@ let cvs2svn = callPackage ../applications/version-management/cvs2svn { }; + cwm = callPackage ../applications/window-managers/cwm { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; d4x = callPackage ../applications/misc/d4x { }; @@ -11401,7 +11425,7 @@ let imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { @@ -11829,6 +11853,10 @@ let python = python27; }; + git-review = callPackage ../applications/version-management/git-review { + python = python27; + }; + gitolite = callPackage ../applications/version-management/gitolite { }; inherit (gnome3) gitg; @@ -13387,17 +13415,23 @@ let virtinst = callPackage ../applications/virtualization/virtinst {}; - virtualgl = callPackage ../tools/X11/virtualgl { }; + virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { + fltk = fltk13; + }; + + virtualgl = callPackage ../tools/X11/virtualgl { + virtualglLib_i686 = if system == "x86_64-linux" + then pkgsi686Linux.virtualglLib + else null; + }; + + primusLib = callPackage ../tools/X11/primus/lib.nix { + nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; + }; primus = callPackage ../tools/X11/primus { - primusLib = callPackage ../tools/X11/primus/lib.nix { - nvidia = linuxPackages.nvidia_x11; - }; - primusLib_i686 = if system == "x86_64-linux" - then callPackage_i686 ../tools/X11/primus/lib.nix { - nvidia = pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }; - } + then pkgsi686Linux.primusLib else null; }; @@ -13406,17 +13440,11 @@ let nvidia_x11_i686 = if system == "x86_64-linux" then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } else null; - virtualgl = virtualgl; - virtualgl_i686 = if system == "x86_64-linux" - then pkgsi686Linux.virtualgl + primusLib_i686 = if system == "x86_64-linux" + then pkgsi686Linux.primusLib else null; }; - # use if you intend to connect the nvidia card to a monitor - bumblebee_display = bumblebee.override { - useDisplayDevice = true; - }; - vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = callPackage ../applications/video/vlc { @@ -13439,8 +13467,21 @@ let vym = callPackage ../applications/misc/vym { }; - w3m = callPackage ../applications/networking/browsers/w3m { + w3m = callPackage ../applications/networking/browsers/w3m { }; + + # Should always be the version with the most features + w3m-full = w3m; + + # Version without X11 + w3m-nox = w3m.override { + x11Support = false; + }; + + # Version for batch text processing, not a good browser + w3m-batch = w3m.override { graphicsSupport = false; + x11Support = false; + mouseSupport = false; }; weechat = callPackage ../applications/networking/irc/weechat { @@ -13570,6 +13611,7 @@ let ++ optional (config.kodi.enableGenesis or false) genesis ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher + ++ optional (config.kodi.enablePVRHTS or false) pvr-hts ); }; @@ -13644,7 +13686,9 @@ let xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; - xdg_utils = callPackage ../tools/X11/xdg-utils { }; + xdg_utils = callPackage ../tools/X11/xdg-utils { + w3m = w3m-batch; + }; xdotool = callPackage ../tools/X11/xdotool { }; @@ -15460,6 +15504,8 @@ let tvheadend = callPackage ../servers/tvheadend { }; + ums = callPackage ../servers/ums { }; + urbit = callPackage ../misc/urbit { }; utf8proc = callPackage ../development/libraries/utf8proc { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 98da54879f3f..d457efce4d4b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -315,12 +315,12 @@ let self = _self // overrides; bind-key = melpaBuild { pname = "bind-key"; - version = "20150317"; + version = "20150321"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; - sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; + rev = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01"; + sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0"; }; files = [ "bind-key.el" ]; meta = { @@ -691,6 +691,23 @@ let self = _self // overrides; }; }; + f = melpaBuild rec { + pname = "f"; + version = "20151113"; + src = fetchFromGitHub { + owner = "rejeep"; + repo = "f.el"; + rev = "e0259ee060ff9a3f12204adcc8630869080acd68"; + sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1"; + }; + fileSpecs = [ "f.el" ]; + packageRequires = [ dash s ]; + meta = { + description = "Emacs library for working with files and directories"; + license = gpl3Plus; + }; + }; + find-file-in-project = melpaBuild rec { pname = "find-file-in-project"; version = "3.5"; @@ -1014,22 +1031,6 @@ let self = _self // overrides; }; }; - helm-swoop = melpaBuild rec { - pname = "helm-swoop"; - version = "20141224"; - src = fetchFromGitHub { - owner = "ShingoFukuyama"; - repo = pname; - rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; - sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; - }; - packageRequires = [ helm ]; - meta = { - description = "An Emacs mode which constructs an editable grep for a buffer"; - license = gpl3Plus; - }; - }; - helm = melpaBuild rec { pname = "helm"; version = "20150105"; @@ -1046,6 +1047,38 @@ let self = _self // overrides; }; }; + helm-bibtex = melpaBuild rec { + pname = "helm-bibtex"; + version = "20151125"; + src = fetchFromGitHub { + owner = "tmalsburg"; + repo = pname; + rev = "bfcd5064dcc7c0ac62c46985832b2a73082f96e0"; + sha256 = "1nvc4ha9wj5j47qg7hdbv1xpjy8a8idc9vc2myl3xa33ywllwdwi"; + }; + packageRequires = [ dash f helm parsebib s ]; + meta = { + description = "Bibliography Manager for Emacs"; + license = gpl2; + }; + }; + + helm-swoop = melpaBuild rec { + pname = "helm-swoop"; + version = "20141224"; + src = fetchFromGitHub { + owner = "ShingoFukuyama"; + repo = pname; + rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; + sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; + }; + packageRequires = [ helm ]; + meta = { + description = "An Emacs mode which constructs an editable grep for a buffer"; + license = gpl3Plus; + }; + }; + hi2 = melpaBuild rec { pname = "hi2"; version = "1.0"; @@ -1444,6 +1477,21 @@ let self = _self // overrides; }; }; + parsebib = melpaBuild rec { + pname = "parsebib"; + version = "20151006"; + src = fetchFromGitHub { + owner = "joostkremers"; + repo = pname; + rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"; + sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml"; + }; + meta = { + description = "Emacs library for reading .bib files"; + license = bsd3; + }; + }; + perspective = melpaBuild rec { pname = "perspective"; version = "1.12"; @@ -1642,12 +1690,12 @@ let self = _self // overrides; s = melpaBuild rec { pname = "s"; - version = "20140910"; + version = "20151023"; src = fetchFromGitHub { owner = "magnars"; repo = "${pname}.el"; - rev = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d"; - sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f"; + rev = "372e94c1a28031686d75d6c52bfbe833a118a72a"; + sha256 = "1zn8n3mv0iscs242dbkf5vmkkizfslq5haw9z0d0g3wknq18286h"; }; meta = { description = "String manipulation library for Emacs"; @@ -1838,12 +1886,12 @@ let self = _self // overrides; use-package = melpaBuild rec { pname = "use-package"; - version = "20150317"; + version = "20151112"; src = fetchFromGitHub { owner = "jwiegley"; repo = pname; - rev = "b836266ddfbc835efdb327ecb389ff9e081d7c55"; - sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i"; + rev = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01"; + sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0"; }; packageRequires = [ bind-key diminish ]; files = [ "use-package.el" ]; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 5b7a254cc58b..70dda19bc8ee 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -846,6 +846,14 @@ let sha256 = "1nyg6sckwd0iafs9vcmgbga2k3hid2q0avhwj29qbdhj3l78xi47"; }; + gocryptfs = buildFromGitHub { + rev = "v0.5"; + owner = "rfjakob"; + repo = "gocryptfs"; + sha256 = "0jsdz8y7a1fkyrfwg6353c9r959qbqnmf2cjh57hp26w1za5bymd"; + buildInputs = [ crypto go-fuse openssl-spacemonkey ]; + }; + gocheck = buildGoPackage rec { rev = "87"; name = "gocheck-${rev}"; @@ -2124,6 +2132,18 @@ let ''; }; + # reintroduced for gocrytpfs as I don't understand the 10gen/spacemonkey split + openssl-spacemonkey = buildFromGitHub rec { + rev = "71f9da2a482c2b7bc3507c3fabaf714d6bb8b75d"; + name = "openssl-${stdenv.lib.strings.substring 0 7 rev}"; + owner = "spacemonkeygo"; + repo = "openssl"; + sha256 = "1byxwiq4mcbsj0wgaxqmyndp6jjn5gm8fjlsxw9bg0f33a3kn5jk"; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.openssl ]; + propagatedBuildInputs = [ spacelog ]; + }; + opsgenie-go-sdk = buildFromGitHub { rev = "c6e1235dfed2126eb9b562c4d776baf55ccd23e3"; date = "2015-08-24"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa42b736e128..59e7ae2b2a59 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5304,11 +5304,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTMLParser ]; }; - HTMLTableExtract = buildPerlPackage { - name = "HTML-TableExtract-2.11"; + HTMLTableExtract = buildPerlPackage rec { + name = "HTML-TableExtract-2.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.11.tar.gz; - sha256 = "1861d55a2aa1728ef56ea2d08d630b9a008456f1106994e4e49e76f56e4955ee"; + url = "mirror://cpan/authors/id/M/MS/MSISK/${name}.tar.gz"; + sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; }; propagatedBuildInputs = [ HTMLElementExtended HTMLParser ]; }; @@ -6552,7 +6552,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "The World-Wide Web library for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.illumos; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9247fc44049..d25a3d1dfda4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -230,6 +230,21 @@ in modules // { }; }; + acme = buildPythonPackage rec { + inherit (pkgs.letsencrypt) src version; + + name = "acme-${version}"; + + propagatedBuildInputs = with self; [ + cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock + ndg-httpsclient + ]; + + buildInputs = with self; [ nose ]; + + sourceRoot = "letsencrypt-${version}/acme"; + }; + actdiag = buildPythonPackage rec { name = "actdiag-0.5.3"; @@ -9834,6 +9849,24 @@ in modules // { }; }); + modestmaps = buildPythonPackage rec { + name = "ModestMaps-1.4.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/M/ModestMaps/${name}.tar.gz"; + sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3"; + }; + + disabled = !isPy27; + propagatedBuildInputs = with self; [ pillow ]; + + meta = { + description = "A library for building interactive maps"; + homepage = http://modestmaps.com; + license = stdenv.lib.licenses.bsd3; + }; + }; + moinmoin = buildPythonPackage (rec { name = "moinmoin-${ver}"; disabled = isPy3k; @@ -10190,6 +10223,8 @@ in modules // { monotonic = buildPythonPackage rec { name = "monotonic-0.4"; + __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/monotonic/${name}.tar.gz"; sha256 = "1diab6hfh3jpa1f0scpqaqrawk4g97ss4v7gkn2yw8znvdm6abw5"; @@ -12338,9 +12373,9 @@ in modules // { }; propagatedBuildInputs = with self; [ - pbr Babel six iso8601 debtcollector pyinotify + pbr Babel six iso8601 debtcollector oslo-utils oslo-i18n oslo-config oslo-serialization oslo-context - ]; + ] ++ stdenv.lib.optional stdenv.isLinux pyinotify; buildInputs = with self; [ oslotest oslosphinx ]; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf @@ -12550,7 +12585,7 @@ in modules // { (if isPy35 then null else html5lib) modules.sqlite3 beautifulsoup4 - ] ++ optional isDarwin pkgs.darwin.adv_cmds; # provides the locale command + ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command # For OSX, we need to add a dependency on libcxx, which provides # `complex.h` and other libraries that pandas depends on to build. @@ -21756,6 +21791,8 @@ in modules // { sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|" tests/test_streams.py sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|" tests/test_streams.py sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|" tests/test_streams.py + sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|" tests/test_events.py + sed -i -e "s|test_write_pty|skip_test_write_pty|" tests/test_events.py sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|" tests/test_streams.py sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py