diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml index 35eac42e0cf..c3d4ae8fb51 100644 --- a/doc/haskell-users-guide.xml +++ b/doc/haskell-users-guide.xml @@ -95,7 +95,7 @@ $ nix-env -qaP coreutils nixos.coreutils coreutils-8.23 - If your system responds like that (most NixOS installatios will), + If your system responds like that (most NixOS installations will), then the attribute path to haskellPackages is nixos.haskellPackages. Thus, if you want to use nix-env without giving an explicit @@ -600,6 +600,12 @@ $ nix-shell "<nixpkgs>" -A haskellPackages.bar.env }; } + + Then, replace instances of haskellPackages in the + cabal2nix-generated default.nix + or shell.nix files with + profiledHaskellPackages. +
How to override package versions in a compiler-specific @@ -812,7 +818,7 @@ export NIX_CFLAGS_LINK="-L/usr/lib" <para> <link xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-April/016912.html">Part 3</link> describes the infrastructure that keeps the - Haskell package set in Nixpkgs uptodate. + Haskell package set in Nixpkgs up-to-date. </para> </listitem> </itemizedlist> diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4ad066b7599..ccce0d2e60d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -152,6 +152,7 @@ linus = "Linus Arver <linusarver@gmail.com>"; lnl7 = "Daiderd Jordan <daiderd@gmail.com>"; lovek323 = "Jason O'Conal <jason@oconal.id.au>"; + lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>"; lsix = "Lancelot SIX <lsix@lancelotsix.com>"; ludo = "Ludovic Courtès <ludo@gnu.org>"; madjar = "Georges Dubus <georges.dubus@compiletoi.net>"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ee54ce7ef4..6734fa0b862 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -393,6 +393,7 @@ ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix ./services/web-servers/nginx/default.nix + ./services/web-servers/nginx/reverse_proxy.nix ./services/web-servers/phpfpm.nix ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index fe50c182bfe..b16f701a0c9 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -11,7 +11,9 @@ let ${cfg.config} ${optionalString (cfg.httpConfig != "") '' http { - ${cfg.httpConfig} + ${cfg.httpConfig} + ${cfg.httpServers} + ${cfg.httpDefaultServer} } ''} ${cfg.appendConfig} @@ -60,7 +62,32 @@ in httpConfig = mkOption { type = types.lines; default = ""; - description = "Configuration lines to be appended inside of the http {} block."; + description = '' + Configuration lines to be placed at the top inside of + the http {} block. The option is intended to be used for + the default configuration of the servers. + ''; + }; + + httpServers = mkOption { + type = types.lines; + default = ""; + description = '' + Configuration lines to be placed inside of the http {} + block. The option is intended to be used for defining + individual servers. + ''; + }; + + httpDefaultServer = mkOption { + type = types.lines; + default = ""; + description = '' + Configuration lines to be placed at the bottom inside of + the http {} block. The option is intended to be used for + setting up the default servers. The default server is used + if no previously specified server matches a request. + ''; }; stateDir = mkOption { diff --git a/nixos/modules/services/web-servers/nginx/reverse_proxy.nix b/nixos/modules/services/web-servers/nginx/reverse_proxy.nix new file mode 100644 index 00000000000..c21406dff29 --- /dev/null +++ b/nixos/modules/services/web-servers/nginx/reverse_proxy.nix @@ -0,0 +1,233 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.nginx; + + defaultSSL = cfg.httpDefaultKey != null || cfg.httpDefaultCertificate != null; + + validSSL = key: cert: cert != null && key != null || cert == null && key == null; + +in + +{ + options = { + + services.nginx = { + + reverseProxies = mkOption { + type = types.attrsOf (types.submodule ( + { + options = { + proxy = mkOption { + type = types.str; + default = []; + description = '' + Exclude files and directories matching these patterns. + ''; + }; + + key = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Exclude files and directories matching these patterns. + ''; + }; + + certificate = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Exclude files and directories matching these patterns. + ''; + }; + }; + } + )); + + default = {}; + + example = literalExample '' + { + "hydra.yourdomain.org" = + { proxy = "localhost:3000"; + key = "/etc/nixos/certs/hydra_key.key"; + certificate = "/etc/nixos/certs/hydra_cert.crt"; + }; + } + ''; + + description = '' + A reverse proxy server configuration is created for every attribute. + The attribute name corresponds to the name the server is listening to, + and the proxy option defines the target to forward the requests to. + If a key and certificate are given, then the server is secured through + a SSL connection. Non-SSL requests on port 80 are automatically + re-directed to the SSL server on port 443. + ''; + }; + + httpDefaultKey = mkOption { + type = types.nullOr types.path; + default = null; + example = "/etc/nixos/certs/defaut_key.key"; + description = '' + Key of SSL certificate for default server. + The default certificate is presented by the default server during + the SSL handshake when no specialized server configuration matches + a request. + A default SSL certificate is also helpful if browsers do not + support the TLS Server Name Indication extension (SNI, RFC 6066). + ''; + }; + + httpDefaultCertificate = mkOption { + type = types.nullOr types.path; + default = null; + example = "/etc/nixos/certs/defaut_key.crt"; + description = '' + SSL certificate for default server. + The default certificate is presented by the default server during + the SSL handshake when no specialized server configuration matches + a request. + A default SSL certificate is also helpful if browsers do not + support the TLS Server Name Indication extension (SNI, RFC 6066). + ''; + }; + + }; + + }; + + + config = mkIf (cfg.reverseProxies != {}) { + + assertions = [ + { assertion = all id (mapAttrsToList (n: v: validSSL v.certificate v.key) cfg.reverseProxies); + message = '' + One (or more) reverse proxy configurations specify only either + the key option or the certificate option. Both certificate + with associated key have to be configured to enable SSL for a + server configuration. + + services.nginx.reverseProxies: ${toString cfg.reverseProxies} + ''; + } + { assertion = validSSL cfg.httpDefaultCertificate cfg.httpDefaultKey; + message = '' + The default server configuration specifies only either the key + option or the certificate option. Both httpDefaultCertificate + with associated httpDefaultKey have to be configured to enable + SSL for the default server configuration. + + services.nginx.httpDefaultCertificate: ${toString cfg.httpDefaultCertificate} + + services.nginx.httpDefaultKey : ${toString cfg.httpDefaultKey} + ''; + } + ]; + + services.nginx.config = mkBefore '' + worker_processes 1; + error_log logs/error.log debug; + pid logs/nginx.pid; + events { + worker_connections 1024; + } + ''; + + services.nginx.httpConfig = mkBefore '' + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + access_log logs/access.log main; + sendfile on; + tcp_nopush on; + keepalive_timeout 10; + gzip on; + + ${lib.optionalString defaultSSL '' + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers HIGH:!aNULL:!MD5; + ssl_certificate ${cfg.httpDefaultCertificate}; + ssl_certificate_key ${cfg.httpDefaultKey}; + ''} + ''; + + services.nginx.httpDefaultServer = mkBefore '' + # reject as default policy + server { + listen 80 default_server; + listen [::]:80 default_server; + ${lib.optionalString defaultSSL "listen 443 default_server ssl;"} + return 444; + } + ''; + + services.nginx.httpServers = + let + useSSL = certificate: key: certificate != null && key != null; + + server = servername: proxy: certificate: key: useSSL: '' + server { + server_name ${servername}; + keepalive_timeout 70; + + ${if !useSSL then '' + listen 80; + listen [::]:80; + '' else '' + listen 443 ssl; + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 10m; + ssl_certificate ${certificate}; + ssl_certificate_key ${key}; + ''} + + location / { + proxy_pass ${proxy}; + + ### force timeouts if one of backend is dead ## + proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; + + ### Set headers #### + proxy_set_header Accept-Encoding ""; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + ${lib.optionalString useSSL '' + ### Most PHP, Python, Rails, Java App can use this header ### + #proxy_set_header X-Forwarded-Proto https;## + #This is better## + proxy_set_header X-Forwarded-Proto $scheme; + add_header Front-End-Https on; + ''} + + ### By default we don't want to redirect it #### + proxy_redirect off; + proxy_buffering off; + } + } + + ${lib.optionalString useSSL '' + # redirect http to https + server { + listen 80; + listen [::]:80; + server_name ${servername}; + return 301 https://$server_name$request_uri; + } + ''} + ''; + in + concatStrings (mapAttrsToList (n: v: server n v.proxy v.certificate v.key (useSSL v.proxy v.certificate)) cfg.reverseProxies); + + }; + +} diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 3425ca09951..f5e0159f1c7 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -11,13 +11,8 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.enable = true; - services.xserver.displayManager.gdm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; + services.xserver.displayManager.auto.enable = true; + services.xserver.displayManager.auto.user = "alice"; services.xserver.desktopManager.gnome3.enable = true; virtualisation.memorySize = 512; @@ -26,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' $machine->waitForX; - $machine->sleep(60); + $machine->sleep(15); # Check that logging in has given the user ownership of devices. $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index b43ce1b8e68..3fee1d32538 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -67,6 +67,7 @@ in $proxy->waitForUnit("httpd"); $backend1->waitForUnit("httpd"); $backend2->waitForUnit("httpd"); + $client->waitForUnit("network.target"); # With the back-ends up, the proxy should work. $client->succeed("curl --fail http://proxy/"); diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 5f6538ec4bc..4ba086d8848 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.0.60"; src = fetchurl { - url = "mirror://sourceforge/calf/${name}.tar.gz"; + url = "http://calf-studio-gear.org/files/${name}.tar.gz"; sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"; }; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 410ddb4c6f1..d1828016de3 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch"; - sha256 = "0a04l2607y3swcq9b1apffl1chdwj38jwfiizxcfmdbia4a0qlyg"; + sha256 = "1530w968zyvcm9c8k57889n125k7a1kk3ydinjm398n07gypd599"; }) ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index cfc15ed87bf..b07b889ca13 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "digikam-4.11.0"; + name = "digikam-4.12.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; - sha256 = "1nak3w0717fpbpmklzd3xkkbp2mwi44yxnc789wzmi9d8z9n3jwh"; + sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; diff --git a/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch b/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch new file mode 100644 index 00000000000..b2679b95a86 --- /dev/null +++ b/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch @@ -0,0 +1,28 @@ +From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 30 Aug 2015 07:05:03 -0500 +Subject: [PATCH] qalculate filename string type + +--- + src/backends/qalculate/qalculateexpression.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp +index 1891baa..b2a1984 100644 +--- a/src/backends/qalculate/qalculateexpression.cpp ++++ b/src/backends/qalculate/qalculateexpression.cpp +@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand() + if (plotParameters.filetype == PLOT_FILETYPE_EPS || + plotParameters.filetype == PLOT_FILETYPE_PS || + (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 && +- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) || ++ plotParameters.filename.substr(p-4,4) == basic_string<char>(".eps")) || + (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 && +- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps"))) ++ plotParameters.filename.substr(p-3,3) == basic_string<char>(".ps"))) + setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str()))); + else + setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str()))); +-- +2.5.0 + diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 5c36b735338..83aca36bc00 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -223,6 +223,10 @@ let ''; }; + cantor = extendDerivation (kde4Package super.cantor) { + patches = [ ./cantor/0001-qalculate-filename-string-type.patch ]; + }; + cervisia = kde4Package super.cervisia; dolphin-plugins = kde4Package super.dolphin-plugins; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index a57647e18e7..a5b90890df2 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,17 +5,18 @@ let if stdenv.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "1np8fkmgcwfjv82v4y1lkqcgfki368w6317gac3i0vlqi4qbfjiq"; + sha256 = "15x3nvhxk4f0rga0i99c6lhaa1rwdi446kxnx1l4jprhbl788sx6"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "0bb0kzayj0wwvyh1b8g0l3aw2xqlrkhn85j3aw90xmchnsx42xh5"; + sha256 = "0ibdlx8fdlmh81908d1syb7c5lf88pqp49fl7r43cj6bybpdx411"; }; in stdenv.mkDerivation { - name = "rescuetime-2.8.8.1040"; + # https://www.rescuetime.com/updates/linux_release_notes.html + name = "rescuetime-2.8.9.1170"; inherit src; buildInputs = [ dpkg makeWrapper ]; unpackPhase = '' diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix index 20f2bcc1700..7a8c9dfd71e 100644 --- a/pkgs/applications/misc/rofi/pass.nix +++ b/pkgs/applications/misc/rofi/pass.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.0"; + version = "1.2"; src = fetchgit { url = "https://github.com/carnager/rofi-pass"; rev = "refs/tags/${version}"; - sha256 = "16k7bj5mf5alfks8mylp549q3lmpbxjsrsgyj7gibdmhjz768jz3"; + sha256 = "1dlaplr18qady5g8sp8xgiqdw81mfx9iisihf8appr5s4sjm559h"; }; buildInputs = [ rofi wmctrl xprop xdotool ]; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 409f7d29ba2..db51dc8b148 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation { ${ lib.optionalString libtrick '' - sed -e "s@exec @exec -a '$out/bin/${browserName}${nameSuffix}' @" -i "$out/bin/${browserName}${nameSuffix}" libdirname="$(echo "${browser}/lib/${browserName}"*)" libdirbasename="$(basename "$libdirname")" mkdir -p "$out/lib/$libdirbasename" diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index c61b0e8a70c..65f9ef50f77 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xorg, gtk, glib, gdk_pixbuf, dpkg, libXext, libXfixes -, libXrender, libuuid, libXrandr, libXcomposite +, libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio }: with stdenv.lib; @@ -10,7 +10,7 @@ let [gtk glib stdenv.cc.cc]; rpathPlugin = makeLibraryPath - [ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libuuid libXcomposite ]; + [ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libuuid libXcomposite libpulseaudio ]; in diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 3231e2a7b80..eebe6ff0a06 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -14,17 +14,17 @@ let saw-bin = if stdenv.system == "i686-linux" then fetchurl { - url = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-32.tar.gz"; - sha256 = "0hfb3a749fvwn33jnj1bgpk7v4pbvjjjffhafck6s8yz2sknnq4w"; + url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz"; + sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9"; } else fetchurl { - url = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-64.tar.gz"; - sha256 = "1yz56kr8s0jcrfk1i87x63ngxip2i1s123arydnqq8myjyfz8id9"; + url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-64.tar.gz"; + sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr"; }; in stdenv.mkDerivation rec { name = "saw-tools-${version}"; - version = "0.1-20150609"; + version = "0.1.1-20150731"; src = saw-bin; 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 dde5b7cc603..fce2d07c9ee 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.5.0"; + version = "2.5.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0p747j94kynrx71qaamc9i0dkq5vqpv66a47b68pmin1qsxb2nfc"; + sha256 = "03r2shbya0g3adya336jpc6kcn2s0fmn5p5bs1s8q6r232qvgkmk"; }; patches = [ diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 795299892ed..eeefc4744a2 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-08-24"; + version = "2015-08-31"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -27,10 +27,10 @@ stdenv.mkDerivation { "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "10jdh5dknk5y1kawgp5ijg6c74a7nrmmhhw75q9x82l151irdfky"; + "0pg3715cjmajrfr5xad3g9z386gyk35zq3zkk7ah6sfidavik6vc"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "10yrkilf0mx6i61zg2r2sd0dn2lwvq8k97jfwv8ysvq98lxb51a1"; + "1ajk18ydzhwflki25cp7fhzfphysgndig3h0f9p655qhsm0c3gzj"; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix deleted file mode 100644 index 34c2e3b36b0..00000000000 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }: - -let - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - ''; - - # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 - # This should be removed when GHC includes Cabal > 1.22.2.0 - cabalPatch = fetchpatch { - url = https://github.com/haskell/cabal/commit/f11b7c858bb25be78b81413c69648c87c446859e.patch; - sha256 = "1z56yyc7lgc78g847qf19f5n1yk054pzlnc2i178dpsj0mgjppyb"; - }; - -in - -stdenv.mkDerivation rec { - version = "7.10.1"; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1/${name}-src.tar.xz"; - sha256 = "181srnj3s5dcqb096yminjg50lq9cx57075n95y5hz33gbbf7wwj"; - }; - - buildInputs = [ ghc perl ]; - - enableParallelBuilding = true; - - patches = [ - # Fix user pkg db location for GHCJS: - # https://ghc.haskell.org/trac/ghc/ticket/10232 - (fetchpatch { - url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984"; - sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w"; - }) - # Fix TH + indirect symbol resolution on OSX (or any system using gold linker) - # https://phabricator.haskell.org/D852 - ./osx-dylib-resolver.patch - ]; - - postPatch = '' - pushd libraries/Cabal - patch -p1 < ${cabalPatch} - popd - ''; - - preConfigure = '' - echo >mk/build.mk "${buildMK}" - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" - ]; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 064610c3557..73fcd788c74 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils }: +{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +}: let @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; }; - buildInputs = [ ghc perl ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; enableParallelBuilding = true; @@ -47,6 +49,9 @@ stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do test ! -h $i || continue diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 3082a53137b..306e287fbc2 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -6,10 +6,10 @@ let in stdenv.mkDerivation rec { name = "mono-${version}"; - version = "4.0.2.5"; + version = "4.0.3.20"; src = fetchurl { url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; - sha256 = "0lfndz7l3j593wilyczb5w6kvrdbf2fsd1i46qlszfjvx975hx5h"; + sha256 = "1z0k8gv5z3yrkjhi2yjaqj42p55jn5h3q4z890gkcrlvmgihnv4p"; }; buildInputs = diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 5d65fbc0dea..4412b3d535c 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -84,7 +84,7 @@ go.stdenv.mkDerivation ( local d; local cmd; cmd="$1" d="$2" - echo "$d" | grep -q "/_" && return 0 + echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e107e0b1458..3cef7eeebff 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -430,6 +430,7 @@ self: super: { language-slice = dontCheck super.language-slice; lensref = dontCheck super.lensref; liquidhaskell = dontCheck super.liquidhaskell; + lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 lvmrun = dontCheck super.lvmrun; memcache = dontCheck super.memcache; milena = dontCheck super.milena; @@ -818,9 +819,6 @@ self: super: { # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; - # https://github.com/ekmett/comonad/issues/25 - comonad = dontCheck super.comonad; - # https://github.com/jaspervdj/websockets/issues/104 websockets = dontCheck super.websockets; @@ -1015,10 +1013,7 @@ self: super: { # https://github.com/basvandijk/concurrent-extra/issues/12 concurrent-extra = dontCheck super.concurrent-extra; - # https://github.com/brendanhay/amazonka/issues/203 - amazonka-core = dontCheck super.amazonka-core; - - # https://github.com/agocorona/MFlow/issues/63 - MFlow = addBuildTool super.MFlow self.cpphs; + # https://github.com/GaloisInc/DSA/issues/1 + DSA = dontCheck super.DSA; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index f76719a3117..c04d8fdb409 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -130,7 +130,7 @@ in assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ - name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}"; + name = "${pname}-${version}"; pos = builtins.unsafeGetAttrPos "pname" args; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 33b0bf30d00..831556432b9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5018,11 +5018,11 @@ self: { ({ mkDerivation, base, containers, HUnit, parsec }: mkDerivation { pname = "Folly"; - version = "0.1.3.0"; - sha256 = "f155359eff68c5873057836478883804335275aa585d405774bd35f5a07efd79"; + version = "0.1.4.6"; + sha256 = "fabe878ab40e0fe8187ee40e6d4b4d0a83e6b34c42e404f04d2b4afa3e1038f6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; + libraryHaskellDepends = [ base containers parsec ]; executableHaskellDepends = [ base containers HUnit parsec ]; homepage = "https://github.com/dillonhuff/Folly"; description = "A first order logic library in Haskell"; @@ -6542,23 +6542,23 @@ self: { }) {}; "HGamer3D" = callPackage - ({ mkDerivation, base, HGamer3D-Audio, HGamer3D-Common - , HGamer3D-Data, HGamer3D-Graphics3D, HGamer3D-InputSystem - , HGamer3D-Network + ({ mkDerivation, base, bytestring, cereal, clock, containers + , directory, filepath, hgamer3d0, messagepack, text, Urho3D, vect }: mkDerivation { pname = "HGamer3D"; - version = "0.5.0"; - sha256 = "670dbc3b159981e248800007a89a281393771fca68111f703e70fce7eb95b302"; + version = "0.6.0"; + sha256 = "e0d1a900db2d0e10b96c242508485789ca31e5a074978fb99a4804b78cc13db7"; libraryHaskellDepends = [ - base HGamer3D-Audio HGamer3D-Common HGamer3D-Data - HGamer3D-Graphics3D HGamer3D-InputSystem HGamer3D-Network + base bytestring cereal clock containers directory filepath + messagepack text vect ]; + librarySystemDepends = [ hgamer3d0 Urho3D ]; homepage = "http://www.hgamer3d.org"; - description = "A Toolset for the Haskell Game Programmer"; + description = "Toolset for the Haskell Game Programmer"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {Urho3D = null; hgamer3d0 = null;}; "HGamer3D-API" = callPackage ({ mkDerivation, base, haskell98, HGamer3D-Data @@ -7720,20 +7720,19 @@ self: { "HUnit-Plus" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers - , directory, hashable, hexpat, hostname, old-locale, parsec, time - , timeit + , directory, hashable, hexpat, hostname, parsec, time, timeit }: mkDerivation { pname = "HUnit-Plus"; - version = "1.0.1"; - sha256 = "71929ba45bd420d8d2061dc877ed0d82ba574155ce0be6d67b6459148129045e"; + version = "1.1.0"; + sha256 = "9cde0930c46c02833e82b10519bcc841ce5186a62be3bb29971538e85a5fcb74"; libraryHaskellDepends = [ base bytestring Cabal cmdargs containers hashable hexpat hostname - old-locale parsec time timeit + parsec time timeit ]; testHaskellDepends = [ base bytestring Cabal cmdargs containers directory hashable hexpat - hostname old-locale parsec time timeit + hostname parsec time timeit ]; homepage = "https://github.com/emc2/HUnit-Plus"; description = "A test framework building on HUnit"; @@ -9456,14 +9455,11 @@ self: { ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { pname = "JuicyPixels-repa"; - version = "0.7"; - sha256 = "a556109f053d1dfd1eebd23080d5f285816a03f73e37fdc1f32e0a8df888c93a"; - revision = "1"; - editedCabalFile = "b0dcd6dae60b506057721d2732aebbece6ce380b5d7df4b2ba64592e6e3a88a8"; + version = "0.7.0.1"; + sha256 = "767c5f7ab39b660f0a9e4c8a5af0564060f5319dee7f68306523344ddfdf3837"; libraryHaskellDepends = [ base bytestring JuicyPixels repa vector ]; - jailbreak = true; description = "Convenience functions to obtain array representations of images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -10341,15 +10337,15 @@ self: { "MFlow" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, conduit, conduit-extra - , containers, directory, extensible-exceptions, http-types + , containers, cpphs, directory, extensible-exceptions, http-types , monadloc, mtl, old-time, parsec, pwstore-fast, random , RefSerialize, resourcet, stm, TCache, text, time, transformers , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow }: mkDerivation { pname = "MFlow"; - version = "0.4.5.10"; - sha256 = "2c2e2c03b31f37f628e446cabaf544bf7b669d3e6a34b6c38798e89145c3b6c4"; + version = "0.4.5.11"; + sha256 = "789aceb77d0e2497a6194dba2677e32b003292075bc36db66f272f559234f25f"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring case-insensitive clientsession conduit conduit-extra containers directory @@ -10358,6 +10354,7 @@ self: { transformers utf8-string vector wai wai-extra warp warp-tls Workflow ]; + libraryToolDepends = [ cpphs ]; description = "stateful, RESTful web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -14983,6 +14980,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "THEff" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "THEff"; + version = "0.1.0.1"; + sha256 = "0fbe048bd845a2917e88bacc47e9d63da757ab15f233e63e876a6115f460663f"; + libraryHaskellDepends = [ base template-haskell ]; + description = "TH implementation of effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "TTTAS" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -19570,8 +19578,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.2.0.1"; - sha256 = "4e7b7cda6b6904cfd35f92596bfe5a8e00511bbd64d7b55926ad8660f6eba950"; + version = "1.2.0.2"; + sha256 = "2ed9e6eb9a6dbb0eca3d1fb68c7136a35ec5b7b5ac3ac40d8ecc59b33a00cfb5"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-client http-conduit ini lens mmorph monad-control @@ -19590,19 +19598,17 @@ self: { }: mkDerivation { pname = "amazonka-autoscaling"; - version = "1.2.0.1"; - sha256 = "c48e7db56a1fc852a505b3821a4ed273b6a68e2f68ee224eb6cdfbe27c42926a"; + version = "1.2.0.2"; + sha256 = "23b763583f2d3ffd0abcb5c01cbba2c8a86f06a622a7878f4b90b96f9589fab1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudformation" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19610,19 +19616,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudformation"; - version = "1.2.0.1"; - sha256 = "813fcdb6a35888e1a0d29252f7530f192509662445b051ab17e6e4d614e98160"; + version = "1.2.0.2"; + sha256 = "b7ad4d6b83d043e1c55d2b336702c99e3476432f5f9e29f7af2d8224e5c85f21"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudfront" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19630,19 +19634,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudfront"; - version = "1.2.0.1"; - sha256 = "aeff7660a2d12b1382d14efa134b37ae35e4dc3745fb83f33e4fd4ac37b4c275"; + version = "1.2.0.2"; + sha256 = "f906be9ac06c38451549c001ce870f732a43292da7ed41ca46089179ff89617a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudhsm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19650,19 +19652,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "1.2.0.1"; - sha256 = "64a58850be2d1df8145ca7382f7060faf873417c34b52258846ea6b4842b1389"; + version = "1.2.0.2"; + sha256 = "5885451657f173c69d52c756395b52b6fe7be9626293d61b7513afbe73ba8e79"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudsearch" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19670,19 +19670,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "1.2.0.1"; - sha256 = "d56e2690a44f331d408603234712bcbc2ef40f0375a7c1db22513c3350b3ccb5"; + version = "1.2.0.2"; + sha256 = "053b505d3644433f9e1fa686d6416ae08ac2154bb4ebe5e994f0b2a4969a11f1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudsearch-domains" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19690,19 +19688,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "1.2.0.1"; - sha256 = "f3ac35a7e9f2f9372ffabbb5b7450b4291a07609f517af8b75a4acd5d5c3610d"; + version = "1.2.0.2"; + sha256 = "a3921a0b09518c5fffe95b46f76c46a53ab1710b59fb43f099cb14b637ea593f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudtrail" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19710,19 +19706,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "1.2.0.1"; - sha256 = "525e3a1f674b20e3851c67cc3d519f86b9795b046f131b91d63e7f194246542b"; + version = "1.2.0.2"; + sha256 = "a352d0ff1a75b22fa9e87c18c498090f5c6e9cbfcb79a24b2840ce44ec02b2b3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudwatch" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19730,19 +19724,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "1.2.0.1"; - sha256 = "dfabf18379ec4f5431e4038d745686a58fb83a0559029cbbb77b40f9ebc6fd43"; + version = "1.2.0.2"; + sha256 = "0b6e1358d91a567df91aa680019b0f06f201eb81965f3b78702c4e90a9a426a4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudwatch-logs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19750,19 +19742,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "1.2.0.1"; - sha256 = "3b794ef9cb79daf5018a7cc850a348eb08407067f4b72c6accbd03b3be6997ca"; + version = "1.2.0.2"; + sha256 = "3fd0122d4e24ccb3413da041ef85e7eb07af7614e43946fb28b93404951ddc39"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codecommit" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19770,19 +19760,17 @@ self: { }: mkDerivation { pname = "amazonka-codecommit"; - version = "1.2.0.1"; - sha256 = "b4dcc54a0cd2faec903a037b713d1cce6ac6d4c3716b353b4108d23d4ecc0b03"; + version = "1.2.0.2"; + sha256 = "43b58f4507c9ea4125cc4da323ff63f8d9223149455293867143984074d8be74"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeCommit SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codedeploy" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19790,19 +19778,17 @@ self: { }: mkDerivation { pname = "amazonka-codedeploy"; - version = "1.2.0.1"; - sha256 = "9b3dcfb3f92c0f2b7a68d62857e04a6eea0f57a6e72311fa5594da8574b8f557"; + version = "1.2.0.2"; + sha256 = "cbbc6d6d6291fc47c89e7f67dc016570eecaecccee8a8f1c858fda040e9993e9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codepipeline" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19810,19 +19796,17 @@ self: { }: mkDerivation { pname = "amazonka-codepipeline"; - version = "1.2.0.1"; - sha256 = "c97df58c12793dc079d0706d9a09ea7c470219cc80e6e583441718d7017ee138"; + version = "1.2.0.2"; + sha256 = "57c505046cfa51716624d0021d6dca82a13053c17a5e0a61944935ba7bd189b4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodePipeline SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cognito-identity" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19830,19 +19814,17 @@ self: { }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "1.2.0.1"; - sha256 = "fbf21d9ca8e71d0b3305791db0f6a18256898b5c294057f515aef3991a0971cb"; + version = "1.2.0.2"; + sha256 = "b9965907831e771ad7268d1f8d149b8b3de6faaf0e73eb140705bdf0a7cf8805"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cognito-sync" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19850,19 +19832,17 @@ self: { }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "1.2.0.1"; - sha256 = "2008e997fa402ab3d58f22f260df18583695b612cbf1b0d3ab158321a1576e03"; + version = "1.2.0.2"; + sha256 = "f1683d1e4c124b07f5ae7663a1471539611f77da6f11553b87ca5eb77b192c89"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-config" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19870,19 +19850,17 @@ self: { }: mkDerivation { pname = "amazonka-config"; - version = "1.2.0.1"; - sha256 = "c4e60da7e09302b81e1c53b15c36e99b46d09dd37b4334e360d78879b556ef36"; + version = "1.2.0.2"; + sha256 = "72fb81094500ac496592cd56c8010205f40a377ccdc7d8fb8f479e3923bcbfab"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring @@ -19895,8 +19873,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "1.2.0.1"; - sha256 = "737645a63519f535154133cf590a66e2248d436c6223539857f43069a6645d1a"; + version = "1.2.0.2"; + sha256 = "63d02d59fe206e1cfbaacea192d775424d05d617413af1771c2efe9a4e51a663"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite exceptions hashable http-client @@ -19920,19 +19898,17 @@ self: { }: mkDerivation { pname = "amazonka-datapipeline"; - version = "1.2.0.1"; - sha256 = "20178d505d690116528f8d1bf5c5650c7dca9350b583ad4bbc2b7ca5b74bc1e0"; + version = "1.2.0.2"; + sha256 = "a4f8c95147fd34fabe6544c5d8893aac7259a95fc37d9d900e121cc1d479d230"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-devicefarm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19940,19 +19916,17 @@ self: { }: mkDerivation { pname = "amazonka-devicefarm"; - version = "1.2.0.1"; - sha256 = "bebf18952a56cc249175a1bf69ab1400126b3c97c45ce8b7895acbae894c3449"; + version = "1.2.0.2"; + sha256 = "92d323fbe85ccd284ea76fcba12e8ea70b75994d2195bb12e25a753f5b78424e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Device Farm SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-directconnect" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19960,19 +19934,17 @@ self: { }: mkDerivation { pname = "amazonka-directconnect"; - version = "1.2.0.1"; - sha256 = "39bd3999d29363b87fc64edac6151251a5a5075c7fe1ab48bb89114fa40cfa74"; + version = "1.2.0.2"; + sha256 = "1cd5cda8a0d8ca484582b5d9ef0e50fbe14542e81a49de6f5b3bf32a044ab3c6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19980,19 +19952,17 @@ self: { }: mkDerivation { pname = "amazonka-ds"; - version = "1.2.0.1"; - sha256 = "fac88b8ac1121ec6ab9bb1c1b419262e2720c95d3c5d5e1d5ff9b0356f59af56"; + version = "1.2.0.2"; + sha256 = "10b5a48951ec7f90b05152d2073b10d154ceea5806f5655d47d1f8a512f2cbbd"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Directory Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-dynamodb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20000,19 +19970,17 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb"; - version = "1.2.0.1"; - sha256 = "23d44253d82d2406b528abf5f1c2ed97c72cadb9afca1a578793220648ce442c"; + version = "1.2.0.2"; + sha256 = "c916d9b55e74ceeb5f1e7a64fb7ebe0de3bea7df3eb9d2d813bce7e945e81634"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-dynamodb-streams" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20020,19 +19988,17 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb-streams"; - version = "1.2.0.1"; - sha256 = "b3413412dce8dc96e449642535f623223298243d7290d778082fd6ed97511a33"; + version = "1.2.0.2"; + sha256 = "3ae26f2fdfe11cd7a366dc272d1f43f38cdb949eb5edc7b73e01a176b2096868"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Streams SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ec2" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20040,19 +20006,17 @@ self: { }: mkDerivation { pname = "amazonka-ec2"; - version = "1.2.0.1"; - sha256 = "de1421ab986e9d6833fd70a0e0d3c21895813361ecc680c95816fbcaf7c6439a"; + version = "1.2.0.2"; + sha256 = "f93ca4bb2ae863f071a0555f762e365da1616b72c8589d4fe3aad260fc936211"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ecs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20060,19 +20024,17 @@ self: { }: mkDerivation { pname = "amazonka-ecs"; - version = "1.2.0.1"; - sha256 = "19c608e5218c900da768adc9f893a91a7fc6e9070e8c5d9e444baf1ae98c7544"; + version = "1.2.0.2"; + sha256 = "7c322cc5afcdcc92b21c22333c859295a508d84bd8ba83921a105d231dbfa8d6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-efs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20080,19 +20042,17 @@ self: { }: mkDerivation { pname = "amazonka-efs"; - version = "1.2.0.1"; - sha256 = "d0f70ed2e5242cb05b7895199a06144cd4550fab64fb825eba8a1c10d9351bab"; + version = "1.2.0.2"; + sha256 = "193b91ede9c1abfe195788c03940214f8d54c43fde259674a468f49a5c59834f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic File System SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elasticache" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20100,19 +20060,17 @@ self: { }: mkDerivation { pname = "amazonka-elasticache"; - version = "1.2.0.1"; - sha256 = "9c4113c0dd2430432ac0233149571a7affc9dec675aaddbe7ff9e513171a1bf7"; + version = "1.2.0.2"; + sha256 = "1a5a8883055dcc318a90cc45f1cfd7af198c5e98b8889db86bca951bc2e9be29"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elasticbeanstalk" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20120,19 +20078,17 @@ self: { }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "1.2.0.1"; - sha256 = "b4e135c2e904f78cab94ccab8d1d38b3b7992461bc1f41ede5ee708fcb162dc2"; + version = "1.2.0.2"; + sha256 = "fa62e8248e92184e84b482012dd73953bb0892166f95d0d2163b04c42ebcc650"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elastictranscoder" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20140,19 +20096,17 @@ self: { }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "1.2.0.1"; - sha256 = "b2eaf67b39f5d19fe5ea7a6d0c79b44951cf25c41eb3af36ead6cd82cb430dd2"; + version = "1.2.0.2"; + sha256 = "76d26a2d64094dd14090298ead0e920915c31582fe14d949836f1103af238c04"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20160,19 +20114,17 @@ self: { }: mkDerivation { pname = "amazonka-elb"; - version = "1.2.0.1"; - sha256 = "2574b79c0b09ef82dcc7b07c9dfcb55719dd7b63ac87fb938ae7a7c45efba986"; + version = "1.2.0.2"; + sha256 = "21099398af8db511131a4c8bed68b6d04f9b708a77c38d01b037020e18ab2123"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-emr" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20180,19 +20132,17 @@ self: { }: mkDerivation { pname = "amazonka-emr"; - version = "1.2.0.1"; - sha256 = "43c3e80f742abbd5d2770fa5cf05138b5be2890492a295b1ccaefeb8d50662ed"; + version = "1.2.0.2"; + sha256 = "08728f1ccd95bcce046d6e320391d1c219306b2764a0a551dfea11de3208e1f1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-glacier" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20200,19 +20150,17 @@ self: { }: mkDerivation { pname = "amazonka-glacier"; - version = "1.2.0.1"; - sha256 = "48e2c9b10a4624b6f308bd232aafe9fabe7429911ad4a7a8222277d9c58310be"; + version = "1.2.0.2"; + sha256 = "a789aaf0927672e16ceb8202d88ff07ee5218b2244236f94a04f186a0b38a3f5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-iam" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20220,19 +20168,17 @@ self: { }: mkDerivation { pname = "amazonka-iam"; - version = "1.2.0.1"; - sha256 = "8302e53d2e799b56629a2344a3b1d40b39b173defee1112ddb6e4e0102496d7f"; + version = "1.2.0.2"; + sha256 = "00454769f0848db0b6a273ff2e6e0f4b7dcfc94db067ce4774806aa0687b9f6d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-importexport" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20240,19 +20186,17 @@ self: { }: mkDerivation { pname = "amazonka-importexport"; - version = "1.2.0.1"; - sha256 = "cfb98a32f18d2b1448277f5a4c5128bd9d94ecba012d458dff65a834c86648d6"; + version = "1.2.0.2"; + sha256 = "e8e9f4a8fb5762a929c9462d7d8187207a1334aa3922890ec08a6a949ba9264e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-kinesis" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20260,19 +20204,17 @@ self: { }: mkDerivation { pname = "amazonka-kinesis"; - version = "1.2.0.1"; - sha256 = "831225d3400badf60a8b390e4dd692d38b8097bcb72f1247b54876c83bb532c9"; + version = "1.2.0.2"; + sha256 = "7b5d2a726111352d21594a1704dade4d2b706286c8cec427b912a2318f91bc20"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-kms" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20280,19 +20222,17 @@ self: { }: mkDerivation { pname = "amazonka-kms"; - version = "1.2.0.1"; - sha256 = "b69938c0c9f6bbc5d1774643f528e64ba28a6ac2bb16f1e15845061a97de85d4"; + version = "1.2.0.2"; + sha256 = "7c67b24e31d293411960f68efd4199e5fd4fd4274ea62619f96faa37553c8246"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-lambda" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20300,19 +20240,17 @@ self: { }: mkDerivation { pname = "amazonka-lambda"; - version = "1.2.0.1"; - sha256 = "e3e0e8fd76c7dbd1ced77e9d46a4e8b57820b87b00327ccc01417ddf4c53aa0d"; + version = "1.2.0.2"; + sha256 = "91f88bc3fa32f5c6350f2f49afb949e63a860614d7f90d169af216115f0927c2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ml" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20320,19 +20258,17 @@ self: { }: mkDerivation { pname = "amazonka-ml"; - version = "1.2.0.1"; - sha256 = "c29484802e0138ebbeb6666842ca1cd44b81e2e870ff4c1435d91d58d569bc37"; + version = "1.2.0.2"; + sha256 = "c3a3eee8d0bb4987d96b35b48dc074d2912883573e8859fdabf16f744641b9f0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-opsworks" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20340,19 +20276,17 @@ self: { }: mkDerivation { pname = "amazonka-opsworks"; - version = "1.2.0.1"; - sha256 = "bad7706393fcfcc041ac4ae1bb39ef7320d282d2b4d9c6c8f0881379b4f91a6a"; + version = "1.2.0.2"; + sha256 = "bad8fc80941bdecd1799213837ef1923c88ef96b59ec2efe439a564f68e06f40"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-rds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20360,19 +20294,17 @@ self: { }: mkDerivation { pname = "amazonka-rds"; - version = "1.2.0.1"; - sha256 = "55ae3a2e6893fc11ca156fb9d11258d1c1ad76f928ca1143cfb0b7b3d9f1806e"; + version = "1.2.0.2"; + sha256 = "d4ae1dec9b45df0db245022c5e098ad4814f2ab2261bde850adb42b38200b248"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-redshift" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20380,19 +20312,17 @@ self: { }: mkDerivation { pname = "amazonka-redshift"; - version = "1.2.0.1"; - sha256 = "0ce218a13c314c73ea9b3f5c7e8ef31f3cf92a06f820425c48d83d175f1e77b2"; + version = "1.2.0.2"; + sha256 = "b7fd76de142bc6c346d10645fe07c64c09ee26c828fe89abd6d0f44d99c39a89"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-route53" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20400,19 +20330,17 @@ self: { }: mkDerivation { pname = "amazonka-route53"; - version = "1.2.0.1"; - sha256 = "8a700fc08eb4585b6d9a30c81f18bfab56ae2ae4b5474f98889959f2bda33ad0"; + version = "1.2.0.2"; + sha256 = "bfe1e8d82ea77ab1a4b95cfef89a6cefc5dc2bcd349c17964fcab9ce2f00ec9b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-route53-domains" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20420,19 +20348,17 @@ self: { }: mkDerivation { pname = "amazonka-route53-domains"; - version = "1.2.0.1"; - sha256 = "d486ae77163fc9d8dbb3b38afcce6ce79fba93b5194643ad98cb8dbbe31f745a"; + version = "1.2.0.2"; + sha256 = "e0a70770d5fea792f15e5ed7c6fac093dc52e98d5a140c8ac769d09d87a11760"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-s3" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20440,19 +20366,17 @@ self: { }: mkDerivation { pname = "amazonka-s3"; - version = "1.2.0.1"; - sha256 = "dd5b54f342d1a5f45ea62242f9acecb2be98ed15801b251316c9bef8ac7b948b"; + version = "1.2.0.2"; + sha256 = "e38c08253fee58cbf3f503d7f3f5c2a96e99c74cc343c99751a44adb3fc82a27"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sdb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20460,19 +20384,17 @@ self: { }: mkDerivation { pname = "amazonka-sdb"; - version = "1.2.0.1"; - sha256 = "4eebd5b37c309ee850395c2823f10636cb90c8449a1f365a11a5cf58080b4469"; + version = "1.2.0.2"; + sha256 = "58e01ab2120c1f680148fed558c1cb179867eb3770fc3a119a5770ab187de7c9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ses" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20480,19 +20402,17 @@ self: { }: mkDerivation { pname = "amazonka-ses"; - version = "1.2.0.1"; - sha256 = "f547f472a3dee0944a7a26a7b421df10242d80762ca59392391a1326a39a427f"; + version = "1.2.0.2"; + sha256 = "3f81529747d25fbdff258c6027592650b5de4537fe4600a40d60116ddc7cb539"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sns" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20500,19 +20420,17 @@ self: { }: mkDerivation { pname = "amazonka-sns"; - version = "1.2.0.1"; - sha256 = "e69b15d4fe2904cd813e22a149e4dcce5c9514a34c45379bb07589fc3a606994"; + version = "1.2.0.2"; + sha256 = "e7585e9186ab3bb1e71405f3e01b31a0a9a0e6aa228b1a78a8f65d55cff782f9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sqs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20520,19 +20438,17 @@ self: { }: mkDerivation { pname = "amazonka-sqs"; - version = "1.2.0.1"; - sha256 = "e599b394468bdeb2813b8e091b5aefc5787bb10bd2bfb24d5be4ba70a5ed0134"; + version = "1.2.0.2"; + sha256 = "0fa349f412a216cb1bd3c2ed6d9fa97ce0f95522caa2099fdc473e1b433ce4ef"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ssm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20540,19 +20456,17 @@ self: { }: mkDerivation { pname = "amazonka-ssm"; - version = "1.2.0.1"; - sha256 = "d9d47fd9820fa05fbfdd62090d9319ee6fd96f321422a995e186ab3e13d789f1"; + version = "1.2.0.2"; + sha256 = "d227c62cd71a81cb02bcfe6a7024ea423940dbbae18f3d8f59be6ccdb346657e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-storagegateway" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20560,19 +20474,17 @@ self: { }: mkDerivation { pname = "amazonka-storagegateway"; - version = "1.2.0.1"; - sha256 = "d73bf3187bb9fd7b50ddcc74566841d1fb4e77328bbe0dddb19a324553e9c49b"; + version = "1.2.0.2"; + sha256 = "66f0781991832ddc0a8b68098f1d1213ffea9ed9b29effad53f4987c96914ea6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sts" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20580,19 +20492,17 @@ self: { }: mkDerivation { pname = "amazonka-sts"; - version = "1.2.0.1"; - sha256 = "66502b43aea7c2f70ef4559913c58fb0ae581435d0656f1ab9f9c417bcb54a2e"; + version = "1.2.0.2"; + sha256 = "629d92d11fc73e7d3fe7e428a309c2cd93e42291a5102075ed9220fb37b916fd"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-support" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20600,19 +20510,17 @@ self: { }: mkDerivation { pname = "amazonka-support"; - version = "1.2.0.1"; - sha256 = "f1996613bfcfa00eac465c90ef97f18c6fe51231def2d43de1bf90fd0992e52e"; + version = "1.2.0.2"; + sha256 = "c650edb5679dbc337c2aaf6eecafa85725f02e580c913164c1381ceb0f724fbe"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-swf" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20620,19 +20528,39 @@ self: { }: mkDerivation { pname = "amazonka-swf"; - version = "1.2.0.1"; - sha256 = "d68898d0a5205e3897b36c29830564f1aecbeff759ff5c379bdf12c1c60f1c01"; + version = "1.2.0.2"; + sha256 = "ae3a8a9b918c9bc4d1bfe6e855686fc3bbc78484c7e863186295b30318761892"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; + + "amazonka-test" = callPackage + ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring + , case-insensitive, conduit, conduit-extra, groom, http-client + , http-types, lens, process, resourcet, tasty, tasty-hunit + , template-haskell, temporary, text, time, unordered-containers + , yaml + }: + mkDerivation { + pname = "amazonka-test"; + version = "1.2.0.2"; + sha256 = "cc54d2f2514d714b5261e75090f97d9432e7dd84be5c4c314d4747c733d732a8"; + libraryHaskellDepends = [ + aeson amazonka-core base bifunctors bytestring case-insensitive + conduit conduit-extra groom http-client http-types lens process + resourcet tasty tasty-hunit template-haskell temporary text time + unordered-containers yaml + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Common functionality for Amazonka library test-suites"; + license = "unknown"; + }) {}; "amazonka-workspaces" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20640,19 +20568,17 @@ self: { }: mkDerivation { pname = "amazonka-workspaces"; - version = "1.2.0.1"; - sha256 = "4125f1aa08ad2f9013bba8f8d0c83b41f0eeb76203fd1b7da41a306f81211448"; + version = "1.2.0.2"; + sha256 = "4c685ff3dca7dc5fac2ecd6d07f4400f045901a75985d62f4e38d6561a82c0d6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "ampersand" = callPackage ({ mkDerivation, base, bytestring, containers, csv, directory @@ -27732,15 +27658,15 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.5.0.0"; - sha256 = "e52f9757e72a5f3fa2992a4f68ffb7874131357b9327ce6908200e8e89d7f9a9"; + version = "0.5.0.1"; + sha256 = "24a29bdc360b4121c7992cf4118ed1caa32854d80aa2b2d3a63a63d5a0f9e38f"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types microlens microlens-th network scientific split text time ]; testHaskellDepends = [ - aeson base bytestring directory doctest hspec microlens safe text - time + aeson base bytestring directory doctest hspec http-conduit + http-types microlens safe text time ]; homepage = "https://github.com/tebello-thejane/bitx-haskell"; description = "A Haskell library for working with the BitX bitcoin exchange"; @@ -31877,8 +31803,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.3.1"; - sha256 = "e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac"; + version = "0.4.4.0"; + sha256 = "0733ede68d2670fd3e676f5a19b6d31233b266a8dc42387316e6ec7ed5e5df3f"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -32576,19 +32502,19 @@ self: { "cgrep" = callPackage ({ mkDerivation, ansi-terminal, array, async, base, bytestring , cmdargs, containers, directory, dlist, either, filepath, ghc-prim - , mtl, regex-posix, safe, split, stm, stringsearch, unix-compat - , unordered-containers + , mtl, regex-posix, safe, split, stm, stringsearch, transformers + , unix-compat, unordered-containers }: mkDerivation { pname = "cgrep"; - version = "6.5.3"; - sha256 = "af2f1b09aabb32fe398a575f28331979903afa00333b3f1dc0f19a6d302bca1e"; + version = "6.5.4"; + sha256 = "2dd9112da6cde89934d8a65a93597b161928c23c01b1af25ffae72ee104c768a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal array async base bytestring cmdargs containers directory dlist either filepath ghc-prim mtl regex-posix safe split - stm stringsearch unix-compat unordered-containers + stm stringsearch transformers unix-compat unordered-containers ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -34985,8 +34911,8 @@ self: { pname = "codepad"; version = "0.1"; sha256 = "215704a914c2006369c63cf6000385b2ece643839a8c0f2398353f46f65a5b0e"; - revision = "1"; - editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a"; + revision = "3"; + editedCabalFile = "6f9d1a534fa6ff720347aa10521a99456aa4b9e2a95b45f71cadb06074277c86"; libraryHaskellDepends = [ base curl mtl network tagsoup ]; jailbreak = true; homepage = "http://github.com/chrisdone/codepad"; @@ -38843,20 +38769,20 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, derive, hspec - , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text - , time, transformers-compat + ({ mkDerivation, attoparsec, base, derive, mtl, mtl-compat + , old-locale, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers-compat }: mkDerivation { pname = "cron"; - version = "0.3.0"; - sha256 = "3369302abbf131db159c4a4a8666d93e8dfbd4478c9aa56ca9d0ff45926bcaa3"; + version = "0.3.1"; + sha256 = "e4d506496d1be1327cbca8619a0a88a11219d54dbe716bcd05b4953f8fe75823"; libraryHaskellDepends = [ attoparsec base mtl mtl-compat old-locale text time ]; testHaskellDepends = [ - attoparsec base derive hspec hspec-expectations QuickCheck text - time transformers-compat + attoparsec base derive tasty tasty-hunit tasty-quickcheck text time + transformers-compat ]; homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; @@ -42545,8 +42471,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.7.2.2"; - sha256 = "e9ba2452da86da69f80ed6042de3ae73de83ee96b8483a845129b1dfc685e737"; + version = "0.8.0.0"; + sha256 = "07887be08bd4521fc76e272ed9c418a7c517c57360f07529206ea2b46ace52ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52354,17 +52280,17 @@ self: { }) {}; "fishfood" = callPackage - ({ mkDerivation, base, Cabal, containers, factory, mtl, QuickCheck - , toolshed, unix + ({ mkDerivation, base, Cabal, containers, directory, factory, mtl + , QuickCheck, toolshed }: mkDerivation { pname = "fishfood"; - version = "0.0.1.3"; - sha256 = "5318e06292c0530f60ff93b9a0182034fcc799112fe6b0acf6c7a7f72a11b72e"; + version = "0.0.1.4"; + sha256 = "ffdc12216f142512efca5b2a5c369f040cdf24fdb355f990d209447da9a7fed2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base Cabal containers factory mtl QuickCheck toolshed unix + base Cabal containers directory factory mtl QuickCheck toolshed ]; homepage = "http://functionalley.eu"; description = "Calculates file-size frequency-distribution"; @@ -53314,8 +53240,8 @@ self: { }: mkDerivation { pname = "foldl-transduce"; - version = "0.2.0.0"; - sha256 = "38be7ab52831c7ea5ac5fd4e546b9f8b4a66305528af80aa6ec17214b6066e02"; + version = "0.2.1.0"; + sha256 = "6e6e1d3c90faf10daf0863a94742ee376457d9ea79e7b76fefe500a45f4fb6e4"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers foldl semigroupoids text transformers @@ -58200,6 +58126,94 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glue-common" = callPackage + ({ mkDerivation, async, base, ekg-core, hashable, hspec + , lifted-base, monad-control, QuickCheck, quickcheck-instances + , text, time, transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "glue-common"; + version = "0.4.1"; + sha256 = "ee474188b6dbb022312f4f74bd16e3cd2915bc4d7699169b29d76482ec4b23b8"; + libraryHaskellDepends = [ + base hashable lifted-base monad-control text time transformers + transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core hashable hspec lifted-base monad-control + QuickCheck quickcheck-instances text time transformers + transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-core" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, hashable + , hspec, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "glue-core"; + version = "0.4.1"; + sha256 = "d9be37ce2995583086c960c18c9457e83b9adea0b2feff7e422af6292ee0b347"; + libraryHaskellDepends = [ + base glue-common hashable lifted-base monad-control text time + transformers transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core glue-common hashable hspec lifted-base + monad-control QuickCheck quickcheck-instances text time + transformers transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-ekg" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, hashable + , hspec, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "glue-ekg"; + version = "0.4.1"; + sha256 = "f655a9c8f0af74dcc5483b7974bba30d071d2e6e658ed89de4c407922cdf58e4"; + libraryHaskellDepends = [ + base ekg-core glue-common hashable lifted-base monad-control text + time transformers transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core glue-common hashable hspec lifted-base + monad-control QuickCheck quickcheck-instances text time + transformers transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-example" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, glue-core + , glue-ekg, hashable, lifted-base, monad-control, monad-loops, text + , time, transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "glue-example"; + version = "0.4.1"; + sha256 = "00a55b518dc5cb0678f5c943beb6b46a8089b1907315a5e96319146ee796b5cf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base ekg-core glue-common glue-core glue-ekg hashable + lifted-base monad-control monad-loops text time transformers + transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gluturtle" = callPackage ({ mkDerivation, base, convertible, GLUT, stm, yjsvg, yjtools }: mkDerivation { @@ -71694,6 +71708,32 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "hops" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring + , conduit, conduit-extra, containers, deepseq, directory, filepath + , http-conduit, http-types, optparse-applicative, parallel + , QuickCheck, text, transformers, vector + }: + mkDerivation { + pname = "hops"; + version = "0.0.1"; + sha256 = "e7ef3084cd1e5ec4cb5a0f558b1fd01fe0dc7d959d30c977df0b2ed624055798"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-terminal attoparsec base bytestring conduit + conduit-extra containers deepseq directory filepath http-conduit + http-types optparse-applicative parallel text transformers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq QuickCheck text + vector + ]; + homepage = "http://github.com/akc/hops"; + description = "Hackable Operations on Power Series"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hoq" = callPackage ({ mkDerivation, alex, array, base, bifunctors, bytestring , filepath, happy, mtl, pretty, readline, void @@ -80762,6 +80802,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ioref-stable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ioref-stable"; + version = "0.1.0.0"; + sha256 = "9044897340c044e44d3a9c33b350523147a6a95a2f1c8fb410caee880ceba314"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/cocreature/ioref-stable#readme"; + description = "iorefs with a unique stable index"; + license = stdenv.lib.licenses.mit; + }) {}; + "iothread" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -82028,10 +82080,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.0.1"; - sha256 = "fd01f32dc319f7088791ce696d0421215a624bc7a2923bb8a39e4d102148cae1"; - revision = "1"; - editedCabalFile = "723bbb15b1cdc91151255c89977d67e330f4795c35dc330c5cc324d7784d53b6"; + version = "0.5.0.2"; + sha256 = "2d633a0410423ad12840449bb809f3bc3ffbc9aae7db6b365379b02ebeb3829c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85664,6 +85714,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-lua2" = callPackage + ({ mkDerivation, base, containers, Earley, lexer-applicative + , microlens, optparse-applicative, QuickCheck, regex-applicative + , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck + , transformers, unordered-containers, wl-pprint + }: + mkDerivation { + pname = "language-lua2"; + version = "0.1.0.0"; + sha256 = "0b53673bcaa3445e823e7808b95b109074d29ad3083d02e57bc39ef12619a061"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers Earley lexer-applicative microlens + regex-applicative semigroups srcloc transformers + unordered-containers wl-pprint + ]; + executableHaskellDepends = [ + base Earley lexer-applicative optparse-applicative srcloc wl-pprint + ]; + testHaskellDepends = [ + base lexer-applicative QuickCheck semigroups srcloc tasty + tasty-hunit tasty-quickcheck unordered-containers + ]; + homepage = "http://github.com/mitchellwrosen/language-lua2"; + description = "Lua parser and pretty printer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-mixal" = callPackage ({ mkDerivation, base, mtl, parsec, pretty }: mkDerivation { @@ -87389,8 +87468,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.9.0.3"; - sha256 = "3f0c520f19520dae35bf0d6aebf2fffef067964ace91047193b330a6dfaaa3d6"; + version = "0.9.0.4"; + sha256 = "bdaa57a410396b2f02ddb9896823ce0a176751fa84261f445e9a5b7671333a7a"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -88136,8 +88215,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.9.0"; - sha256 = "1ca49da5de79fd4aa6849a2b27dae5d01b3a896968e5fce29ad0c6a670065fa2"; + version = "0.10.0"; + sha256 = "27a0461fc9fae738a621febf02e54049d21798a9347aaee7777c4d28f27e90b8"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -88154,8 +88233,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.9.2"; - sha256 = "fc52aedb4f8b3def5b993846543801de43cb5ea1f4091a2244626fe820382d6b"; + version = "0.10.0"; + sha256 = "4fd28d6d557c9a1f2fef6f9d8c6a49f78cedd469ddcd02629a9df515af4424ae"; libraryHaskellDepends = [ base containers free hoopl linearscan QuickCheck transformers ]; @@ -89787,6 +89866,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lookup-tables" = callPackage + ({ mkDerivation, base, primitive, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "lookup-tables"; + version = "0.1.1.0"; + sha256 = "a3b3380485752abb262c964f633c6f184a65d249658da2ae41de0276151a64b3"; + libraryHaskellDepends = [ base primitive template-haskell ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Statically generate lookup tables using Template Haskell"; + license = stdenv.lib.licenses.isc; + }) {}; + "loop" = callPackage ({ mkDerivation, base, hspec, mtl }: mkDerivation { @@ -91417,8 +91510,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.3.0.0"; - sha256 = "f497b16900ead8851bec4d8529dfa2a0ba77397a8e7f95ef39d68928d64ffc09"; + version = "0.4.0.0"; + sha256 = "495c8e1863140df809275f1972ec0b2514d78790650a68413c7bf103780205a5"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -92909,24 +93002,26 @@ self: { }) {}; "microformats2-parser" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, blaze-html - , blaze-markup, bytestring, containers, data-default, either, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, streaming-commons, stringable, template-haskell, text - , time, transformers, unordered-containers, vector, wai-extra, warp - , xml-lens, xss-sanitize + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base + , blaze-html, blaze-markup, bytestring, containers, data-default + , either, errors, hspec, hspec-expectations-pretty-diff + , html-conduit, lens-aeson, mtl, network, network-uri, options + , pcre-heavy, raw-strings-qq, safe, scotty, streaming-commons + , stringable, template-haskell, text, time, transformers + , unordered-containers, vector, wai-extra, warp, xml-lens + , xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.2"; - sha256 = "94c220abb5bfd065e492f138bb72466f37cb2ecf4c53e830226b64e950a061b9"; + version = "1.0.1.3"; + sha256 = "68f0da066f3c891ab15a4336eede0558f5f43dd74a70f178886e517a1fdd604f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-qq base blaze-markup bytestring containers data-default - either html-conduit lens-aeson network-uri pcre-heavy safe text - time transformers unordered-containers vector xml-lens xss-sanitize + aeson aeson-qq attoparsec base blaze-markup bytestring containers + data-default either errors html-conduit lens-aeson network-uri + pcre-heavy safe text time transformers unordered-containers vector + xml-lens xss-sanitize ]; executableHaskellDepends = [ aeson aeson-pretty base blaze-html blaze-markup data-default @@ -94093,20 +94188,21 @@ self: { "moesocks" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring - , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens, mtl - , network, optparse-applicative, random, stm, strict, text, time - , transformers, unix, unordered-containers + , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens + , lens-aeson, mtl, network, optparse-applicative, random, stm + , strict, text, time, transformers, unix, unordered-containers }: mkDerivation { pname = "moesocks"; - version = "0.1.0.27"; - sha256 = "3e520127ef1727d460d65b1219d5c585973c62fc2f31713d6743aed2406d5abe"; + version = "0.1.1.31"; + sha256 = "a1b105ee4d257874fc844170dd73decf7035361a27667f10fe8fdcf6da88ec8b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base binary bytestring containers cryptohash - hslogger HsOpenSSL iproute lens mtl network optparse-applicative - random stm strict text time transformers unix unordered-containers + hslogger HsOpenSSL iproute lens lens-aeson mtl network + optparse-applicative random stm strict text time transformers unix + unordered-containers ]; homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; @@ -95515,24 +95611,23 @@ self: { "morte" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq - , happy, http-client, http-client-tls, lens-family-core, managed - , optparse-applicative, pipes, system-fileio, system-filepath, text - , text-format, transformers + , happy, http-client, http-client-tls, managed, microlens + , microlens-mtl, optparse-applicative, pipes, system-fileio + , system-filepath, text, text-format, transformers }: mkDerivation { pname = "morte"; - version = "1.2.1"; - sha256 = "8fb0e54f4469de6ee9018ef51bf9ffda5dcd1abca4de87f9e47edc8b4199fb97"; + version = "1.3.0"; + sha256 = "bcaf4af883e8441dff551d05efcb82985051635fe1f38dc80be2fd5bf6471240"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary containers deepseq http-client http-client-tls - lens-family-core managed pipes system-fileio system-filepath text - text-format transformers + managed microlens microlens-mtl pipes system-fileio system-filepath + text text-format transformers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base optparse-applicative text ]; - jailbreak = true; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -101028,8 +101123,10 @@ self: { }: mkDerivation { pname = "opaleye-classy"; - version = "0.1.0.1"; - sha256 = "874c3f1d394653289542ef2a8ca55d8b93c01c1de78e2c0bbe1c668be39b331a"; + version = "0.3.1.1"; + sha256 = "2c3e216384bdb5e9e9eb84e67dd86b4daaf31568ccb5714b8aa84e2d3550ca9b"; + revision = "1"; + editedCabalFile = "79b08c58924ba2f19fa919f97895adb4dbb6b8e0b1644c91aaf5307e414fbc27"; libraryHaskellDepends = [ base bytestring lens mtl opaleye postgresql-simple product-profunctors transformers @@ -102682,8 +102779,8 @@ self: { pname = "pandoc-csv2table"; version = "1.0.1"; sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c"; - revision = "2"; - editedCabalFile = "522492bc433302f60262c0c9a19ccda171dd4eaec177f42fe75e471b79df1924"; + revision = "3"; + editedCabalFile = "4168dab7a87533c54ed9108ae6a65c71ec20642b85091d74b7dbf46b5c27b683"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; @@ -111010,8 +111107,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "quiver"; - version = "0.0.0.11"; - sha256 = "ca895a811d854e1e1e164a4f3988f3515deb2dc2220c0af6ee153b826aebb6df"; + version = "0.0.0.12"; + sha256 = "3ae4d76c2b4f4805b43ac6136c865142d3e847affb86e1e3dba6f9bb35e7bf04"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/zadarnowski/quiver"; description = "Quiver finite stream processing library"; @@ -111034,8 +111131,8 @@ self: { ({ mkDerivation, base, data-cell, quiver }: mkDerivation { pname = "quiver-cell"; - version = "0.0.0.2"; - sha256 = "4e95b819c71225ac76342ace1472c93ecadbc549aa2b6d08fffa5c5e250de182"; + version = "1.0.0"; + sha256 = "e806d29ffb46b80ddd21cca89de3c9d4606dbc30aad523fa9691ca05e12e0c51"; libraryHaskellDepends = [ base data-cell quiver ]; homepage = "https://github.com/zadarnowski/quiver-cell"; description = "Quiver combinators for cellular data processing"; @@ -112153,8 +112250,8 @@ self: { ({ mkDerivation, base, cabal-macosx, reactive-banana, wx, wxcore }: mkDerivation { pname = "reactive-banana-wx"; - version = "0.9.0.1"; - sha256 = "554e9d6715665a52e6395148749d9c1ec58db2cf8dfaa4944374a605072529ba"; + version = "0.9.0.2"; + sha256 = "ebb1b7e3eb6f973bd9922d27af64c94c28fc392655d2271c10b29a6c89ad3c5d"; configureFlags = [ "-f-buildexamples" ]; isLibrary = true; isExecutable = true; @@ -113308,10 +113405,8 @@ self: { }: mkDerivation { pname = "regex-tdfa"; - version = "1.2.0"; - sha256 = "fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401"; - revision = "1"; - editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e"; + version = "1.2.1"; + sha256 = "a38d305eeb78be2e34542b423e6a4763fbb8ad1df757aed01993785858c871a7"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -119232,8 +119327,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.4"; - sha256 = "d2b95b9f9b8173fe83d08166707d564b2cb60526493fc7b4099e09f9480a16ec"; + version = "0.4.4.2"; + sha256 = "fc5c80822fef28b63d8a63bd63efd0bdd86c7d13f06d1cc6e9b0768c4efe61aa"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -119274,8 +119369,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.4"; - sha256 = "1a94a0c0ffe7cd6ddb9bea99f31ee63a1dac538965fe03b3ecd75c068f7f1a90"; + version = "0.4.4.2"; + sha256 = "da58db6c24bb5360c3ee027061d7e9183667c1bdbde56d70f4f8e8fef982a47b"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -119291,8 +119386,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.4"; - sha256 = "7f1b8835bddbe8b1eafa6dee9dc780561ad851e9b68e8a5c16ea45b32ee2aa54"; + version = "0.4.4.2"; + sha256 = "d5b95b943215aa227f390c284f84043d7c0db2531416ff44511e0d209bc498c3"; libraryHaskellDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -119315,8 +119410,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.4"; - sha256 = "ccf92b38df3506b25e6fe93d7ded665db8c1cef76a73913afa72aa2e0d19e54e"; + version = "0.4.4.2"; + sha256 = "449ff2c953c4282f768c7d514f0c5a68e7d8541bde973d0ebe50372987355d90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119369,8 +119464,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.4"; - sha256 = "d54bfef47474ef525285074008ec371df437891e7f2fa9473b9c6cc7f1a4f9e3"; + version = "0.4.4.2"; + sha256 = "76edea7d08e6ee4e5c41e2056f34353dd4033ba4a171008b92e1d34f1cbd146c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119391,8 +119486,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.4"; - sha256 = "6d5726b74ee4b83d84ab62d8f3af1afc0743715d9624056d97148a9ebb654212"; + version = "0.4.4.2"; + sha256 = "c807d103b47b4f7c31708deb92786171a9b7fce2314232400caf2be74b7225ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; @@ -119411,14 +119506,36 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.4"; - sha256 = "19ae35c4e46b409388d58a9f8e926ea18c4bbe1a4819cebe3d7d4f195adbc9ef"; + version = "0.4.4.2"; + sha256 = "073cff7d8e1551d1300d9d5c74159f3a7912951ac1874080359406e6de9fed01"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-mock" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types, QuickCheck + , servant, servant-server, transformers, wai, warp + }: + mkDerivation { + pname = "servant-mock"; + version = "0.4.4.2"; + sha256 = "d203424df5f2d0484f874f81ec98623c226ab89f5c232c3a884aa3b91230e7c6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-types QuickCheck servant servant-server + transformers wai + ]; + executableHaskellDepends = [ + aeson base QuickCheck servant-server warp + ]; + homepage = "http://github.com/haskell-servant/servant"; + description = "Derive a mock server for free from your servant API types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -119508,8 +119625,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.4.1"; - sha256 = "4889f732694a34232660660332cfd61b1e404f5adedd2b96a21a42dfdb51556a"; + version = "0.4.4.2"; + sha256 = "9c937f01f0ce3ae354097406e8617ee10bbcbd86513c5808b3c430ecba4f7fff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122215,8 +122332,8 @@ self: { }: mkDerivation { pname = "sloane"; - version = "4.0.1"; - sha256 = "015cc227cab7e205c0684821138f36d4d38a9fee893fbf23d13add0e27ec19e9"; + version = "4.0.2"; + sha256 = "acac676c02d56269ea4360b6007473eabd7f36dbfdc3fb72c17b91350b8eaf8d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125406,17 +125523,17 @@ self: { "squeeze" = callPackage ({ mkDerivation, base, Cabal, directory, factory, filepath, mtl - , QuickCheck, random, toolshed, unix + , QuickCheck, random, toolshed }: mkDerivation { pname = "squeeze"; - version = "1.0.4.5"; - sha256 = "9079a9e9163b27612c4625542bcd530766576e1d43e496c21cc42ffdbf3c6231"; + version = "1.0.4.7"; + sha256 = "f1961d7922ca1fb8839cc3d5c536d3b4c7e8aa81ddbb187655581e8e97bdb31a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal directory factory filepath mtl QuickCheck random - toolshed unix + toolshed ]; homepage = "http://functionalley.eu"; description = "A file-packing application"; @@ -127191,11 +127308,11 @@ self: { ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "streaming"; - version = "0.1.0.11"; - sha256 = "824351fc0c99bd5141ad4fef9db85032c5fb4d5cd745b9aca1490ea4dbfccf06"; + version = "0.1.0.15"; + sha256 = "8c9ade2b4353a397b77818223e367af22ec77f1ca137229f8009c947757b832f"; libraryHaskellDepends = [ base mmorph mtl transformers ]; homepage = "https://github.com/michaelt/streaming"; - description = "A free monad transformer optimized for streaming applications"; + description = "a free monad transformer optimized for streaming applications"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127205,12 +127322,12 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.0.2"; - sha256 = "cae7ee4205506ab7aa22904a4a055249f8225c5d6c4049313a09ce219ba98985"; + version = "0.1.0.4"; + sha256 = "6b1feca189bac886ca543c00e6952452a6a5033cc33d9ca13be52195dc9d9a42"; libraryHaskellDepends = [ base bytestring deepseq mmorph mtl streaming transformers ]; - description = "effectful bytestrings, or: lazy bytestring done right"; + description = "effectful byte steams, or: lazy bytestring done right"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -137503,8 +137620,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "universe-base"; - version = "1.0"; - sha256 = "8475cc6dcfd785e6e9baef146bba7b5aa372ff55311d75866acb1c0467ac0fae"; + version = "1.0.1"; + sha256 = "6de2abd6951f0ae4ef4704bace4117196a5224b4f59c69706424652ca9e474fa"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/dmwit/universe"; description = "A class for finite and recursively enumerable types and some helper functions for enumerating them"; @@ -137529,12 +137646,11 @@ self: { }: mkDerivation { pname = "universe-instances-extended"; - version = "1.0"; - sha256 = "f1ad69a7cbda23c870ebf501715297d2c30ddf6288e95fe1bd6283168d3d8a32"; + version = "1.0.0.1"; + sha256 = "665b272701b16a6bb8d40a5396aa1dcb038f002452ebdc29d353e3be2070c997"; libraryHaskellDepends = [ adjunctions base comonad universe-instances-base void ]; - jailbreak = true; homepage = "https://github.com/dmwit/universe"; description = "Universe instances for types from select extra packages"; license = stdenv.lib.licenses.bsd3; @@ -143134,6 +143250,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "woot" = callPackage + ({ mkDerivation, base, hspec, vector }: + mkDerivation { + pname = "woot"; + version = "0.0.0.0"; + sha256 = "891823fa0a134df0857cb371fa3e100a54c227ce29e428b6f6eeaf983e7b8fb0"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec ]; + jailbreak = true; + homepage = "https://github.com/TGOlson/woot-haskell"; + description = "Real time group editor without operational transform"; + license = stdenv.lib.licenses.mit; + }) {}; + "word-trie" = callPackage ({ mkDerivation, base, binary, containers, hspec, QuickCheck }: mkDerivation { @@ -144955,6 +145085,11 @@ self: { base containers directory extensible-exceptions filepath mtl process unix utf8-string X11 ]; + postInstall = '' + shopt -s globstar + mkdir -p $out/share/man/man1 + mv "$out/"**"/man/"*.1 $out/share/man/man1/ + ''; homepage = "http://xmonad.org"; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -145591,8 +145726,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.13"; - sha256 = "f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a"; + version = "0.8.14"; + sha256 = "f40d2c54dd4be0616e1dde897c7388cdb5882f0f7545b37bb3c966fc96bcf69a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148139,6 +148274,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {gomp = null; inherit (pkgs) z3;}; + "zalgo" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "zalgo"; + version = "0.1.0.3"; + sha256 = "74f376016d855eee365ad3d9d7ef1fb42106fbf0d302c918dce26f676b243b2f"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/mniip/zalgo"; + description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zampolit" = callPackage ({ mkDerivation, base, cmdargs, containers, directory, filepath , HSH, MissingH, old-locale, parsec, time diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 5b2ba44d86d..635fc317b28 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -66,7 +66,7 @@ rec { buildPhase = "./Setup sdist"; haddockPhase = ":"; checkPhase = ":"; - installPhase = "install -D dist/${drv.pname}-${drv.version}.tar.gz $out/${drv.pname}-${drv.version}.tar.gz"; + installPhase = "install -D dist/${drv.pname}-*.tar.gz $out/${drv.pname}-${drv.version}.tar.gz"; fixupPhase = ":"; }); @@ -74,7 +74,7 @@ rec { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" tar xf ${src}/${tarname}.tar.gz - cd ${tarname} + cd ${pkg.pname}-* ''; }); diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1affd1fa582..d41b0424b44 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.2"; + version = "6.2.1"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "05g60fzb9dzf52xj9n7s4prybwbr8dqjq94mbdmw5cxk88vi2c8k"; + sha256 = "0555j63k7fs10iv0icmivlxpzgp6s7gwcbfddmbwxlf2rk80qhq0"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 263943411e8..dd8a3aef8d4 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { name = "ffmpeg-${version}"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy"; + sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw"; }; patchPhase = ''patchShebangs .''; diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix index 3e4708fdf46..105239c48c9 100644 --- a/pkgs/development/libraries/ffmpeg/2.7.nix +++ b/pkgs/development/libraries/ffmpeg/2.7.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.1"; + version = "${branch}.2"; branch = "2.7"; - sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy"; + sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw"; }) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index b08f5b7dd76..d40cdf75ad1 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jemalloc-3.6.0"; + name = "jemalloc-4.0.0"; src = fetchurl { url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; - sha256 = "1zl4vxxjvhg72bdl53sl0idz9wp18c6yzjdmqcnwm09wvmcj2v71"; + sha256 = "1wiydkp8a4adwsgfsd688hpv2z7hjv5manhckchk96v6qdsbqk91"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index fbf817dd873..02c07a78acb 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.15"; + version = "0.9.16"; src = fetchzip { url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz"; - sha256 = "0p79fpyh1yx2jg1f0kag5zsdn4spkgs1j3dxibvqdy32wkbpxd0g"; + sha256 = "1lkmngscijwiz09gdkqygdp87x55vp8gb4fh4vq7s34k4jv0327l"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/nettle/27.nix b/pkgs/development/libraries/nettle/27.nix deleted file mode 100644 index fc85f5eb9de..00000000000 --- a/pkgs/development/libraries/nettle/27.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.7.1"; - - src = fetchurl { - url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw"; - }; -}) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 9681c4d7eee..c4257fe97d2 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -34,12 +34,12 @@ let in stdenv.mkDerivation rec { name = "${prefix}nghttp2-${version}"; - version = "1.1.2"; + version = "1.2.1"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2"; - sha256 = "5b218a0d27eeaa6898eb0757b6bbcc643ada2148696d864f185b3123c392904b"; + sha256 = "8027461a231d205394890b2fee34d1c3751e28e7d3f7c1ebc1b557993ea4045e"; }; # Configure script searches for a symbol which does not exist in jemalloc on Darwin diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index b1bd535c5fd..eb0a7c5add9 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { src = fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; rev = "560fb2b1d22f4c995a526529bb034bd183e85a31"; - sha256 = "0qaa0l23lc8677wvbgz327yvfg2pxxmvrxga6568ra5kgdy4204c"; + sha256 = "1pyjy9kb8g18g6shlg7vnyaspa892zaq4hqvmqvdbxrlf24vg0wp"; deepClone = true; }; isLibrary = false; @@ -52,4 +52,5 @@ mkDerivation rec { homepage = "http://github.com/NixOS/cabal2nix/"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; } diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index bcd3f3a453a..31220b4aa62 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, cmake, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango , gettext, zlib, boost, freetype, libpng, pkgconfig, lua, dbus, fontconfig, libtool -, fribidi, asciidoc }: +, fribidi, asciidoc, libpthreadstubs, libXdmcp, libxshmfence, libvorbis }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.10.7"; + version = "1.12.4"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa"; + sha256 = "19qyylylaljhk45lk2ja0xp7cx9iy4hx07l65zkg20a2v9h50lmz"; }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib - boost fribidi cmake freetype libpng pkgconfig lua - dbus fontconfig libtool ]; + boost fribidi freetype libpng lua libpthreadstubs libXdmcp + dbus fontconfig libtool libxshmfence libvorbis ]; cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030 diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 825968c6163..ba26c44305b 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mednafen-${version}"; - version = "0.9.38.5"; + version = "0.9.38.6"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/mednafen/Mednafen/${version}/${name}.tar.bz2"; - sha256 = "1s1qwwlhkxr0vhzvlc1m0ib9lj7cws3cldm2mbjz4b421nxfdi8h"; + url = "http://mednafen.fobby.net/releases/files/${name}.tar.bz2"; + sha256 = "0ivy0vqy1cjd5namn4bdm9ambay6rdccjl9x5418mjyqdhydlq4l"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index f635e0f149b..cef143e309a 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pam ? null, x11 }: +{ stdenv, lib, fetchurl, pam ? null, autoreconfHook +, libX11, libXext, libXinerama, libXdmcp, libXt }: stdenv.mkDerivation rec { @@ -9,37 +10,26 @@ stdenv.mkDerivation rec { }; # Optionally, it can use GTK+. - buildInputs = [ pam x11 ]; + buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ]; + + nativeBuildInputs = [ autoreconfHook ]; # Don't try to install `xlock' setuid. Password authentication works # fine via PAM without super user privileges. configureFlags = - " --with-crypt" - + " --enable-appdefaultdir=$out/share/X11/app-defaults" - + " --disable-setuid" - + " --without-editres" - + " --without-xpm" - + " --without-gltt" - + " --without-ttf" - + " --without-ftgl" - + " --without-freetype" - + " --without-opengl" - + " --without-mesa" - + " --without-dtsaver" - + " --without-ext" - + " --without-dpms" - + " --without-xinerama" - + " --without-rplay" - + " --without-nas" - + " --without-gtk2" - + " --without-gtk" - + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam"); + [ "--disable-setuid" + ] ++ (lib.optional (pam != null) "--enable-pam"); - preConfigure = '' - configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" - ''; + postPatch = + let makePath = p: lib.concatMapStringsSep " " (x: x + "/" + p) buildInputs; + inputs = "${makePath "lib"} ${makePath "include"}"; + in '' + sed -i 's,\(for ac_dir in\),\1 ${inputs},' configure.ac + sed -i 's,/usr/,/no-such-dir/,g' configure.ac + configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Screen locker for the X Window System"; homepage = http://www.tux.org/~bagleyd/xlockmore.html; license = licenses.gpl2; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f24058a468e..e57d498411e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -420,6 +420,17 @@ rec { }; + vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-go-2015-08-12"; + src = fetchgit { + url = "git://github.com/fatih/vim-go"; + rev = "5048bdbebcffb296aa60b4c21c44ae8276244539"; + sha256 = "1k9r6zdlb553d8zhhswbjph4fa6n17qdvc8zz0cix6h2lw9dr9mj"; + }; + dependencies = []; + + }; + idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "idris-vim-2015-08-14"; src = fetchgit { @@ -508,17 +519,6 @@ rec { }; - vim-golang = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-golang-2014-08-06"; - src = fetchgit { - url = "git://github.com/jnwhiteh/vim-golang"; - rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c"; - sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af"; - }; - dependencies = []; - - }; - vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-xdebug-2012-08-15"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d6b731783d1..5123e5a72b6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -29,6 +29,7 @@ "github:christoomey/vim-tmux-navigator" "github:eagletmt/neco-ghc" "github:esneider/YUNOcommit.vim" +"github:fatih/vim-go" "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" "github:itchyny/thumbnail.vim" @@ -37,7 +38,6 @@ "github:jeetsukumaran/vim-buffergator" "github:jgdavey/tslime.vim" "github:jistr/vim-nerdtree-tabs" -"github:jnwhiteh/vim-golang" "github:joonty/vim-xdebug" "github:justincampbell/vim-eighties" "github:latex-box-team/latex-box" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index ec1724a9f9a..c75a92f46cf 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,6 +1,7 @@ -{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin}: +{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin +, nix-prefetch-scripts }: -/* +/* USAGE EXAMPLE ============= @@ -309,8 +310,8 @@ rec { echom repeat("=", 80) endif let opts = {} - let opts.nix_prefetch_git = "${../../../pkgs/build-support/fetchgit/nix-prefetch-git}" - let opts.nix_prefetch_hg = "${../../../pkgs/build-support/fetchhg/nix-prefetch-hg}" + let opts.nix_prefetch_git = "${nix-prefetch-scripts}/bin/nix-prefetch-git" + let opts.nix_prefetch_hg = "${nix-prefetch-scripts}/bin/nix-prefetch-hg" let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache' let opts.plugin_dictionaries = [] ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index c54d4aa6319..60bfe093017 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchFromGitHub, pkgconfig, cmake # dependencies , glib @@ -7,23 +7,17 @@ , mpdSupport ? true , ibmSupport ? true # IBM/Lenovo notebooks -# This should be optional, but it is not due to a bug in conky -# Please, try to make it optional again on update -, ncurses -#, ncursesSupport ? true , ncurses ? null - # optional features with extra dependencies +, ncursesSupport ? true , ncurses ? null , x11Support ? true , x11 ? null , xdamageSupport ? x11Support, libXdamage ? null , imlib2Support ? x11Support, imlib2 ? null -, luaSupport ? true , lua ? null +, luaSupport ? true , lua ? null , luaImlib2Support ? luaSupport && imlib2Support , luaCairoSupport ? luaSupport && x11Support, cairo ? null , toluapp ? null -, alsaSupport ? true , alsaLib ? null - , wirelessSupport ? true , wirelesstools ? null , curlSupport ? true , curl ? null @@ -33,7 +27,7 @@ , libxml2 ? null }: -#assert ncursesSupport -> ncurses != null; +assert ncursesSupport -> ncurses != null; assert x11Support -> x11 != null; assert xdamageSupport -> x11Support && libXdamage != null; @@ -46,8 +40,6 @@ assert luaCairoSupport -> luaSupport && toluapp != null assert luaCairoSupport || luaImlib2Support -> lua.luaversion == "5.1"; -assert alsaSupport -> alsaLib != null; - assert wirelessSupport -> wirelesstools != null; assert curlSupport -> curl != null; @@ -58,62 +50,52 @@ assert weatherXoapSupport -> curlSupport && libxml2 != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "conky-1.9.0"; + name = "conky-${version}"; + version = "1.10.0"; - src = fetchurl { - url = "mirror://sourceforge/conky/${name}.tar.bz2"; - sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; + src = fetchFromGitHub { + owner = "brndnmtthws"; + repo = "conky"; + rev = "v${version}"; + sha256 = "00vyrf72l54j3majqmn6vykqvvb15vygsaby644nsb5vpma6b1cn"; }; NIX_LDFLAGS = "-lgcc_s"; - buildInputs = [ pkgconfig glib ] - ++ [ ncurses ] - #++ optional ncursesSupport ncurses + buildInputs = [ pkgconfig glib cmake ] + ++ optional ncursesSupport ncurses ++ optional x11Support x11 ++ optional xdamageSupport libXdamage ++ optional imlib2Support imlib2 ++ optional luaSupport lua ++ optionals luaImlib2Support [ toluapp imlib2 ] ++ optionals luaCairoSupport [ toluapp cairo ] - - ++ optional alsaSupport alsaLib - ++ optional wirelessSupport wirelesstools - ++ optional curlSupport curl ++ optional rssSupport libxml2 ++ optional weatherXoapSupport libxml2 ; - configureFlags = - let flag = state: flags: if state then map (x: "--enable-${x}") flags - else map (x: "--disable-${x}") flags; - in flag mpdSupport [ "mpd" ] - ++ flag ibmSupport [ "ibm" ] + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] + ++ optional curlSupport "-DBUILD_CURL=ON" + ++ optional (!ibmSupport) "-DBUILD_IBM=OFF" + ++ optional imlib2Support "-DBUILD_IMLIB2=ON" + ++ optional luaCairoSupport "-DBUILD_LUA_CAIRO=ON" + ++ optional luaImlib2Support "-DBUILD_LUA_IMLIB2=ON" + ++ optional (!mpdSupport) "-DBUILD_MPD=OFF" + ++ optional (!ncursesSupport) "-DBUILD_NCURSES=OFF" + ++ optional rssSupport "-DBUILD_RSS=ON" + ++ optional (!x11Support) "-DBUILD_X11=OFF" + ++ optional xdamageSupport "-DBUILD_XDAMAGE=ON" + ++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON" + ++ optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON" + ++ optional wirelessSupport "-DBUILD_WLAN=ON" + ; - #++ flag ncursesSupport [ "ncurses" ] - ++ flag x11Support [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window - ++ flag xdamageSupport [ "xdamage" ] - ++ flag imlib2Support [ "imlib2" ] - ++ flag luaSupport [ "lua" ] - ++ flag luaImlib2Support [ "lua-imlib2" ] - ++ flag luaCairoSupport [ "lua-cairo" ] - - ++ flag alsaSupport [ "alsa" ] - - ++ flag wirelessSupport [ "wlan" ] - - ++ flag curlSupport [ "curl" ] - ++ flag rssSupport [ "rss" ] - ++ flag weatherMetarSupport [ "weather-metar" ] - ++ flag weatherXoapSupport [ "weather-xoap" ] - ; - - meta = { + meta = with stdenv.lib; { homepage = http://conky.sourceforge.net/; description = "Advanced, highly configurable system monitor based on torsmo"; - maintainers = [ stdenv.lib.maintainers.guibert ]; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ maintainers.guibert ]; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 34d0f3881e4..683ec9f6155 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -1,39 +1,33 @@ { stdenv, fetchurl }: -let version = "3.19"; in +let version = "4.2"; in stdenv.mkDerivation { name = "freefall-${version}"; src = fetchurl { - sha256 = "0v40b5l6dcviqgl47bxlcbimz7kawmy1c2909axi441jwlgm2hmy"; - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g"; + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; }; - buildPhase = '' - cd Documentation/laptops + postPatch = '' + cd tools/laptop/freefall # Default time-out is a little low, probably because the AC/lid status # functions were never implemented. Because no-one still uses HDDs, right? - substituteInPlace freefall.c --replace "alarm(2)" "alarm(5)" - - cc -o freefall freefall.c + substituteInPlace freefall.c --replace "alarm(2)" "alarm(7)" ''; - installPhase = '' - mkdir -p $out/bin - install freefall $out/bin - ''; + makeFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { description = "Free-fall protection for spinning HP/Dell laptop hard drives"; longDescription = '' - ATA/ATAPI-7 specifies the IDLE IMMEDIATE command with unload feature. - Issuing this command should cause the drive to switch to idle mode and - unload disk heads. This feature is being used in modern laptops in - conjunction with accelerometers and appropriate software to implement - a shock protection facility. The idea is to stop all I/O operations on - the internal hard drive and park its heads on the ramp when critical - situations are anticipated. This has no effect on SSD devices! + Provides a shock protection facility in modern laptops with spinning hard + drives, by stopping all input/output operations on the internal hard drive + and parking its heads on the ramp when critical situations are anticipated. + Requires support for the ATA/ATAPI-7 IDLE IMMEDIATE command with unload + feature, which should cause the drive to switch to idle mode and unload the + disk heads, and an accelerometer device. It has no effect on SSD devices! ''; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix new file mode 100644 index 00000000000..fc44c6f1dbb --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.2"; + modDirVersion = "4.2.0"; + extraMeta.branch = "4.2"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index db7017edd43..abe96e9b9ae 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.10"; + version = "1.1.11"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "0z4b3j1r0v4zr3v1cpl1v56zx6w8nq1y3wbs8x1zg87pqyqykfs5"; + sha256 = "0grmmah3d9wajii26010plpinv3cbiq3kfqsblgn84kv3fjnv7mv"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index cbd9a19777e..953c8c60125 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "352.30"; + versionNumber = "352.41"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; @@ -28,15 +28,17 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1qrjvf41zk50hw7gjiwg9jxwgpaarlwm019py4wfqgjgb1cbhgjn"; + sha256 = "1qzn6dhkrpkx015f7y9adafn7fmz7zbxbczzf9930li8pgvmmz5k"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1h7ghmykhdyy3n853s8yjzc0qbh50qb2kc0khz672b1rna4wqyhg"; + sha256 = "1k9hmmn5x9snzyggx23km64kjdqjh2kva090ha6mlayyyxrclz56"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; + patches = [ ./nvidia-4.2.patch ]; + inherit versionNumber libsOnly; inherit (stdenv) system; diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch new file mode 100644 index 00000000000..412b786179a --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch @@ -0,0 +1,26 @@ +diff --git a/kernel/nv-frontend.c b/kernel/nv-frontend.c +index 65bbb1b..be39c8d 100644 +--- a/kernel/nv-frontend.c ++++ b/kernel/nv-frontend.c +@@ -15,7 +15,7 @@ + #include "nv-frontend.h" + + #if defined(MODULE_LICENSE) +-MODULE_LICENSE("NVIDIA"); ++MODULE_LICENSE("GPL\0NVIDIA"); + #endif + #if defined(MODULE_INFO) + MODULE_INFO(supported, "external"); +diff --git a/kernel/nv.c b/kernel/nv.c +index abe81ed..05945b5 100644 +--- a/kernel/nv.c ++++ b/kernel/nv.c +@@ -31,7 +31,7 @@ + + #if defined(NV_VMWARE) || (NV_BUILD_MODULE_INSTANCES != 0) + #if defined(MODULE_LICENSE) +-MODULE_LICENSE("NVIDIA"); ++MODULE_LICENSE("GPL\0NVIDIA"); + #endif + #if defined(MODULE_INFO) + MODULE_INFO(supported, "external"); diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 13d144c54b0..fe517a71021 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.0.5"; + version = "1.1.1"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "0vwhmnwai24h654d1zchm5qkbr030ay98l2qdp914ydgwhw9k6pn"; + sha256 = "0gldvyr96jgbcahq7rl3k4krzyhvlz95ckiqh3yhink56s5z58cy"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 4eb8394a4d3..1933523d9c2 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq"; }; + patches = [ ./fix-printf-type.patch ]; + postPatch = '' # Fix references to libsepol.a find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \; diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch new file mode 100644 index 00000000000..6ab2d6dccc7 --- /dev/null +++ b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch @@ -0,0 +1,12 @@ +diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c +--- policycoreutils-2.4/setfiles/restore.c 2015-02-02 09:38:10.000000000 -0500 ++++ policycoreutils-2.4.new/setfiles/restore.c 2015-08-29 20:44:13.693023222 -0400 +@@ -118,7 +118,7 @@ + r_opts->count++; + if (r_opts->count % STAR_COUNT == 0) { + if (r_opts->progress == 1) { +- fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT ); ++ fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT ); + } else { + if (r_opts->nfile > 0) { + progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100; diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 9faba199a5d..216ea1fbbcd 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-07-21"; + version = "2015-08-25"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; - rev = "9eb361aaa537724c9a90ab6a9f33521bfd80bad9"; - sha256 = "18sv4mw85fbm8i1s8k4y5dc43l6ll2f6hgfrawvzgvwni5i4h7n8"; + rev = "ae89cf0f34de323c4a7c39bfd9b906acc2635a87"; + sha256 = "04i3c4qg5zccl1inr17vgkjrz9zr718m64pbrlw9rvc82fw5g199"; }; patches = [ ./const.patch ./install_prefix.patch ]; diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 1a22d094867..aeb2c371c2a 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "trace-cmd-${version}"; - version = "2.5.3"; + version = "2.6"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git"; rev = "refs/tags/trace-cmd-v${version}"; - sha256 = "32db3df07d0371c2b072029c6c86c4204be8cbbcb53840fa8c42dbf2e35c047b"; + sha256 = "42286440a45d1b24552a1d3cdb656dc648ad346fc426b5798bacdbffd3c4b226"; }; buildInputs = [ asciidoc libxslt ]; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 9e475f7aed9..fca9dab2261 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.30.0"; + name = "xf86-input-wacom-0.31.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1xa1i2ks00fa20c5dlpqzlapzj638a7qm5c0wqc3qvgwliwy9m4a"; + sha256 = "0xiz5vpkp8zm5m2k909sbvm9v8rf6hwn3gvqr2msswc00hzp5sg7"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 26c48076c4e..f63a36ce516 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,13 +1,13 @@ { callPackage, stdenv, fetchFromGitHub, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-07-21"; + version = "2015-08-30"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; - rev = "3b79cef21294f3ec46c4f71cc5a68a75a4d0ebc7"; - sha256 = "01l4cg62wgn3wzasskx2nh3a4c74vq8qcwz090x8x1r4c2r4v943"; + rev = "c6a3a222d3a1d2af94205a218c0ba455200fb945"; + sha256 = "0alzkngw36ik4vpw0z8nnk5qysh2z6v231c23rw7jlcqfdd8ji8p"; }; patches = [ ./nix-build.patch ]; diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 990d3d52d30..e988e8192fc 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.9.3"; + version = "1.9.4"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1svkyrh31g9hzfmj0xwc167sz0b1fn4i62mwipdjy9ia3cscb622"; + sha256 = "1a1bixw2a4s5c3qzw3583s4a4y6i0sdzhihhlbab5rkyfh1hr6s7"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 8444d49b91e..14f95761cfb 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.7.10.1"; + version = "1.9.3.1"; src = fetchurl { url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz"; - sha256 = "0yg6pkagkkga6ly6fgmfcf557r2b4m75gyn6a7p9qcamb4zdgl2g"; + sha256 = "1fw8yxjndf5gsk44l4bsixm270fxv7f5cdiwzq9ps6j3hhgx5kyv"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix deleted file mode 100644 index f2f5eaa6f18..00000000000 --- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: - -goPackages.buildGoPackage rec { - name = "prometheus-alertmanager-${rev}"; - rev = "0.0.4"; - goPackagePath = "github.com/prometheus/alertmanager"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "alertmanager"; - inherit rev; - sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15"; - }; - - buildInputs = [ - goPackages.protobuf - goPackages.fsnotify.v0 - goPackages.httprouter - goPackages.prometheus.client_golang - goPackages.prometheus.log - goPackages.pushover - protobuf - vim - ]; - - buildFlagsArray = '' - -ldflags= - -X main.buildVersion ${rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion goPackages.go} - ''; - - preBuild = '' - ( - cd "go/src/$goPackagePath" - protoc --proto_path=./config \ - --go_out=./config/generated/ \ - ./config/config.proto - cd web - ${stdenv.shell} blob/embed-static.sh static templates \ - | gofmt > blob/files.go - ) - ''; - - meta = with lib; { - description = "Alerting dispather for the Prometheus monitoring system"; - homepage = "https://github.com/prometheus/alertmanager"; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix deleted file mode 100644 index 701ee46d498..00000000000 --- a/pkgs/servers/monitoring/prometheus/cli/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-cli-${rev}"; - rev = "0.3.0"; - goPackagePath = "github.com/prometheus/prometheus_cli"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "prometheus_cli"; - inherit rev; - sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; - }; - - buildInputs = [ - goPackages.prometheus.client_model - goPackages.prometheus.client_golang - ]; - - meta = with lib; { - description = "Command line tool for querying the Prometheus HTTP API"; - homepage = https://github.com/prometheus/prometheus_cli; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix deleted file mode 100644 index a859c437701..00000000000 --- a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ goPackages, lib, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-collectd-exporter-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/collectd_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "collectd_exporter"; - inherit rev; - sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; - }; - - buildInputs = [ goPackages.prometheus.client_golang ]; - - meta = with lib; { - description = "Relay server for exporting metrics from collectd to Prometheus"; - homepage = "https://github.com/prometheus/alertmanager"; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix deleted file mode 100644 index c6ed75e0d09..00000000000 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub, vim }: - -goPackages.buildGoPackage rec { - name = "prometheus-${version}"; - version = "0.15.1"; - goPackagePath = "github.com/prometheus/prometheus"; - rev = "64349aade284846cb194be184b1b180fca629a7c"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "prometheus"; - sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2"; - }; - - buildInputs = with goPackages; [ - consul - dns - fsnotify.v1 - go-zookeeper - goleveldb - httprouter - logrus - net - prometheus.client_golang - prometheus.log - yaml-v2 - ]; - - # Metadata that gets embedded into the binary - buildFlagsArray = let t = "${goPackagePath}/version"; in - '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=${builtins.substring 0 6 rev} - -X ${t}.Branch=master - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=20150101-00:00:00 - -X ${t}.GoVersion=${lib.getVersion goPackages.go} - ''; - - meta = with lib; { - description = "Service monitoring system and time series database"; - homepage = http://prometheus.io; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix deleted file mode 100644 index 63c421cd8a2..00000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub, }: - -goPackages.buildGoPackage rec { - name = "prometheus-haproxy-exporter-0.4.0"; - goPackagePath = "github.com/prometheus/haproxy_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "haproxy_exporter"; - rev = "6ee6d1df3e68ed73df37c9794332b2594e4da45d"; - sha256 = "0lbwv6jsdfjd9ihiky3lq7d5rkxqjh7xfaziw8i3w34a38japlpr"; - }; - - buildInputs = [ goPackages.prometheus.client_golang ]; - - meta = with lib; { - description = "HAProxy Exporter for the Prometheus monitoring system"; - homepage = https://github.com/prometheus/haproxy_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix deleted file mode 100644 index fec66af2469..00000000000 --- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-mesos-exporter-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/mesos_exporter"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "mesos_exporter"; - sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; - }; - - buildInputs = [ - goPackages.mesos-stats - goPackages.prometheus.client_golang - goPackages.glog - ]; - - meta = with lib; { - description = "Export Mesos metrics to Prometheus"; - homepage = https://github.com/prometheus/mesos_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix deleted file mode 100644 index 0b399d0cfff..00000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ goPackages, lib, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-mysqld-exporter-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/mysqld_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "mysqld_exporter"; - inherit rev; - sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; - }; - - buildInputs = with goPackages; [ - mysql - prometheus.client_golang - ]; - - meta = with lib; { - description = "Prometheus exporter for MySQL server metrics"; - homepage = https://github.com/prometheus/mysqld_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix deleted file mode 100644 index b45b2784042..00000000000 --- a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-nginx-exporter-${version}"; - version = "git-2015-06-01"; - goPackagePath = "github.com/discordianfish/nginx_exporter"; - - src = fetchFromGitHub { - owner = "discordianfish"; - repo = "nginx_exporter"; - rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; - sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; - }; - - buildInputs = [ - goPackages.prometheus.client_golang - goPackages.prometheus.log - ]; - - meta = with lib; { - description = "Metrics relay from nginx stats to Prometheus"; - homepage = https://github.com/discordianfish/nginx_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix deleted file mode 100644 index 922c958b3f5..00000000000 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - name = "prometheus-node-exporter-${rev}"; - rev = "0.10.0"; - goPackagePath = "github.com/prometheus/node_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "node_exporter"; - inherit rev; - sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p"; - }; - - buildInputs = [ - go-runit - ntp - prometheus.client_golang - prometheus.client_model - prometheus.log - protobuf - ]; - - meta = with lib; { - description = "Prometheus exporter for machine metrics"; - homepage = https://github.com/prometheus/node_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix deleted file mode 100644 index 368ea3ae214..00000000000 --- a/pkgs/servers/monitoring/prometheus/prom2json/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ goPackages, lib, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prom2json-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/prom2json"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "prom2json"; - inherit rev; - sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; - }; - - buildInputs = with goPackages; [ - golang_protobuf_extensions - prometheus.client_golang - protobuf - ]; - - meta = with lib; { - description = "A tool to scrape a Prometheus client and dump the result as JSON"; - homepage = https://github.com/prometheus/prom2json; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix deleted file mode 100644 index ae1e1e38902..00000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - name = "prometheus-pushgateway-${rev}"; - rev = "0.1.1"; - goPackagePath = "github.com/prometheus/pushgateway"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "pushgateway"; - sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; - }; - - buildInputs = [ - go-bindata - protobuf - httprouter - golang_protobuf_extensions - prometheus.client_golang - ]; - - buildFlagsArray = '' - -ldflags= - -X main.buildVersion ${rev} - -X main.buildRev ${rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} - ''; - - preBuild = '' - ( - cd "go/src/$goPackagePath" - go-bindata ./resources/ - ) - ''; - - meta = with lib; { - description = - "Allows ephemeral and batch jobs to expose metrics to Prometheus"; - homepage = https://github.com/prometheus/pushgateway; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix deleted file mode 100644 index 31acf79c813..00000000000 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-statsd-bridge-${version}"; - version = "0.1.0"; - goPackagePath = "github.com/prometheus/statsd_bridge"; - - src = fetchFromGitHub { - rev = version; - owner = "prometheus"; - repo = "statsd_bridge"; - sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; - }; - - buildInputs = with goPackages; [ - fsnotify.v0 - prometheus.client_golang - ]; - - meta = with lib; { - description = "Receives StatsD-style metrics and exports them to Prometheus"; - homepage = https://github.com/prometheus/statsd_bridge; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch b/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch deleted file mode 100644 index d8f922aba37..00000000000 --- a/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Marc Dionne <marc.dionne@your-file-system.com> -Date: Thu, 25 Sep 2014 10:52:12 +0000 (-0300) -Subject: Linux 3.17: Deal with d_splice_alias errors -X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=af7f1d59135526ea584a4403b6400106dc92a992;hp=880401913d6190054bb0511093606a206b16326c - -Linux 3.17: Deal with d_splice_alias errors - -In 3.17 the logic in d_splice_alias has changed. Of interest to -us is the fact that it will now return an EIO error if it finds -an existing connected directory for the dentry, where it would -previously have added a new alias for it. As a result the end -user can get EIO errors when accessing any file in a volume -if the volume was first accessed through a different path (ex: -RO path vs RW path). - -This commit just restores the old behaviour, adding the directory -alias manually in the error case, which is what older versions -of d_splice_alias used to do. - -Change-Id: I5558c64760e4cad2bd3dc648067d81020afc69b6 ---- - -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index e03187f..0cdd9e0 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -1593,9 +1593,18 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp) - /* It's ok for the file to not be found. That's noted by the caller by - * seeing that the dp->d_inode field is NULL. - */ -- if (!code || code == ENOENT) -- return newdp; -- else -+ if (!code || code == ENOENT) { -+ /* -+ * d_splice_alias can return an error (EIO) if there is an existing -+ * connected directory alias for this dentry. -+ */ -+ if (!IS_ERR(newdp)) -+ return newdp; -+ else { -+ d_add(dp, ip); -+ return NULL; -+ } -+ } else - return ERR_PTR(afs_convert_code(code)); - } - diff --git a/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch b/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch deleted file mode 100644 index f8844915f85..00000000000 --- a/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 880401913d6190054bb0511093606a206b16326c Mon Sep 17 00:00:00 2001 -From: Marc Dionne <marc.dionne@your-file-system.com> -Date: Tue, 9 Sep 2014 10:39:55 -0300 -Subject: [PATCH] Linux 3.17: No more typedef for ctl_table - -The typedef has been removed so we need to use the structure -directly. - -Note that the API for register_sysctl_table has also changed -with 3.17, but it reverted back to a form that existed -before and the configure tests handle it correctly. - -Change-Id: If1fd9d27f795dee4b5aa2152dd09e0540d643a69 ---- - src/afs/LINUX/osi_sysctl.c | 4 ++-- - src/cf/linux-test4.m4 | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c -index a8f7fac..834e8ad 100644 ---- a/src/afs/LINUX/osi_sysctl.c -+++ b/src/afs/LINUX/osi_sysctl.c -@@ -34,7 +34,7 @@ extern afs_int32 afs_pct2; - #ifdef CONFIG_SYSCTL - static struct ctl_table_header *afs_sysctl = NULL; - --static ctl_table afs_sysctl_table[] = { -+static struct ctl_table afs_sysctl_table[] = { - { - #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) - #if defined(CTL_UNNUMBERED) -@@ -234,7 +234,7 @@ static ctl_table afs_sysctl_table[] = { - {0} - }; - --static ctl_table fs_sysctl_table[] = { -+static struct ctl_table fs_sysctl_table[] = { - { - #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) - #if defined(CTL_UNNUMBERED) -diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 -index dad91d9..228b491 100644 ---- a/src/cf/linux-test4.m4 -+++ b/src/cf/linux-test4.m4 -@@ -395,7 +395,7 @@ AC_DEFUN([LINUX_REGISTER_SYSCTL_TABLE_NOFLAG], [ - AC_CHECK_LINUX_BUILD([whether register_sysctl_table has an insert_at_head argument], - [ac_cv_linux_register_sysctl_table_noflag], - [#include <linux/sysctl.h>], -- [ctl_table *t; register_sysctl_table (t);], -+ [struct ctl_table *t; register_sysctl_table (t);], - [REGISTER_SYSCTL_TABLE_NOFLAG], - [define if register_sysctl_table has no insert_at head flag], - []) --- -1.7.1 diff --git a/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch b/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch deleted file mode 100644 index b95cfb4c620..00000000000 --- a/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e284db57f94c8f97ed1c95dcd0bd9518d86c050c Mon Sep 17 00:00:00 2001 -From: Marc Dionne <marc.dionne@your-file-system.com> -Date: Wed, 18 Jun 2014 08:53:48 -0400 -Subject: [PATCH] Linux 3.16: Switch to iter_file_splice_write - -Users of generic_file_splice_write need to switch to -using iter_file_splice_write. - -Change-Id: If4801d27e030e1cb986f483cf437a2cfa7398eb3 -Reviewed-on: http://gerrit.openafs.org/11302 -Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Tested-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com> -Tested-by: Jeffrey Altman <jaltman@your-file-system.com> ---- - acinclude.m4 | 3 +++ - src/afs/LINUX/osi_vnodeops.c | 4 ++++ - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index ae8f1ed..9e39d90 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -958,6 +958,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) - AC_CHECK_LINUX_FUNC([inode_setattr], - [#include <linux/fs.h>], - [inode_setattr(NULL, NULL);]) -+ AC_CHECK_LINUX_FUNC([iter_file_splice_write], -+ [#include <linux/fs.h>], -+ [iter_file_splice_write(NULL,NULL,NULL,0,0);]) - AC_CHECK_LINUX_FUNC([kernel_setsockopt], - [#include <linux/net.h>], - [kernel_setsockopt(NULL, 0, 0, NULL, 0);]) -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index 6f4000b..2685915 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -827,7 +827,11 @@ struct file_operations afs_file_fops = { - .sendfile = generic_file_sendfile, - #endif - #if defined(STRUCT_FILE_OPERATIONS_HAS_SPLICE) -+# if defined(HAVE_LINUX_ITER_FILE_SPLICE_WRITE) -+ .splice_write = iter_file_splice_write, -+# else - .splice_write = generic_file_splice_write, -+# endif - .splice_read = generic_file_splice_read, - #endif - .release = afs_linux_release, --- -1.7.1 diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 09c6468956f..e2f01206c9b 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -1,24 +1,14 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc, kernel, glibc, ncurses, perl, kerberos }: -assert stdenv.isLinux; -assert builtins.substring 0 4 kernel.version != "3.18"; - stdenv.mkDerivation { - name = "openafs-1.6.9-${kernel.version}"; + name = "openafs-1.6.14-${kernel.version}"; src = fetchurl { - url = http://www.openafs.org/dl/openafs/1.6.9/openafs-1.6.9-src.tar.bz2; - sha256 = "1isgw7znp10w0mr3sicnjzbc12bd1gdwfqqr667w6p3syyhs6bkv"; + url = http://www.openafs.org/dl/openafs/1.6.14/openafs-1.6.14-src.tar.bz2; + sha256 = "3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f"; }; - patches = [ - ./f3c0f74186f4a323ffc5f125d961fe384d396cac.patch - ./ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch - ./I5558c64760e4cad2bd3dc648067d81020afc69b6.patch - ./If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch - ]; - buildInputs = [ autoconf automake flex yacc ncurses perl which ]; preConfigure = '' @@ -34,14 +24,14 @@ stdenv.mkDerivation { ./regen.sh - ${stdenv.lib.optionalString (kerberos != null) '' - export KRB5_CONFIG=${kerberos}/bin/krb5-config" - ''} + ${stdenv.lib.optionalString (kerberos != null) + "export KRB5_CONFIG=${kerberos}/bin/krb5-config"} configureFlagsArray=( "--with-linux-kernel-build=$TMP/linux" ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"} "--sysconfdir=/etc/static" + "--disable-linux-d_splice-alias-extra-iput" ) ''; diff --git a/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch b/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch deleted file mode 100644 index e197ee4a34c..00000000000 --- a/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch +++ /dev/null @@ -1,130 +0,0 @@ -From: Marc Dionne <marc.dionne@your-file-system.com> -Date: Wed, 18 Jun 2014 13:06:39 +0000 (-0400) -Subject: Linux 3.16: Convert to new write_iter/read_iter ops -X-Git-Tag: openafs-stable-1_6_10pre1~76 -X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=f3c0f74186f4a323ffc5f125d961fe384d396cac - -Linux 3.16: Convert to new write_iter/read_iter ops - -Change read/write operations to the new write_iter/read_iter -operations. - -Reviewed-on: http://gerrit.openafs.org/11303 -Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Tested-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com> -Tested-by: Jeffrey Altman <jaltman@your-file-system.com> -(cherry picked from commit a303bb257ed9e790d8c14644779e9508167887b6) - -Change-Id: I3f66104be067698a4724ed78537765cf26d4aa10 -Reviewed-on: http://gerrit.openafs.org/11309 -Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Tested-by: BuildBot <buildbot@rampaginggeek.com> -Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de> ---- - -diff --git a/acinclude.m4 b/acinclude.m4 -index 83a1a8c..13d70db 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -836,6 +836,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) - AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h]) - AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h]) - AC_CHECK_LINUX_STRUCT([file_operations], [iterate], [fs.h]) -+ AC_CHECK_LINUX_STRUCT([file_operations], [read_iter], [fs.h]) - AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h]) - AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h]) - AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h]) -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index 441cce7..818debe 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -99,8 +99,11 @@ afs_linux_VerifyVCache(struct vcache *avc, cred_t **retcred) { - return afs_convert_code(code); - } - --#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ --# ifdef LINUX_HAS_NONVECTOR_AIO -+#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ) -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+static ssize_t -+afs_linux_read_iter(struct kiocb *iocb, struct iov_iter *iter) -+# elif defined(LINUX_HAS_NONVECTOR_AIO) - static ssize_t - afs_linux_aio_read(struct kiocb *iocb, char __user *buf, size_t bufsize, - loff_t pos) -@@ -113,6 +116,11 @@ afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf, - struct file *fp = iocb->ki_filp; - ssize_t code = 0; - struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode); -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+ loff_t pos = iocb->ki_pos; -+ unsigned long bufsize = iter->nr_segs; -+# endif -+ - - AFS_GLOCK(); - afs_Trace4(afs_iclSetp, CM_TRACE_AIOREADOP, ICL_TYPE_POINTER, vcp, -@@ -125,7 +133,11 @@ afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf, - * so we optimise by not using it */ - osi_FlushPages(vcp, NULL); /* ensure stale pages are gone */ - AFS_GUNLOCK(); -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+ code = generic_file_read_iter(iocb, iter); -+# else - code = generic_file_aio_read(iocb, buf, bufsize, pos); -+# endif - AFS_GLOCK(); - } - -@@ -170,8 +182,11 @@ afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp) - * also take care of re-positioning the pointer if file is open in append - * mode. Call fake open/close to ensure we do writes of core dumps. - */ --#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ --# ifdef LINUX_HAS_NONVECTOR_AIO -+#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ) -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+static ssize_t -+afs_linux_write_iter(struct kiocb *iocb, struct iov_iter *iter) -+# elif defined(LINUX_HAS_NONVECTOR_AIO) - static ssize_t - afs_linux_aio_write(struct kiocb *iocb, const char __user *buf, size_t bufsize, - loff_t pos) -@@ -184,6 +199,10 @@ afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf, - ssize_t code = 0; - struct vcache *vcp = VTOAFS(iocb->ki_filp->f_dentry->d_inode); - cred_t *credp; -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+ loff_t pos = iocb->ki_pos; -+ unsigned long bufsize = iter->nr_segs; -+# endif - - AFS_GLOCK(); - -@@ -199,7 +218,11 @@ afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf, - ReleaseWriteLock(&vcp->lock); - if (code == 0) { - AFS_GUNLOCK(); -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+ code = generic_file_write_iter(iocb, iter); -+# else - code = generic_file_aio_write(iocb, buf, bufsize, pos); -+# endif - AFS_GLOCK(); - } - -@@ -788,7 +811,12 @@ struct file_operations afs_dir_fops = { - }; - - struct file_operations afs_file_fops = { --#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ -+#ifdef STRUCT_FILE_OPERATIONS_HAS_READ_ITER -+ .read_iter = afs_linux_read_iter, -+ .write_iter = afs_linux_write_iter, -+ .read = new_sync_read, -+ .write = new_sync_write, -+#elif defined(HAVE_LINUX_GENERIC_FILE_AIO_READ) - .aio_read = afs_linux_aio_read, - .aio_write = afs_linux_aio_write, - .read = do_sync_read, diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 0af0b427bf2..8c693d9145f 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -44,7 +44,7 @@ let pluginsWithoutDeps = [ "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate" - "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics" + "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics" "mbcollection" "mbsync" "metasync" "missing" "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero" @@ -60,14 +60,14 @@ let in buildPythonPackage rec { name = "beets-${version}"; - version = "1.3.13"; + version = "1.3.14"; namePrefix = ""; src = fetchFromGitHub { owner = "sampsyo"; repo = "beets"; rev = "v${version}"; - sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl"; + sha256 = "0bha101x1wdrl2hj31fhixm3hp7ahdm2064b9k5gg0ywm651128g"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index e2857eed7d8..f2ae4e83ad1 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,11 +1,6 @@ { stdenv, fetchurl, openssl, zlib, e2fsprogs }: let - bashCompletion = fetchurl { - url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash"; - sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405"; - }; - zshCompletion = fetchurl { url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh"; sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair"; @@ -13,18 +8,25 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.35"; + version = "1.0.36.1"; src = fetchurl { - url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz"; - sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc"; + url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; + sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452"; }; + preConfigure = '' + configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d" + ''; + + patchPhase = '' + substituteInPlace Makefile.in \ + --replace "command -p mv" "mv" + ''; + postInstall = '' # Install some handy-dandy shell completions - mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions - cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash - cp ${zshCompletion} $out/share/zsh/site-functions/_tarsnap + install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; buildInputs = [ openssl zlib e2fsprogs ]; diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index 77d0352f670..c5614506901 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-08-18"; + version = "2015-08-29"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "cf8a360cd1e3937aa1ac74fbf39790b7fb43e71f"; - sha256 = "0d8vlxap800x8gil16124nb4yvfqb5wa3pk09knrikmmwia49k9v"; + rev = "54626351679fe312d5b96cc0304755ae5f1ece40"; + sha256 = "12rdp1q7arxhg259y08pzix22yjlrjs5qmwv342qcl5xbfkg502r"; }; patches = [ ./fix-pythonpath.patch ]; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix new file mode 100644 index 00000000000..161425ad137 --- /dev/null +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, fuse, zlib, glib }: + +stdenv.mkDerivation rec { + name = "fuseiso-20070708"; + + src = fetchurl { + url = "http://sourceforge.net/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2"; + sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692"; + }; + + buildInputs = [ pkgconfig fuse zlib glib ]; + + meta = { + homepage = http://sourceforge.net/projects/fuseiso; + description = "FUSE module to mount ISO filesystem images"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index f8925d26bea..b6158ab6445 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,30 +1,50 @@ {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile , FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper -, perlPackages +, perlPackages, curl, gnupg, diffutils +, sendmailPath ? "/var/setuid-wrappers/sendmail" }: + stdenv.mkDerivation rec { - version = "2.15.4"; + version = "2.15.8"; name = "debian-devscripts-${version}"; + src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72"; + sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx"; }; + buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile FileDesktopEntry libxslt python3 setuptools makeWrapper - perlPackages.ParseDebControl ]; + perlPackages.ParseDebControl perlPackages.LWPProtocolHttps + curl gnupg diffutils ]; + preConfigure = '' export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; - sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile - sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile tgtpy="$out/lib/${python3.libPrefix}/site-packages" mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" - sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile* - sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile* - - # Completion currently spams every shell startup with an error. Disable for now: - sed "/\/bash_completion\.d/d" -i scripts/Makefile + find po4a scripts -type f -exec sed -r \ + -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \ + -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ + -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ + -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \ + -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \ + -i {} + + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile + sed -r \ + -e "s@/usr( |$|/)@$out\\1@g" \ + -e "s@/etc( |$|/)@$out/etc\\1@g" \ + -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' \ + -i Makefile* */Makefile* ''; + + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + "COMPL_DIR=/share/bash-completion/completions" + "PERLMOD_DIR=/share/devscripts" + ]; + postInstall = '' sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/* for i in "$out/bin"/*; do @@ -34,9 +54,10 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" done ''; - meta = { + + meta = with stdenv.lib; { description = ''Debian package maintenance scripts''; - license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO - maintainers = with stdenv.lib.maintainers; [raskin]; + license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO + maintainers = with maintainers; [raskin]; }; } diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix new file mode 100644 index 00000000000..589f7d9a94b --- /dev/null +++ b/pkgs/tools/misc/urjtag/default.nix @@ -0,0 +1,38 @@ +{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison +, flex, fetchgit, makeWrapper +, jedecSupport ? false +, pythonBindings ? false +, python3 ? null +}: + +stdenv.mkDerivation rec { + version = "0.10"; + name = "urjtag-${version}"; + + src = fetchgit { + url = "git://git.code.sf.net/p/urjtag/git"; + rev = "7ba12da7845af7601e014a2a107670edc5d6997d"; + sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a"; + }; + + buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ] + ++ stdenv.lib.optional pythonBindings python3; + + configureFlags = '' + --prefix=/ + ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"} + ${if pythonBindings then "--enable-python" else "--disable-python"} + ''; + preConfigure = "cd urjtag; ./autogen.sh"; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = { + description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; + homepage = "http://urjtag.org/"; + license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + }; +} + diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 51812ff95b7..cc914d6616c 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-distro=exherbo" "--with-dhclient=${dhcp}/bin/dhclient" + "--with-dnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd" "--with-dhcpcd=no" diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index b2bf65ff9ee..5b95dd159bf 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.8"; + name = "openvpn-2.3.7"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k"; + sha256 = "0vhl0ddpxqfibc0ah0ci7ix9bs0cn5shhmhijg550qpbdb6s80hz"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { IPROUTE=${iproute}/sbin/ip ''; - preConfigure = '' - substituteInPlace ./src/openvpn/console.c \ - --replace /bin/systemd-ask-password /run/current-system/sw/bin/systemd-ask-password - ''; - postInstall = '' mkdir -p $out/share/doc/openvpn/examples cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 022b8dfc2ca..2357ec77f12 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: -let version = "1.18.1"; in +let version = "1.18.2"; in stdenv.mkDerivation { name = "dpkg-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1nlr0djn5zl9cmlcxxmd7dk3fx0zw9gi4qm7cfz0r5qwl9yaj9nb"; + sha256 = "192pqjd0c7i91kiqzn3cq2sqp5vivf0079i0wybdc9yhfcm4yj0i"; }; postPatch = '' @@ -20,10 +20,10 @@ stdenv.mkDerivation { configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}"; preConfigure = '' - # Nice: dpkg has a circular dependency on itself. Its configure + # Nice: dpkg has a circular dependency on itself. Its configure # script calls scripts/dpkg-architecture, which calls "dpkg" in - # $PATH. It doesn't actually use its result, but fails if it - # isn't present. So make a dummy available. + # $PATH. It doesn't actually use its result, but fails if it + # isn't present, so make a dummy available. touch $TMPDIR/dpkg chmod +x $TMPDIR/dpkg PATH=$TMPDIR:$PATH diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 7075b03bdfa..c2842ae2e75 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }: -let version = "1.0.7"; in +let version = "1.0.8"; in stdenv.mkDerivation { name = "packagekit-${version}"; src = fetchurl { - sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi"; + sha256 = "1vaxn4kwdwx6p03n88k4pnbd2l6lb0cbxpcs88kjack1jml17c3l"; url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; }; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 75ad9382b9f..92a0e46b79d 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.86b"; + version = "1.88b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "1by9ncf6lgcyibzqwyla34jv64sd66mn8zhgjz2pcgsds51qwn0r"; + sha256 = "10j0b4kzr4rmflcnxhb2r3klxc4sspx23bpgxjaqflp4z3zf5m1v"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 57cc9c24248..faba4037d3d 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "6.47"; + version = "6.49BETA4"; src = fetchurl { url = "http://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "14d53aji4was68c01pf105n5ylha257wmdbx40ddiqiw42g1x8cg"; + sha256 = "042fg73w7596b3h6ha9y62ckc0hd352zv1shwip3dx14v5igrsna"; }; patches = ./zenmap.patch; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 668a7605115..893b7b31900 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -2,15 +2,24 @@ stdenv.mkDerivation rec { name = "scrypt-${version}"; - version = "1.1.6"; + version = "1.2.0"; src = fetchurl { - url = "https://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz"; - sha256 = "dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8"; + url = "https://www.tarsnap.com/scrypt/${name}.tgz"; + sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p"; }; buildInputs = [ openssl ]; + patchPhase = '' + substituteInPlace Makefile \ + --replace "command -p mv" "mv" + substituteInPlace Makefile.in \ + --replace "command -p mv" "mv" + substituteInPlace autocrap/Makefile.am \ + --replace "command -p mv" "mv" + ''; + meta = { description = "Encryption utility"; homepage = https://www.tarsnap.com/scrypt.html; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 30b546361f2..f215c635de5 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "dos2unix-7.2.2"; + name = "dos2unix-7.3"; src = fetchurl { url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; - sha256 = "04i6kkl6l1vp1b81i0wncixwyab2dzmh7vp1cvma8zr6jrr908ww"; + sha256 = "1la496gpc7b1vka36bs54pf85jfbwa6fdplgj6lamvbj59azfxc1"; }; configurePhase = '' diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix index c2c9a942845..a822a181a65 100644 --- a/pkgs/tools/typesetting/bibtex-tools/default.nix +++ b/pkgs/tools/typesetting/bibtex-tools/default.nix @@ -13,4 +13,5 @@ stdenv.mkDerivation { --with-hevea=${hevea} --with-latex=${tetex}"; buildInputs = [aterm sdf strategoxt hevea]; + meta.broken = true; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64d9637d83a..1312a932f70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1576,6 +1576,8 @@ let fsfs = callPackage ../tools/filesystems/fsfs { }; + fuseiso = callPackage ../tools/filesystems/fuseiso { }; + fuse_zip = callPackage ../tools/filesystems/fuse-zip { }; fuse_exfat = callPackage ../tools/filesystems/fuse-exfat { }; @@ -3456,6 +3458,11 @@ let uptimed = callPackage ../tools/system/uptimed { }; + urjtag = callPackage ../tools/misc/urjtag { + jedecSupport = true; + pythonBindings = true; + }; + urlwatch = callPackage ../tools/networking/urlwatch { }; varnish = callPackage ../servers/varnish { }; @@ -7709,7 +7716,6 @@ let nethack = callPackage ../games/nethack { }; - nettle27 = callPackage ../development/libraries/nettle/27.nix { }; nettle = callPackage ../development/libraries/nettle { }; newt = callPackage ../development/libraries/newt { }; @@ -9201,28 +9207,18 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; - prom2json = callPackage ../servers/monitoring/prometheus/prom2json { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; - prometheus-alertmanager = - callPackage ../servers/monitoring/prometheus/alertmanager { }; - prometheus-cli = - callPackage ../servers/monitoring/prometheus/cli { }; - prometheus-collectd-exporter = - callPackage ../servers/monitoring/prometheus/collectd_exporter { }; - prometheus-haproxy-exporter = - callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; - prometheus-mesos-exporter = - callPackage ../servers/monitoring/prometheus/mesos_exporter { }; - prometheus-mysqld-exporter = - callPackage ../servers/monitoring/prometheus/mysqld_exporter { }; - prometheus-nginx-exporter = - callPackage ../servers/monitoring/prometheus/nginx_exporter { }; - prometheus-node-exporter = - callPackage ../servers/monitoring/prometheus/node_exporter { }; - prometheus-pushgateway = - callPackage ../servers/monitoring/prometheus/pushgateway { }; - prometheus-statsd-bridge = - callPackage ../servers/monitoring/prometheus/statsd_bridge { }; + prom2json = goPackages.prometheus.prom2json.bin; + prometheus = goPackages.prometheus.prometheus.bin; + prometheus-alertmanager = goPackages.prometheus.alertmanager.bin; + prometheus-cli = goPackages.prometheus.cli.bin; + prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin; + prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin; + prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin; + prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin; + prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin; + prometheus-node-exporter = goPackages.prometheus.node-exporter.bin; + prometheus-pushgateway = goPackages.prometheus.pushgateway.bin; + prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; @@ -9791,6 +9787,16 @@ let ]; }; + linux_4_2 = makeOverridable (import ../os-specific/linux/kernel/linux-4.2.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] @@ -9956,7 +9962,7 @@ let linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_1; + linuxPackages_latest = pkgs.linuxPackages_4_2; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -9968,6 +9974,7 @@ let linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); + linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; @@ -11417,9 +11424,7 @@ let fftw = fftwFloat; }; - gnuradio-wrapper = callPackage ../applications/misc/gnuradio/wrapper.nix { }; - - gnuradio-full = gnuradio-wrapper.override { + gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { extraPackages = [ gnuradio-osmosdr ]; }; @@ -15276,8 +15281,13 @@ let mg = callPackage ../applications/editors/mg { }; - - # Attributes for backward compatibility. +} + ### Aliases to attributes converted to the dashed-style. + // lib.mapAttrs (name: builtins.trace + ( "Warning: using a deprecated attribute '${name}'." + + " CamelCase and under_scores are replaced by dashed-names" + + " to match the nix-env names better.")) +{ # warnings since 2015-09 adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 @@ -15286,8 +15296,6 @@ let lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 - youtubeDL = youtube-dl; # added 2014-10-26 - youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 rdiff_backup = rdiff-backup; # added 2014-11-23 htmlTidy = html-tidy; # added 2014-12-06 libtidy = html-tidy; # added 2014-12-21 @@ -15295,8 +15303,17 @@ let sqliteInteractive = sqlite-interactive; # added 2014-12-06 nfsUtils = nfs-utils; # added 2014-12-06 buildbotSlave = buildbot-slave; # added 2014-12-09 - cool-old-term = cool-retro-term; # added 2015-01-31 rssglx = rss-glx; #added 2015-03-25 + +} + ### Other attribute aliases for backward compatibility. + // lib.mapAttrs + (name: builtins.trace "Warning: using a deprecated attribute '${name}'.") +{ # warnings since 2015-09 + youtubeDL = youtube-dl; # added 2014-10-26 + youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 + cool-old-term = cool-retro-term; # added 2015-01-31 + haskell-ng = haskell; # 2015-04-19 haskellngPackages = haskellPackages; # 2015-04-19 inherit (haskell.compiler) jhc uhc; # 2015-05-15 diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6b93b4ec244..0c373d1b215 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -19,10 +19,11 @@ let ## OFFICIAL GO PACKAGES crypto = buildFromGitHub { - rev = "e7913d6af127b363879a06a5ae7c5e93c089aedd"; + rev = "d5c5f1769f2fcd2377be6f29863081f59a4fc80f"; + date = "2015-08-29"; owner = "golang"; repo = "crypto"; - sha256 = "0g2gm2wmanprsirmclxi8qxjkw93nih60ff8jwrfb4wyn7hxbds7"; + sha256 = "0rkcvl3q8akkar4rmj052z23y61hbav9514ky6grb4gvxfx4ydbn"; goPackagePath = "golang.org/x/crypto"; goPackageAliases = [ "code.google.com/p/go.crypto" @@ -31,31 +32,29 @@ let }; glog = buildFromGitHub { - rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + date = "2015-07-31"; owner = "golang"; repo = "glog"; - sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; }; - image = buildGoPackage rec { - rev = "d8e202c6ce59fad0017414839b6648851d10767e"; - name = "image-${stdenv.lib.strings.substring 0 7 rev}"; + image = buildFromGitHub { + rev = "8ab1ac6834edd43d91cbe24272897a87ce7e835e"; + date = "2015-08-23"; + owner = "golang"; + repo = "image"; + sha256 = "1ckr7yh5dx2kbvp9mis7i090ss9qcz46sazrj9f2hw4jj5g3y7dr"; goPackagePath = "golang.org/x/image"; - - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "image"; - sha256 = "0cxymm28rgbzsk76d19wm8fwp40dkwxhzmmdjnbkw5541272339l"; - }; + goPackageAliases = [ "github.com/golang/image" ]; }; net = buildFromGitHub { - rev = "3a29182c25eeabbaaf94daaeecbc7823d86261e7"; - date = "2015-07-28"; + rev = "ea47fc708ee3e20177f3ca3716217c4ab75942cb"; + date = "2015-08-29"; owner = "golang"; repo = "net"; - sha256 = "0g4w411l0v9yg8aib05kzjm9j6dwsd6nk6ayk8j0dkmqildqrx5v"; + sha256 = "0x1pmg97n7l62vak9qnjdjrrfl98jydhv6j0w3jkk4dycdlzn30d"; goPackagePath = "golang.org/x/net"; goPackageAliases = [ "code.google.com/p/go.net" @@ -66,10 +65,11 @@ let }; oauth2 = buildFromGitHub { - rev = "f98d0160877ab4712b906626425ed8b0b320907c"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + date = "2015-06-23"; owner = "golang"; repo = "oauth2"; - sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; goPackagePath = "golang.org/x/oauth2"; goPackageAliases = [ "github.com/golang/oauth2" ]; propagatedBuildInputs = [ net gcloud-golang-compute-metadata ]; @@ -77,10 +77,11 @@ let protobuf = buildFromGitHub { - rev = "68c687dc49948540b356a6b47931c9be4fcd0245"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + date = "2015-08-23"; owner = "golang"; repo = "protobuf"; - sha256 = "0va2x13mygmkvr7ajkg0fj4i1ha0jbxgghya20qgsh0vlp7k5maf"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; goPackagePath = "github.com/golang/protobuf"; goPackageAliases = [ "code.google.com/p/goprotobuf" ]; }; @@ -111,10 +112,11 @@ let }; text = buildFromGitHub { - rev = "3eb7007b740b66a77f3c85f2660a0240b284115a"; + rev = "505f8b49cc14d790314b7535959a10b87b9161c7"; + date = "2015-08-27"; owner = "golang"; repo = "text"; - sha256 = "1pxrqbs760azmjaigf63qd6rwmz51hi6i8fq0vwcf5svxgxz2szp"; + sha256 = "0h31hyb1ijs7zcsmpwa713x41k1wkh0igv7i4chwvwyjyl7zligy"; goPackagePath = "golang.org/x/text"; goPackageAliases = [ "github.com/golang/text" ]; }; @@ -382,7 +384,6 @@ let consul = buildFromGitHub rec { rev = "v0.5.2"; - date = rev; owner = "hashicorp"; repo = "consul"; sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7"; @@ -511,8 +512,6 @@ let name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/godbus/dbus"; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "godbus"; @@ -562,11 +561,10 @@ let }; etcd = buildFromGitHub { - rev = "v2.1.1"; + rev = "v2.1.2"; owner = "coreos"; repo = "etcd"; - sha256 = "0jd97091jwwdvx50vbdi1py9v5w9fk86cw85p0zinb0ww6bs4y0s"; - excludedPackages = "Godeps"; + sha256 = "1d3wl9rqbhkkdhfkjfrzjfcwz8hx315zbjbmij3pf62bc1p5nh60"; }; fsnotify.v0 = buildGoPackage rec { @@ -764,6 +762,7 @@ let govers = buildFromGitHub { rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; + date = "2015-01-09"; owner = "rogpeppe"; repo = "govers"; sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc"; @@ -824,13 +823,13 @@ let }; google-api-go-client = buildFromGitHub { - rev = "ca0499560ea76ac6561548f36ffe841364fe2348"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + date = "2015-08-19"; owner = "google"; repo = "google-api-go-client"; - sha256 = "1w6bjhd8p6fxvm002jqk3r9vk50hlaqnxc9g6msb2wswy3nxcw57"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; goPackagePath = "google.golang.org/api"; goPackageAliases = [ "github.com/google/google-api-client" ]; - excludedPackages = "examples"; buildInputs = [ net ]; }; @@ -844,9 +843,6 @@ let repo = "google-api-go-client"; sha256 = "1fidlljxnd82i2r9yia0b9gh0vv3hwb5k65papnvw7sqpc4sriby"; }; - preBuild = '' - rm -rf go/src/${goPackagePath}/examples - ''; buildInputs = [ net ]; propagatedBuildInputs = [ google-api-go-client ]; }; @@ -873,7 +869,6 @@ let repo = "goproxy"; sha256 = "1zz425y8byjaa9i7mslc9anz9w2jc093fjl0562rmm5hh4rc5x5f"; buildInputs = [ go-charset ]; - excludedPackages = "examples"; }; gosnappy = buildFromGitHub { @@ -1042,7 +1037,6 @@ let sha256 = "0ygh0f6p679r095l4bym8q4l45w2l3d8r3hx9xrnnppxq59i2395"; buildInputs = [ oauth2 ]; propagatedBuildInputs = [ go-querystring ]; - excludedPackages = "examples"; }; go-gypsy = buildFromGitHub { @@ -1103,7 +1097,6 @@ let goPackagePath = "gopkg.in/lxc/go-lxc.v2"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.lxc ]; - excludedPackages = "examples"; }; rcrowley.go-metrics = buildGoPackage rec { @@ -1259,8 +1252,6 @@ let name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/coreos/go-systemd"; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "coreos"; @@ -1277,7 +1268,6 @@ let owner = "stgraber"; repo = "lxd-go-systemd"; sha256 = "006dhy3j8ld0kycm8hrjxvakd7xdn1b6z2dsjp1l4sqrxdmm188w"; - excludedPackages = "examples"; buildInputs = [ dbus ]; }; @@ -1367,14 +1357,15 @@ let }; grpc = buildFromGitHub { - rev = "7d81e8054fb2d57468136397b9b681e4ba4a7f8e"; + rev = "d455e65570c07e6ee7f23275063fbf34660ea616"; + date = "2015-08-29"; owner = "grpc"; repo = "grpc-go"; - sha256 = "0hknsqyzpnvjc2jvm741b16qi4jayijyhpxinskkm0nj0iy59h27"; + sha256 = "08vra95hc8ihnj353680zhiqrv3ssw5yywkrifzb1zwl0l3cs2hr"; goPackagePath = "google.golang.org/grpc"; goPackageAliases = [ "github.com/grpc/grpc-go" ]; - propagatedBuildInputs = [ http2 net protobuf oauth2 glog ]; - excludedPackages = "\\(examples\\|benchmark\\)"; + propagatedBuildInputs = [ http2 net protobuf oauth2 glog etcd ]; + excludedPackages = "\\(test\\|benchmark\\)"; }; gucumber = buildGoPackage rec { @@ -1406,8 +1397,6 @@ let name = "hipchat-go-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/tbruyelle/hipchat-go"; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "tbruyelle"; @@ -1521,7 +1510,6 @@ let owner = "ipfs"; repo = "go-ipfs"; sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg"; - excludedPackages = "Godeps"; }; ldap = buildGoPackage rec { @@ -1548,8 +1536,6 @@ let name = "levigo-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/jmhodges/levigo"; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "jmhodges"; @@ -1592,8 +1578,6 @@ let "code.google.com/p/log4go" ]; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "ccpaging"; @@ -1606,11 +1590,9 @@ let logrus = buildFromGitHub rec { rev = "v0.8.6"; - date = rev; # Trick buildFromGitHub into keeping the version number. owner = "Sirupsen"; repo = "logrus"; sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa"; - excludedPackages = "examples"; propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ]; }; @@ -1717,12 +1699,10 @@ let # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer - installPhase = '' - mkdir -p $bin/bin + buildPhase = '' while read b; do - rm -f go/bin/main go install $goPackagePath/$b/main - cp go/bin/main $bin/bin/$b + mv go/bin/main go/bin/$b done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a) ''; }; @@ -1972,9 +1952,46 @@ let propagatedBuildInputs = [ kr.text ]; }; - prometheus.client_golang = buildFromGitHub rec { + prometheus.alertmanager = buildGoPackage rec { + name = "prometheus-alertmanager-${rev}"; + rev = "0.0.4"; + goPackagePath = "github.com/prometheus/alertmanager"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "alertmanager"; + inherit rev; + sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15"; + }; + + buildInputs = [ + fsnotify.v0 + httprouter + prometheus.client_golang + prometheus.log + pushover + ]; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion=${rev} + -X main.buildBranch=master + -X main.buildUser=nix@nixpkgs + -X main.buildDate=20150101-00:00:00 + -X main.goVersion=${stdenv.lib.getVersion go} + ''; + + meta = with stdenv.lib; { + description = "Alert dispatcher for the Prometheus monitoring system"; + homepage = https://github.com/prometheus/alertmanager; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.client_golang = buildFromGitHub { rev = "0.7.0"; - date = rev; # Trick buildFromGitHub into keeping the version number owner = "prometheus"; repo = "client_golang"; sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; @@ -1986,7 +2003,26 @@ let prometheus.procfs beorn7.perks ]; - excludedPackages = "examples"; + }; + + prometheus.cli = buildFromGitHub { + rev = "0.3.0"; + owner = "prometheus"; + repo = "prometheus_cli"; + sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; + + buildInputs = [ + prometheus.client_model + prometheus.client_golang + ]; + + meta = with stdenv.lib; { + description = "Command line tool for querying the Prometheus HTTP API"; + homepage = https://github.com/prometheus/prometheus_cli; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; }; prometheus.client_model = buildFromGitHub { @@ -1998,6 +2034,36 @@ let buildInputs = [ protobuf ]; }; + prometheus.collectd-exporter = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "collectd_exporter"; + sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; + buildInputs = [ prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "Relay server for exporting metrics from collectd to Prometheus"; + homepage = https://github.com/prometheus/alertmanager; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.haproxy-exporter = buildFromGitHub { + rev = "0.4.0"; + owner = "prometheus"; + repo = "haproxy_exporter"; + sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr"; + buildInputs = [ prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "HAProxy Exporter for the Prometheus monitoring system"; + homepage = https://github.com/prometheus/haproxy_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + prometheus.log = buildFromGitHub { rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; date = "2015-05-29"; @@ -2007,6 +2073,76 @@ let propagatedBuildInputs = [ logrus ]; }; + prometheus.mesos-exporter = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "mesos_exporter"; + sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; + buildInputs = [ mesos-stats prometheus.client_golang glog ]; + meta = with stdenv.lib; { + description = "Export Mesos metrics to Prometheus"; + homepage = https://github.com/prometheus/mesos_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.mysqld-exporter = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "mysqld_exporter"; + sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; + buildInputs = [ mysql prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "Prometheus exporter for MySQL server metrics"; + homepage = https://github.com/prometheus/mysqld_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.nginx-exporter = buildFromGitHub { + rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; + date = "2015-06-01"; + owner = "discordianfish"; + repo = "nginx_exporter"; + sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; + buildInputs = [ prometheus.client_golang prometheus.log ]; + meta = with stdenv.lib; { + description = "Metrics relay from nginx stats to Prometheus"; + homepage = https://github.com/discordianfish/nginx_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.node-exporter = buildFromGitHub { + rev = "0.10.0"; + owner = "prometheus"; + repo = "node_exporter"; + sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p"; + + buildInputs = [ + go-runit + ntp + prometheus.client_golang + prometheus.client_model + prometheus.log + protobuf + ]; + + meta = with stdenv.lib; { + description = "Prometheus exporter for machine metrics"; + homepage = https://github.com/prometheus/node_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + prometheus.procfs = buildFromGitHub { rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; date = "2015-06-16"; @@ -2015,6 +2151,136 @@ let sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; }; + prometheus.prom2json = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "prom2json"; + sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; + + buildInputs = [ + golang_protobuf_extensions + prometheus.client_golang + protobuf + ]; + + meta = with stdenv.lib; { + description = "Tool to scrape a Prometheus client and dump the result as JSON"; + homepage = https://github.com/prometheus/prom2json; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.prometheus = buildGoPackage rec { + name = "prometheus-${version}"; + version = "0.15.1"; + goPackagePath = "github.com/prometheus/prometheus"; + rev = "64349aade284846cb194be184b1b180fca629a7c"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "prometheus"; + sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2"; + }; + + buildInputs = [ + consul + dns + fsnotify.v1 + go-zookeeper + goleveldb + httprouter + logrus + net + prometheus.client_golang + prometheus.log + yaml-v2 + ]; + + preInstall = '' + mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" + cp -a $src/documentation/* $bin/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + ''; + + # Metadata that gets embedded into the binary + buildFlagsArray = let t = "${goPackagePath}/version"; in + '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.Revision=${builtins.substring 0 6 rev} + -X ${t}.Branch=master + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=20150101-00:00:00 + -X ${t}.GoVersion=${stdenv.lib.getVersion go} + ''; + + meta = with stdenv.lib; { + description = "Service monitoring system and time series database"; + homepage = http://prometheus.io; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.pushgateway = buildFromGitHub rec { + rev = "0.1.1"; + owner = "prometheus"; + repo = "pushgateway"; + sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; + + buildInputs = [ + protobuf + httprouter + golang_protobuf_extensions + prometheus.client_golang + ]; + + nativeBuildInputs = [ go-bindata.bin ]; + preBuild = '' + ( + cd "go/src/$goPackagePath" + go-bindata ./resources/ + ) + ''; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion=${rev} + -X main.buildRev=${rev} + -X main.buildBranch=master + -X main.buildUser=nix@nixpkgs + -X main.buildDate=20150101-00:00:00 + -X main.goVersion=${stdenv.lib.getVersion go} + ''; + + meta = with stdenv.lib; { + description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; + homepage = https://github.com/prometheus/pushgateway; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.statsd-bridge = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "statsd_bridge"; + sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; + buildInputs = [ fsnotify.v0 prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "Receives StatsD-style metrics and exports them to Prometheus"; + homepage = https://github.com/prometheus/statsd_bridge; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + pty = buildFromGitHub { rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; owner = "kr"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 43fc9976ec7..cb8c53ad06c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -31,10 +31,7 @@ rec { ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); - ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { @@ -86,10 +83,6 @@ rec { ghc = compiler.ghc784; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc7101 = callPackage ../development/haskell-modules { - ghc = compiler.ghc7101; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - }; ghc7102 = callPackage ../development/haskell-modules { ghc = compiler.ghc7102; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3dc84c72c45..ec3d1ae7df5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2719,6 +2719,24 @@ let license = "BSD-style"; }; }); + + dask = buildPythonPackage rec { + name = "dask-${version}"; + version = "0.7.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dask/${name}.tar.gz"; + sha256 = "3b48646e9e66ec21a6885700d39ea90e2c2a7ad5d26773a8413b570eb1a67b3e"; + }; + + propagatedBuildInputs = with self; [numpy toolz dill]; + + meta = { + description = "Minimal task scheduling abstraction"; + homepage = "http://github.com/ContinuumIO/dask/"; + licenses = licenses.bsd3; + }; + }; datashape = buildPythonPackage rec { name = "datashape-${version}"; @@ -2946,6 +2964,24 @@ let license = licenses.mit; }; }; + + dill = buildPythonPackage rec { + name = "dill-${version}"; + version = "0.2.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dill/${name}.tgz"; + sha256 = "deca57da33ad2121ab1b9c4493bf8eb2b3a72b6426d4b9a3a853a073c68b97ca"; + }; + + propagatedBuildInputs = with self; [objgraph]; + + meta = { + description = "Serialize all of python (almost)"; + homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm; + license = licenses.bsd3; + }; + }; discogs_client = buildPythonPackage rec { name = "discogs-client-2.0.2"; @@ -4320,6 +4356,25 @@ let }; }; + pirate-get = pythonPackages.buildPythonPackage rec { + name = "pirate-get-${version}"; + version = "0.2.7"; + + disabled = !isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pirate-get/${name}.tar.gz"; + sha256 = "0awjrmczvd6rwzj4fb7bhjlil5mx91amjs7fk5890h3in52clxg3"; + }; + + propagatedBuildInputs = [ self.colorama ]; + + meta = { + description = "A command line interface for The Pirate Bay"; + homepage = https://github.com/vikstrous/pirate-get; + license = licenses.gpl1; + }; + }; poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; @@ -8874,6 +8929,27 @@ let maintainers = with maintainers; [ phreedom thoughtpolice ]; }; }); + + objgraph = buildPythonPackage rec { + name = "objgraph-${version}"; + version = "2.0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/o/objgraph/${name}.tar.gz"; + sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a"; + }; + + # Tests fail with PyPy. + disabled = isPyPy; + + propagatedBuildInputs = with self; [pkgs.graphviz]; + + meta = { + description = "Draws Python object reference graphs with graphviz"; + homepage = http://mg.pov.lt/objgraph/; + license = licenses.mit; + }; + }; odo = buildPythonPackage rec { name = "odo-${version}"; @@ -9014,6 +9090,25 @@ let }); + oslosphinx = buildPythonPackage rec { + name = "oslosphinx-3.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/o/oslosphinx/${name}.tar.gz"; + md5= "4fcac44bd6ef174586307a1508ff228f"; + }; + + doCheck = false; + + buildInputs = with self; [ + pbr requests2 + (sphinx.override {src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/sphinx/sphinx-1.2.3.tar.gz"; + sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04"; + };}) + ]; + }; + pagerduty = buildPythonPackage rec { name = "pagerduty-${version}"; version = "0.2.1"; @@ -9277,19 +9372,18 @@ let }; pbr = buildPythonPackage rec { - name = "pbr-0.9.0"; + name = "pbr-1.6.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pbr/${name}.tar.gz"; - sha256 = "e5a57c434b1faa509a00bf458d2c7af965199d9cced3d05a547bff9880f7e8cb"; + sha256 = "1lg1klrczvzfan89y3bl9ykrknl3nb01vvai37fkww24apzyibjf"; }; - # pip depend on $HOME setting - preConfigure = "export HOME=$TMPDIR"; - doCheck = false; - buildInputs = with self; [ pip ]; + propagatedBuildInputs = with self; [ pip ]; + buildInputs = with self; [ virtualenv ] + ++ stdenv.lib.optional doCheck testtools; meta = { description = "Python Build Reasonableness"; @@ -9449,10 +9543,10 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = pkgs.fetchFromGitHub { - sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj"; + sha256 = "1xl3yqwksnszd2vcgzb576m56613qcl82jfqmb9fbvcqlcpks6ln"; rev = "v${version}"; repo = "pgcli"; owner = "dbcli"; @@ -9462,10 +9556,6 @@ let click configobj prompt_toolkit psycopg2 pygments sqlparse ]; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - meta = { inherit version; description = "Command-line interface for PostgreSQL"; @@ -9481,17 +9571,17 @@ let mycli = buildPythonPackage rec { name = "mycli-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = pkgs.fetchFromGitHub { - sha256 = "109jz84m29v4fjhk2ngsfc1b6zw4w6dbjlr2izvib63ylcz7b5nh"; + sha256 = "175jcfixjkq17fbda9kifbljfd5iwjpjisvhs5xhxsyf6n5ykv2l"; rev = "v${version}"; repo = "mycli"; owner = "dbcli"; }; propagatedBuildInputs = with self; [ - pymysql configobj sqlparse prompt_toolkit0_45 pygments click + pymysql configobj sqlparse prompt_toolkit pygments click ]; meta = { @@ -9823,36 +9913,10 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.47"; + version = "0.46"; src = pkgs.fetchurl { - sha256 = "1xkrbz7d2mzd5r5a8aqbnhym57fkpri9x73cql5vb573glzwddla"; - url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; - }; - - buildInputs = with self; [ jedi ipython pygments ]; - propagatedBuildInputs = with self; [ docopt six wcwidth ]; - - meta = { - description = "Python library for building powerful interactive command lines"; - longDescription = '' - prompt_toolkit could be a replacement for readline, but it can be - much more than that. It is cross-platform, everything that you build - with it should run fine on both Unix and Windows systems. Also ships - with a nice interactive Python shell (called ptpython) built on top. - ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; - }; - }; - - prompt_toolkit0_45 = buildPythonPackage rec { - name = "prompt_toolkit-${version}"; - version = "0.45"; - - src = pkgs.fetchurl { - sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm"; + sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs"; url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; }; @@ -12489,6 +12553,13 @@ let buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ]; + # doctests fail on i686 + # https://github.com/NixOS/nixpkgs/issues/9472 + # https://github.com/scikit-learn/scikit-learn/issues/5177 + patchPhase = '' + substituteInPlace setup.cfg --replace 'with-doctest = 1' 'with-doctest = 0' + ''; + buildPhase = '' ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95' ''; @@ -12790,16 +12861,17 @@ let }; stevedore = buildPythonPackage rec { - name = "stevedore-0.15"; + name = "stevedore-1.7.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/stevedore/${name}.tar.gz"; - sha256 = "bec9269cbfa58de4f0849ec79bb7d54eeeed9df8b5fbfa1637fbc68062822847"; + sha256 = "149pjc0c3z6khjisn4yil3f94qjnzwafz093wc8rrzbw828qdkv8"; }; - buildInputs = with self; [ pbr pip ] ++ optional isPy26 argparse; + doCheck = false; - propagatedBuildInputs = with self; [ setuptools ]; + buildInputs = with self; [ pbr oslosphinx ]; + propagatedBuildInputs = with self; [ six argparse ]; meta = { description = "Manage dynamic plugins for Python applications"; @@ -13425,11 +13497,11 @@ let sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; - version = "0.1.14"; + version = "0.1.16"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sqlparse/${name}.tar.gz"; - sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5"; + sha256 = "108gy82x7davjrn3jqn7yv4r5v4jrzp892ysfx8l00abr8v6r337"; }; meta = {