diff options
22 files changed, 589 insertions, 382 deletions
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 2a58ff25941c..b613c7f06cc8 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -68,7 +68,7 @@ instance, if you try to define an option that doesn’t exist (that is, doesn’t have a corresponding <emphasis>option declaration</emphasis>), <command>nixos-rebuild</command> will give an error like: <screen> -The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist. +The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist. </screen> Likewise, values in option definitions must have a correct type. For instance, <option>services.httpd.enable</option> must be a Boolean diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index b79052337597..9abfb41087b7 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -15,6 +15,8 @@ let state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" log_file "syslog" + user "${cfg.user}" + group "${cfg.group}" ${if cfg.network.host != "any" then "bind_to_address ${cfg.network.host}" else ""} ${if cfg.network.port != 6600 then @@ -40,8 +42,7 @@ in { musicDirectory = mkOption { default = "${cfg.dataDir}/music"; description = '' - Extra configuration added to the end of MPD's - configuration file, mpd.conf. + The directory where mpd reads music from. ''; }; @@ -62,6 +63,16 @@ in { ''; }; + user = mkOption { + default = "mpd"; + description = "User account under which MPD runs."; + }; + + group = mkOption { + default = "mpd"; + description = "Group account under which MPD runs."; + }; + network = { host = mkOption { @@ -96,7 +107,7 @@ in { description = "Music Player Daemon"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.mpd ]; - preStart = "mkdir -p ${cfg.dataDir} && chown -R mpd:mpd ${cfg.dataDir}"; + preStart = "mkdir -p ${cfg.dataDir} && chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}"; script = "exec mpd --no-daemon ${mpdConf}"; serviceConfig = { User = "mpd"; @@ -104,16 +115,18 @@ in { }; }; - users.extraUsers.mpd = { + users.extraUsers = optionalAttrs (cfg.user == "mpd") (singleton { inherit uid; - group = "mpd"; + name = "mpd"; + group = cfg.group; extraGroups = [ "audio" ]; description = "Music Player Daemon user"; home = "${cfg.dataDir}"; - }; - - users.extraGroups.mpd.gid = gid; + }); + users.extraGroups = optionalAttrs (cfg.group == "mpd") (singleton { + gid = gid; + }); }; } diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index a34a13602650..5af644279e5f 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -177,20 +177,24 @@ fi if test -e /sys/power/resume -a -e /sys/power/disk; then if test -n "@resumeDevice@"; then resumeDev="@resumeDevice@" + resumeInfo="$(udevadm info -q property "$resumeDev" )" else for sd in @resumeDevices@; do # Try to detect resume device. According to Ubuntu bug: # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1 # When there are multiple swap devices, we can't know where will hibernate # image reside. We can check all of them for swsuspend blkid. - if [ "$(udevadm info -q property "$sd" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then + resumeInfo="$(udevadm info -q property "$sd" )" + if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then resumeDev="$sd" break fi done fi - if test -n "$resumeDev"; then - readlink -f "$resumeDev" > /sys/power/resume 2> /dev/null || echo "failed to resume..." + if test -e "$resumeDev"; then + resumeMajor="$(echo "$resumeInfo" | sed -n 's/^MAJOR=//p')" + resumeMinor="$(echo "$resumeInfo" | sed -n 's/^MINOR=//p')" + echo "$resumeMajor:$resumeMinor" > /sys/power/resume 2> /dev/null || echo "failed to resume..." fi fi diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 546561e434e2..5277bf6f68c5 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0f4cwcmszvpga1gsfhhjcz7yb0h08v35wsv4ssmijh8gfp3mhjml"; + sha256 = "0f37xjkay3800fbx0iwjca005b1hrjbhszrzn0xg662vf8mj44nv"; }; buildInputs = [ diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 71b98eec0e98..af5c11e69aef 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -44,16 +44,8 @@ stdenv.mkDerivation rec { "-I${cairo}/include/cairo"; postInstall = '' - cat >$out/share/emacs/site-lisp/site-start.el <<EOF - ;; nixos specific load-path - (when (getenv "NIX_PROFILES") (setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (getenv "NIX_PROFILES")))) - load-path))) - - ;; make tramp work for NixOS machines - (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) - EOF + mkdir -p $out/share/emacs/site-lisp/ + cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el ''; doCheck = true; diff --git a/pkgs/applications/editors/emacs-24/site-start.el b/pkgs/applications/editors/emacs-24/site-start.el new file mode 100644 index 000000000000..023d6412ed84 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/site-start.el @@ -0,0 +1,17 @@ +;; NixOS specific load-path +(setq load-path + (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) + (split-string (or (getenv "NIX_PROFILES") "")))) + load-path)) + +;;; Make `woman' find the man pages +(eval-after-load 'woman + '(setq woman-manpath + (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) + (split-string (or (getenv "NIX_PROFILES") "")))) + woman-manpath))) + +;; Make tramp work for remote NixOS machines +;;; NOTE: You might want to add +(eval-after-load 'tramp + '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 6a598146561b..8aefbb9429c5 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.2"; + version = "1.6.3"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1gf5pl4fhak1aqx3dgg0491zgsl6qr6kgyl034hnk4fzwn65zvk6"; + sha256 = "13gj5z9dz1847wlbn2cqpkvr64ds8yrn5hacs5wvbqmh0z9v6aw5"; }; buildInputs = diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index f64593517aff..a13004ecd022 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,14 +1,14 @@ { stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: let py = python27Packages; - version = "14.12.1"; + version = "15.02.1"; in stdenv.mkDerivation rec { name = "cura-${version}"; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "1sybsa84qznlzcgn18p70gh1v60npwfca5yn80h35msxrnh8gbp5"; + sha256 = "18pb31vd9786q522i1i780wpzr6vih9gg9d8k508gh2d5yr4aal6"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index b8779eca0dc1..bbd944066357 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "14.12.1"; + version = "15.02.1"; in stdenv.mkDerivation { name = "curaengine-${version}"; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; - sha256 = "1cfns71mjndy2dlmccmjx8ldd0p5v88sqg0jg6ak5c864cvgbjdr"; + sha256 = "18fxh910b66s45757zqh8bm5kdxjgvxispjqknqkwl1nrllzmx53"; }; installPhase = '' diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix new file mode 100644 index 000000000000..f4d4af0e12df --- /dev/null +++ b/pkgs/applications/misc/hstr/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, readline, ncurses }: + +let + version = "1.16"; +in +stdenv.mkDerivation rec { + + name = "hstr-${version}"; + + src = fetchurl { + url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; + sha256 = "1hl3fn6kravx5gsdsr0l824vnkj5aiz0dybhd3ak932v95b5knyg"; + }; + + buildInputs = [ readline ncurses ]; + + meta = { + homepage = "https://github.com/dvorka/hstr"; + description = "Shell history suggest box - easily view, navigate, search and use your command history"; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; # Cannot test others + }; + +} diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index ee93f57eafcd..1b71989f8b6b 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: stdenv.mkDerivation rec { - name = "wacomtablet-2.0.2"; + name = "wacomtablet-2.1.0"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.2.tar.xz"; - sha256 = "13k5f5xpka5cbgl24a3j9khqcmp96x1vhynn9v558ag6dg9ch2hw"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz"; + sha256 = "17n1p5v2yx517hkqd13pyl3wnrdnh6pfzwf2y2csrfckyndhwk8w"; }; buildInputs = [ kdelibs xf86_input_wacom ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 16c38ed1c56f..47d3a7ceda47 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "36.0"; + version = "36.0.1"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "089dff0a3623feee0379832ccde522f86fdc448c"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "ac2ed6ffa8d27ecd978950220288e14c500aefbe"; } - { locale = "af"; arch = "linux-i686"; sha1 = "e8d44633f01dffe46e8b1278ddb274eefee556a4"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "f7d364cf00f0058e55e193cc907fd4996f96043b"; } - { locale = "an"; arch = "linux-i686"; sha1 = "85c2b67d8d963d9421559807b8dfb36baa976029"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "182b4feeb5c24921c4074ee560e1d2619bc28a25"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "a18be34551fa3352a30cc927746806ea3d0401ed"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "be45f1db3b2f6128a35313aac0738eb6f3ed53f2"; } - { locale = "as"; arch = "linux-i686"; sha1 = "44e5cf86e6318d2c25fa4f9dd9c0bfaf273f6749"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "da9d1e7e3e8ed4dbc935ece517e55ae456930e52"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "c23f59e3452f7393554491a930626495e9855855"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "fd2f6ce7d12a7c53fe9d9c11336b88c405859206"; } - { locale = "az"; arch = "linux-i686"; sha1 = "5b92332c155a95b8638506ac1c3dd78e19e277e4"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "5d148d13421bacb3d430e317a41253a0999ed55f"; } - { locale = "be"; arch = "linux-i686"; sha1 = "36cfbc4b84a374535cde94643bbdacea3e141c60"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "0c0ea9dec82efd7baf2c2b382c0ab67d22f7b252"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "80e0068890e6b422f392924f4e317c6d2058695e"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "b4f3fa93b7d793560627ec4d51c138d013dd6c00"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "14f5d14a135fc929ee670078e50567b5461ece8a"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "95f561f92166d9db64ba5e36edaa14d7b4f989a3"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "07b00a5d4b83d8d0e451ba08325fb44c784453f6"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "a96e0bafbf811c5bd57fb3e8164e38365386e460"; } - { locale = "br"; arch = "linux-i686"; sha1 = "ee51d5b01c4489e5802c130748ee16b0a803dcb9"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "0cff437fe8c29705ec9d800d95329309eed540f4"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "0d7aef80272ca1de27560b7fe4f8ec892d386b6d"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "b62a905e9e992e3765cf196a18d50f533e2dd69f"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "82316407a9745d4dc56d961f5f2282c702950fe2"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "69ae06e06a90a28eb66db4d0df2fdbb5397abc24"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "c55e80b3d74f6dd494fe1c327053f59bef1c626a"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "932f6a15f1445d180df01195c19677cbe63fd18f"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "abe63dfde0487c77fa9b3b9c77fcffe0f977b25b"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "89eeb72232affbd54eff30f4c9844f802c0cf243"; } - { locale = "da"; arch = "linux-i686"; sha1 = "57232745fa920525721ec6e9b3c3177862b5e096"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "2ba7156b5728f17ab1e55b27ee771722a9171cf1"; } - { locale = "de"; arch = "linux-i686"; sha1 = "17fd4dd5e4b2ea39ed20a6d890ea5927532abd38"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "58c72ef01098523392f63209057373b9e793ebb8"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "a3296dd541362c4ca3ce8734faa33512a0fff4fc"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "c5c7bf61d4923ec9937afa6d261c7f0af64e468f"; } - { locale = "el"; arch = "linux-i686"; sha1 = "be04c1f884f3f0d68fa5c421eb2c8b850bef2a44"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "33ffdffb657a379f2bdb3b39bacc60d59ae9b945"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "16e2c1cda685b132b0d9378fd5ac22b0e07da320"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "89e552187c98fccc6b2270080c530bf7edf3471f"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "42be4a279ef164a43908a0896cacec6a96b2c23e"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "2a9aab1149b2bf59c2b687cb80a6fa550aa263be"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "92f42855948bd262266f6239a7f989848703a85f"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "95250cced67fb3a8eab40bc8db6d70b4efa610c9"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "6564b701a3face85aa53ab80024145b58d653ec5"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "eaa3337fbca2b182981cae1423357c537a5cc33f"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "05cebf2df8c58c03934340b9d56a1a09e0af9ffc"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d8660257e51bf94c864b27cbbfa2e3ef98ef66f8"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "827deacb3439086c263e8a3f168700e510e0158c"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b905a1b57ccacb8aec34f47126c26ce435edd2d9"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "189f5230874080d982a23725cafba889db016194"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "66f416faac68c156d0c2773a47cc2014ab51b0d1"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "1bd21f64057f4ad4e74a2f6ef7c054f0662f95bb"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "0bdedcd03eae8fbde6fec2f35a7c1c0d2140f0ff"; } - { locale = "et"; arch = "linux-i686"; sha1 = "d4a96b30b8f084a6b2d8e58db8e7398db0738606"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "30de382a9941c4f8857938c37e491ec1a2ebfc27"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "f43ef29288e5129b8335601ea2f45ee9b94c1b82"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "cfd741f43b86a1f0a62df2c44898289cd86c2936"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "02f264a1e2c6dff8d1c1dc70f9af305fa9156c01"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "290d8a53538fe75d1e1d36407c7efa5f56569787"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "bcfd312781f308de7550a8f12609230c48c353b2"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "eddd9175de24bc429c04be01e4af6af6f7003065"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "3cf088f03c3003f1888645b06311e7f46007df83"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "a01a6fd604471cbd69c5046ec5e13f01ca63457a"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "e8e3caf2ceef2ae8a645806731bf99572244fb24"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "753a4bab9ce3016e773d4afa7ad9d14f7746cf4e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "d0b3719b07b2c3fbe9c05ba30012331641c09d2b"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "9e8ccf90e0687aa112d48f0faeffdee58f41ea95"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "a3fbc0aaf36e444ea10c4b0593ad3ec07e100147"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ed1e7b3c62dbb97bfef8b6512b8032b7bd8d2c9e"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "49fc536511bdaa096086408385ae70cace64fb0b"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "67de65f4ae8accda417cd8fc9082160a4a46cc06"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "dd239f26f4d758294ce21dc1ffebe9e02584e05d"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "1b9d06b047de0c66485f2c7b642b6edddd7dacc3"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "a191408d96e73da4ecda1faa2510dec307a3442b"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "5bf621a4fe1a625b70df63b53930a3a5ee922405"; } - { locale = "he"; arch = "linux-i686"; sha1 = "95b84a18316a74e8fcd7d16fd6e9c1fea6778510"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "548545c4d46c296aa9d922ee5a14312a9677822c"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "5a5e53167fe9050bc9482d61d17f6808cc655407"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "36e3df183cf2b5b645cb2d89b90b640b7f3697f2"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "fa1a4482857b788c49d04f6a5c3eeada25c2ac52"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "e641cf2b562c6b391e24601d4f3ceefb7117d02a"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "b1fc4cad22c66824297aec7c82053d1f7611f108"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "1c2db6cf0a14002ad4c473ab1ff1fcd7f4543ca4"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "4c5a90ed0cb4d6930a3eab0a2ec216805d680895"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "c71c7e68c493bd9ecb407f32c8896b41ecfe95d5"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "01536fa2739a9dd68e713f4e4e41dac5f2b58422"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b19d7fab445ed314ca8076d0b837c0e15407649d"; } - { locale = "id"; arch = "linux-i686"; sha1 = "163e7a14d274a10780a18201afa7dfae27bf5967"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "d1108b006c607f470543915d8956394a1b767c27"; } - { locale = "is"; arch = "linux-i686"; sha1 = "5460b7445462f786f138a755615f3970fbdc7274"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "e5ec0cff0f1c88f0b2a4444ef9d71bbeb3541772"; } - { locale = "it"; arch = "linux-i686"; sha1 = "39cab2de100e4a1a2783659cab5c7247e230aa11"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "b21a1d214bddd8f074d0d0a06d64c4aa35580c68"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "b78dd34339c68348de753c66d6e12a78748aa261"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "e4a1720278debf305c3f353bbafe35384b72bd61"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "371dc2118f8917d2fb904d07e23214728db13118"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "e4a4742b0f2efbb2491b501147bb1115f64b081d"; } - { locale = "km"; arch = "linux-i686"; sha1 = "4ad8c7a8821043a635e78f41f6da4ab6ffb334c2"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "0f4685c194054dccaac5aec9fd27f6c74ed82148"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "427b395693c8ce5d1f970f2c3a47d097785dcdea"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "15e28abebde39ebafe916523b658463087be73db"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "919862720789c005e1773b4da3427fa56c3d0528"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "aa38b625f9bab73669919c0ad36221f7c887186e"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "abc21985aa1de2fa256283f03fd3b98e147ccd3a"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "8b811ce3fe2528d33a0f00a7c3292b9cb37eb1b1"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "601dd265370ee7514a2cdf6739bfbd3d59d450d6"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "c13736cb853a35f1b6583d89b9ded90302acb637"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "09910ed1364063efc07e24a78224d1fc93b2196b"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "0a6132a1080e084c9e4a691bce7e12459cec817b"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "262c75582645c2ee1c92552263aab7fe35483bc3"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "d76755153a0656c2fd17db53c40f493a0f0dcab6"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "787ec5a7ccf9b9bd116917de752e9b411e37fe5f"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "2de12f1514a47f8c0ee8a166c7c6d68d8c966824"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "807bea1339fa44c2f1d9af264539d1f550235e62"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "aeca07821afbfc0ec1763fd30da7098e27f11b19"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "d431e48ecec721b996ab6f63b99ada14ac8bbbe5"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "fb60740faf4aa2d98821c77b28be29f456707d37"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "5ef013dd820a0c945cea2f131573ffbac5693391"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "c6d211c224711eb33b8ce55605e140cc09492bd1"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "6678b16af728fe90c7b58d9e5e0a3aa01ca40ca1"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "2c77fe81d3723a9be4926bbfcfb904edc928649a"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "45ee40efa93fc973e8c8d5f70f5155132f5a073b"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "29f74d404f90711974187120f8589c18125dba1e"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "162d5e2270488d40a60cb3c1e07aded76a82ba1d"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "40af304764aa36609e3969bde13ace2745bf43d8"; } - { locale = "or"; arch = "linux-i686"; sha1 = "721e06a231398af851bbaef046b69349b9c42e9f"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "925cb0a0bf1544b4a95abd3bf1e6bf14017b7c89"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "37f8b5ac56fcbda135b2ec5fd9ca7bfdb70d496e"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "fabd53bf219b5c4e8b7f70e7ce82ab85609fcc01"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "773977cbd1146de1699b7c25b7a382bec8d0f55c"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "b3e5db98279b7425e5a1027bdfbddf8b2ba316ae"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "fea58817e88b9e1709f1661a6465ff60e4463793"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "4e05bcc1f9dc58b6fa02aaafbfab67d185d12521"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "1fd067546d5d203ef201691205244ce7bd0dd96c"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "b53ae8e66d220c5a66cbd32c8762eb6a13634297"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "edc6d8dc42d7d7ee6ea6e781bcfb346ae8d7f006"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "12fd2cb3ac781490c433003b743055a67348ef04"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "87b92ed3e53f7fbed86ff1e4c6143de3c52b2f87"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "be0daa8a275ca40a8be609d24290a35a74b3ee36"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "827b057a99f1c56f4a66f1f9e8e5de2a45f68471"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "3f390efc29e49aae39d0030880a3b26cf8cd6318"; } - { locale = "si"; arch = "linux-i686"; sha1 = "7094d0d07dceae2e5a164d585e04799fd9a86a8b"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "7a852dc124c1f207610aaf884119ae8804caaa41"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "2439f765924307b9d2d00ce32c13384839e39d5c"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "6017d51322d4d838449d6edf969803c1281e9229"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "cfb6d7bdfd5abf6815381997d8f19710711017b9"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "e7cf289bd59a6499f018d403a5ad661fd117073b"; } - { locale = "son"; arch = "linux-i686"; sha1 = "e49233842e845f67d090b84caa86d9209bc5e79e"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "dfaaa438d97fa3e0839b75144ba921898114f593"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "d80a35017d041e2e4bd3a8f0925bb11d696b2ad7"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "f1f940683602b808962317e0da9adc82d2e81c03"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "2a82cd867d939131b1985dcfeaf0d9d2a8682edf"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "ce4e49019bf1065610b862aaaec900d509561a5c"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "c3a9e5d86fe94ff9f22a3f891b604379ab1374ea"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cc397d3ce95ccb4c957f05f90ac6eec28cbc383e"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "9ed781079e459942141597671a7ba13eef65bdf1"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "fbd5dc0126e6df1ebebcc270f58d16344a46ee49"; } - { locale = "te"; arch = "linux-i686"; sha1 = "7c29cc8335b9d4d3d9210c77caac74d25d477cdc"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "be02910dd1abc92d3754332e56274cc977773f64"; } - { locale = "th"; arch = "linux-i686"; sha1 = "259edc8e888fdc32c714a45cf9599d15111f14e3"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "934b28f0936b8ac9a395c906f9ca04150c9f79db"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "be173ce377a1a3ece05fb708316d79a880708137"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "52a94b0a3fb58c256b66019d9b8c8f5ab420f3e6"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "fc8e6574ef667c6a2de19cb82bec4bc47b85f907"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "bace7c6ffd9f02b0d6e24046f42c64b96db1a84a"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "1df792bf6b364632a0882ac055d9fee3b537e5c2"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "f77c0bd068b1c44d20027793a826714262d38351"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "8b367c6fee817dbb12e4c54b35df8a6d09900f33"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "307dee3afe576025524dee35904e70351cf03432"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "b04a6593e912a40d20be3c90cca3c7cdcd893e92"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "6abfc8532600cdd20ce53923913d50b7eeb52ac8"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5d57176765f3be64230f36aa292992adf4a3c48c"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "df6d9a163dddacbd58591bd9572b16c7364eda2c"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "92fa3a666d858427f2a0102d85320b567c43ee40"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b11d2d33c335bd471b6762e39c646303b3345ba4"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "c707c75b403d7e8f93fd1a362e65032a97d000a4"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "dd11e37acea4ee400b80fbdcfa98f4acbc7d73f6"; } + { locale = "af"; arch = "linux-i686"; sha1 = "f3df56046427ebee3f2510e6b0b1d5214f9e8682"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "0c064022ffe3fda103e69b03f06a50bab8a496d8"; } + { locale = "an"; arch = "linux-i686"; sha1 = "d165d0545866ce3326df5b6246e3e7817025050e"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "8ed6d2374b44037e8efe1252025303987f5a5b8c"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "ebd74e1c924e935a68e18bc1de78a8525b7a4fe0"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "a72295a576621e6305aa4bfecf444a114c2e6955"; } + { locale = "as"; arch = "linux-i686"; sha1 = "1bfea721c70265683682fa004522e1518094313f"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "42144c126408a5450b80e7e5be4aca96b2a88149"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "1bb9a1dbd4acffed0e2b31a81062b466f929a498"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "ec53f1640289f5866f9c2c136610725a5524ff1e"; } + { locale = "az"; arch = "linux-i686"; sha1 = "c1396f03ba25ca4a9acf8b6998ce94d422984c68"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "ec7368e145b3f7d5e8dc2659fd97bb1008619a42"; } + { locale = "be"; arch = "linux-i686"; sha1 = "3ecc92fdbd51bd5b2a4d4e3744a9e4b6b1bd119f"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "e8dc491a4d045a9fb3ad251a59acaffa12b8aac4"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "3fab78887d35fac20483c168b05a45cd646d16ab"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "03035db9fc8f6439d29ac396ae91888dfa2e127d"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "20eb295ef81b17f5427014b1234b6bca5ba34605"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "85b1af82364dbfbd5c614f2d524f455ab45e3681"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "e9745b0f3d7392a10706c8668faf598b0f9daec4"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "0f54e8f852a4af3fc8567f3b3b383e1dff3c23bd"; } + { locale = "br"; arch = "linux-i686"; sha1 = "5ae670b00b932f1732fddde8d8c804501ddd27d3"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "2569214acecc2fed7c087b27d047b82ccf42e3be"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "76fe2cc09da9f87f2178b686787cf55794ec233e"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "d2f70787cc36fceda857fad3c9552d1c4fa1b812"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "ca2f3dc2369c2c2757ef8d8e6258f0b2b192e00d"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "771d59990ef2c7199a6a1a7e4a83448df03fc665"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "4acce7f304ff6ac5b07389fbe91e97cf7599b821"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "a764135d7f7301d1f08b767f7f51a99348d5b2f0"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "731b053f99eef029580eec90730a8b2b20624f47"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "636b964015a4a2ac2e45092e726c0e64d404582c"; } + { locale = "da"; arch = "linux-i686"; sha1 = "611b1290d147af331aa193380758cc3dfa3cafdf"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "ea7d77e511b4165c7b889113b46389d4998dd50d"; } + { locale = "de"; arch = "linux-i686"; sha1 = "ca3425c8264c4d9db53a2cbce52519912de7ecf9"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "2d9b99842a185c4063166de5926db46182b258e5"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "1ee0b0d3e599b98e5b190f8c7cd5d04a1141203a"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "24f840a1ff2d00a74c617af81584f6d2907f7b7e"; } + { locale = "el"; arch = "linux-i686"; sha1 = "5ecb3ea1cdc9211270239b6ec4a9d29bc1b68409"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "fa81057327b718264e82cf6aad2c0e756ab709dc"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "8f2d51fd2f4fc43c766fa4d8db4180f8129d1a89"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "4395202bd676e8b6ff41ca946c885f1898fac1cc"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "7f54347e1929c20c1ccbcf3fa9e07749b2fbf0d3"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "3906fdb4f0fdb0e4e1f21e577099f106e90f02a5"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "5dd5a1e54e72962714dc443677069cd65d5f4f85"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "2d1c15b66760419f33e67450c51785567d33a1b7"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "ab2c3c65b723795c9e5335c3efda8406dd660ff5"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "fc35c1ddb53482cdb147a4b8ef5d18b1533f859a"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "b2e4991dff339369d07d6e1b7c9c57807010f1e6"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "08358b68d518478ab3e177dc25e44bcc22d6a10b"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "dbadd2dd873009d49015d9ba73ff8399c3c923b3"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "22d995b08052750addcb06801b5ea46757de48c8"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "705524e182679992eb6cf943ac6768b7732ae4fb"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "24f1558fe278c92abf89d046dc2ca8b947d878fb"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "69333c9937dd4430facc52f05e35059433b0c78d"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "2e28497f7e6aeacf54a4b88ce91338260d5191b0"; } + { locale = "et"; arch = "linux-i686"; sha1 = "fb262e3020715e921b9408b8e661e14e8de226b1"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "d49430fa7328566369046efb6d92da24445b00af"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "56de1040fda96ccd59b010578c91303c57bf7a53"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "04c6e7f3430da79450eb3a96238c11c997feb2fb"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "6ab145b3e85c6b001d49004b99c53fd71444646a"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "fbe27589194dae4d63c7b9f8a45f3abffba42449"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "adaed8878d757ed6b74bd334b138a1c46c438de7"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "91a9fecbcb65067c420b0338dbcbf37d4bc4ed20"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "3e31d26155648b3148f8e0340db84e5725435b58"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "17a8e273c9dbf82d4f86b81426f07af62a49ee6a"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "8fa301bb3c7f8bd713c2bfa6768b73bd02a38de4"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "ddd0bf1ce6a6fc70eb48e9bd72a52b20b78f2256"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "264d6237f00cbacbdfc3d47385c349422394cdd7"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "7f9dfde56e776f16d30df9e3fc6853f8001d9837"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c032daf124507e56be02d15df8b651c814ec105b"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "2032c9e8c23fcf3ecc1db6eccfff921f6a49d734"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "4ba7388a13dedc7ad7d1d83742d9f7f8c211aa76"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "96ff03ffc0495ae4042dd6d37cd7aa2c9748b7c2"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "43c4c6e2dcc364711f5368ad1efe223df5fda4d5"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "bbd0443d6ed8598ae78a71b834c3b4c4e2d599cc"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6ee1707123bb560fe7b1dc39165c4a4250565cc4"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "6254300eddc173e888cfb70db612ef7fa41aa2e7"; } + { locale = "he"; arch = "linux-i686"; sha1 = "de203188d6b68e8a7c24bf0bea40342535897a9b"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "598d0d0d1eb22ed7378c8aaced43ebe91f0ab305"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "809126d150b1fbd42e7bcdd14c032bfb11797f46"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "c940ec3a10d61d47a891fc538c9076af90cda65b"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "a85b937eac26926f8f69d5181d27504b06284b63"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "288262d030c80308e725de8ad39914509a538526"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "9b084622ae514854bf01c6977c31d77f5d83de59"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "249f387302c44f79eef12d336af81eab07ea6463"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "c646b79ba6c74823caad11aca9ddc2ca8051117e"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "f1436bd0c5ca9ba23eb50caef9a6cc4c5dad74d8"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "9523c995e785efda19bf0cfd08fa7399b37138b3"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2992ebd3a86bbca04e443d1f55d73a876a8b4505"; } + { locale = "id"; arch = "linux-i686"; sha1 = "0bd17d152d738ba6a57da12f333fa9d942fbd274"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "1bbed6d2d3ffc2ed91c6f4badd5243af17fe63ca"; } + { locale = "is"; arch = "linux-i686"; sha1 = "90c33bf3896565df30b104d271cf4aa1d09d67d1"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "05e1f66bc84dd2ce1b142ee64b420eae3321f172"; } + { locale = "it"; arch = "linux-i686"; sha1 = "b11e6172e8040fe0c6749a684e0073fdb5a19402"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "5c47ffa4b944c71576017c684ab8ebd78fc52d08"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "acae3c28497f4ae7937f4bd38174e5a30b009475"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "d3610648b5a7f1bc223fb36ca94ee4d8f25060f7"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "0d4185c11d9a4ed7f2c554fd322b6a5a0fdacf53"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "189ee9cb3c88809dc9dc4c7dbde2ccafa333a432"; } + { locale = "km"; arch = "linux-i686"; sha1 = "8e39eb920380bcb87aaf48a69ea53bbf6abba2c7"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "8770649702e38783e3e2841ce0ce66f068a4b23d"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "e0407f7df92240aa866ba981c9054760cdc07cd9"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "f4558f7edab4f85612d8280cf8ab131492854ba8"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "373b7ef465500dcc7bbe9a48e113f26bc4a6a27b"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "8c8b0fe42a644c29ebafd1aa7b82733b7c5d6bb4"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "a22f113cde99557fa8973776e19f6bf4cfff1114"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "dd7917fb9c1e8bbd1db503829c8bdf1d5a935769"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "8887a493a938d10ee63630cda8ef9b3a03f01a1e"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "8fca22b9076082e859f0dff2afe7ccb245ee0fad"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "a5e4a7c95f336ca6664fee8b16e002a44561effb"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "e69bdda0ae0b3782a10e64ed3fd85ab19c7630a2"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "1efb4b5f649f219cf66f148297b5f669fb4dc16f"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "7ad1e9472c812e71e358e67021aa0a07a0d97062"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "bb96c1a1d5f371ecbed4b9c6e3ae1d244e582f6f"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "a4d18deaa48a23f588b7d8db4973a37764e97449"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "961f1ca920469c5f95ec875fbc33a913ae2a1986"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "c662ac25845f9f83cee846a3b02f41186ed7c83e"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "7b01dc5ce1dd97f5b2c3b39783eaa06556dd03da"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "2940bacdbc3f021ad421097e94017627cf59d655"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "624edc402de71fec31b63e01a9a1f2b79b3c5db3"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "30dceab395c15909d55ede343071a1fcea21af7b"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "958f0e5ffa8911eee58883b22fbf6db18d1fe1a0"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b0bc728560beb154ca2b9bd8e5c607458afa88f2"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "77976787dfa2464cd859bb3c3245fddd6cfd5c02"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "ba47a63624bd64597dde61dfbf04c94eaada4900"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "d35fdb72fd1afee6310ab4e8a764e75804822226"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "848c8d69a53ad6841ecb38d7ea93b37a70b182d8"; } + { locale = "or"; arch = "linux-i686"; sha1 = "f7b83449922833f438acd3ee9b3bdbd1ceb8d578"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "a9f255e2fdcdd8b5d95026af2dfc6b90da7eed64"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "1a1552f9ae38db0314550831711a674c50a3c9d1"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "eea36a9355b0d0e3477a51d7ea8cbe46745fbbf2"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "6f7c3ea9d43bae1d9177c41a60b6e568081c33f2"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "b6b7b6ae8391ff342bcc0f3fd3b14e7189f9ea02"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "d474f48517529dbeb5bc12ad57b28cc1bdd3cf28"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a8906806231ecb44c6368eb22dfa01a21c05bf89"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "4910bd75b9566ba8fb1392c69610c6db527cc87c"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "9205b1556359844144275f2a768f7ab74edc5519"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "27b825a7eae976a53579cf1fed1509cd4f817023"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "03362ade5b3b5a030611cbb03767421bae1a2fe4"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "75be442bb19172111ad2189bad0232839db53dfa"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "4879b5f99852b7bf8f36237e121c6f3f58db395c"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "2d447694af3e95669be993235eb239ff74c75aef"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "227e369a35018d43d1ae6eb1b7859d289df15362"; } + { locale = "si"; arch = "linux-i686"; sha1 = "5c8ac234d851c0860b5f79f33b07c80f710776a2"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "703b7a9557e43d196b34a498e5d08a0d582edf9b"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "5b8ac9ead4f2886b21af1512b6942fb5e1acefa1"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "ffee2ee4d0e47dfe252868f602a0d4c991cc890f"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "836295228c78541efe1a21e5b64671dd8b9ec00c"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "4109e25e578d7af567f37062a753bdfcee394092"; } + { locale = "son"; arch = "linux-i686"; sha1 = "34427023f9eeaa0c9924672fc59a58890b35635d"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "12cda45700a294b72f94560e421c88dbf04ceb4b"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "1d3970aaa293e06b6a430cb73ccfafaf043a2364"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "0a49d2f6fed69ef22698e1ba98b8cbb008debc84"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "ed6796f73a3e34db680414a5f7b17c4d326be884"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "f22376834d160c165534f2e8ecbdad3273f46334"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "24140ca9e8acbc64ad553a528acb057c67240c00"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "875c60949b97edf2a951f470139153eafad03c9d"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "4adc26d74d6a0ec3fc80e5979750ed19ac93e290"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "24b6a6f4a16b5a19b340949d326203e1d1cdd2cc"; } + { locale = "te"; arch = "linux-i686"; sha1 = "4584c8b93624af4f630c759178d8857103ce6fca"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "4b810afe09e317593e3fe269c5d686336cd3524f"; } + { locale = "th"; arch = "linux-i686"; sha1 = "c7b00a159fee121e5ff8f9e2248d6ae1a511647f"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "4c0e26054226ccea1093a809a272cfd12d8af2ed"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "b0844d25d0c9307675559a52e7c6a097615c403d"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "67dfc61732853e99be82054344f59768b831d6d0"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "d9a640765b27e192948e8b485ef4a7005513de29"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "c619fd93d8e9650482e3e1d639310b470f1c914b"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "561a2c6d943908d4b3bcd2c80895d43b141d1a2b"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "c287e06e19fb45f265d314fb5199af5c449464a0"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "469cb11ded0712ad3fe9c3cc01df74e6b566c845"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "4d9e3f2ea7ab3ee76bf7d41fc6936915b18d45db"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "f48a638f685a7754ae23626a4d2e8209d5272b9c"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "a1bbf7e645291eaa7ccece17b13461d7f239f334"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "ca839f0034807715d7bccb0f97e4ffd7dbcf8e17"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6dd09c5d50ce206931d1e1f6310fe4a55d8eddd4"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "1265d89ca47aa9f9f4f3a7825cef622a9ac2b18a"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "2464e2c81407987ff9bb2b682b71f3b8f94aa455"; } ]; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9a02b964b100..4492b42a6dda 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -220,6 +220,7 @@ self: super: { # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; + euler = dontCheck super.euler; # https://github.com/decomputed/euler/issues/1 filestore = dontCheck super.filestore; graceful = dontCheck super.graceful; hakyll = dontCheck super.hakyll; @@ -537,7 +538,6 @@ self: super: { wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; # Depends on QuickCheck 1.x. - ersatz = dontCheck (super.ersatz.override { QuickCheck = self.QuickCheck_1_2_0_1; }); # https://github.com/ekmett/ersatz/issues/8 HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; test-framework-quickcheck = super.test-framework-quickcheck.override { QuickCheck = self.QuickCheck_1_2_0_1; }; @@ -620,15 +620,12 @@ self: super: { webkit = markBroken super.webkit; websnap = markBroken super.websnap; - # https://github.com/victoredwardocallaghan/hlibBladeRF/issues/4 - hlibBladeRF = dontCheck super.hlibBladeRF; - - # https://github.com/frasertweedale/hs-persona-idp/issues/1 - persona-idp = markBroken super.persona-idp; - # Build is broken and no contact info available. hopenpgp-tools = markBroken super.hopenpgp-tools; + # https://github.com/hunt-framework/hunt/issues/99 + hunt-server = markBrokenVersion "0.3.0.2" super.hunt-server; + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index d4f87fe186dd..f98ca02e5633 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -88,7 +88,6 @@ self: super: { xhb-atom-cache = markBroken super.xhb-atom-cache; xhb-ewmh = markBroken super.xhb-ewmh; yesod-purescript = markBroken super.yesod-purescript; - yabi-muno = markBroken super.yabi-muno; yet-another-logger = markBroken super.yet-another-logger; # https://github.com/frosch03/arrowVHDL/issues/2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c893e8ccbf2a..79fc56accd61 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11472,18 +11472,19 @@ self: { }) {}; "Plot-ho-matic" = callPackage - ({ mkDerivation, base, Chart, Chart-cairo, containers - , data-default-class, glib, gtk, lens, linear, stm, text, time + ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers + , data-default-class, generic-accessors, glib, gtk, lens, linear + , spatial-math, stm, text, time }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.4.0.4"; - sha256 = "1d6nrhk2wyyii6wwwk1mlxa46sdd6xjghyp3cn6qh1i6dwq7i604"; + version = "0.5.0.0"; + sha256 = "00dza3lkgaivxyxy7q8z936zmlpxr4nk0lgq3vyg524pd4hq38sg"; isLibrary = true; isExecutable = true; buildDepends = [ - base Chart Chart-cairo containers data-default-class glib gtk lens - linear stm text time + base cairo Chart Chart-cairo containers data-default-class + generic-accessors glib gtk lens linear spatial-math stm text time ]; description = "Real-time line plotter for protobuf-like data"; license = stdenv.lib.licenses.bsd3; @@ -19875,21 +19876,21 @@ self: { }) {}; "ascii-progress" = callPackage - ({ mkDerivation, ansi-terminal, async, base, data-default, hspec - , MissingH, time + ({ mkDerivation, ansi-terminal, async, base, bytestring, conduit + , data-default, hspec, HTTP, http-conduit, http-types, time + , transformers }: mkDerivation { pname = "ascii-progress"; - version = "0.1.0.3"; - sha256 = "1cnszfaidak1gywcivjzzraaqdbz074mc8709qnr1clpqzhkszsp"; + version = "0.2.0.0"; + sha256 = "0ky2dkjv2j2bwkg1p27237dwpshnq9h760l26nk2wzg2vym2knsp"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal async base data-default MissingH time - ]; - testDepends = [ - ansi-terminal async base data-default hspec MissingH time + ansi-terminal async base bytestring conduit data-default HTTP + http-conduit http-types time transformers ]; + testDepends = [ ansi-terminal async base data-default hspec time ]; homepage = "https://github.com/yamadapc/haskell-ascii-progress"; description = "A simple progress bar for the console"; license = stdenv.lib.licenses.gpl2; @@ -22697,8 +22698,8 @@ self: { ({ mkDerivation, base, semigroupoids, semigroups, tagged }: mkDerivation { pname = "bifunctors"; - version = "4.2"; - sha256 = "0gxj22qv0avg2rhmfbbjrx35yr83r311vm8asc4q71lzkbyg8qf6"; + version = "4.2.1"; + sha256 = "0zy4lz08r60h8lgrf67zqqrcslrnbmdi254ydv5mw69z57nnx3ng"; buildDepends = [ base semigroupoids semigroups tagged ]; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; @@ -24888,6 +24889,7 @@ self: { base bliplib bytestring containers filepath language-python mtl old-time parseargs pretty ]; + jailbreak = true; homepage = "https://github.com/bjpop/blip"; description = "Python to bytecode compiler"; license = stdenv.lib.licenses.bsd3; @@ -25556,8 +25558,8 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.1.0"; - sha256 = "05kldfic7rmxqvq6mjy0q8gi5scpg9644rhni8jw9zrsh7j1f0n3"; + version = "0.2.2.2"; + sha256 = "1mqia6rjnz5as8qv780yhxn7iyw2bxh5fx2d83x7assr6vn2489w"; buildDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -25908,9 +25910,8 @@ self: { }: mkDerivation { pname = "bytes"; - version = "0.14.1.3"; - sha256 = "18pbn7qz93hwkdlbdld2mh91hki1smbcz0gsn6d816gr7whf1fhx"; - editedCabalFile = "320ebe39de8e091a9a043c59a0f7b44fdaf9b7306bbc299cc9552aa2a31093be"; + version = "0.15"; + sha256 = "0898qlpf74ax33hm6hbla9kcjrldk26sc5yj3gdp99yb3qb5swz6"; buildDepends = [ base binary bytestring cereal containers mtl text time transformers transformers-compat void @@ -29462,27 +29463,27 @@ self: { "clafer" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cmdargs , containers, data-stringmap, directory, executable-path, filepath - , ghc, glpk-hs, HaXml, HTTP, HUnit, json-builder, lens, MaybeT, mtl - , network, parsec, process, QuickCheck, split, string-conversions - , tasty, tasty-hunit, tasty-th, text, transformers + , ghc, HaXml, HTTP, HUnit, json-builder, lens, lens-aeson, mtl + , network, network-uri, parsec, process, QuickCheck, split + , string-conversions, tasty, tasty-hunit, tasty-th, text + , transformers }: mkDerivation { pname = "clafer"; - version = "0.3.8"; - sha256 = "1ws7mmfa3xq2vxcva55ib0d6biz9n50ri10jljv839kw8f9ilv36"; + version = "0.3.9"; + sha256 = "0zc5vjb9iqzqb0nl47mgp51xpi1n156xfc1qkwks7kwqhhc23slr"; isLibrary = true; isExecutable = true; buildDepends = [ aeson array base bytestring cmdargs containers data-stringmap - directory executable-path filepath glpk-hs HaXml HTTP json-builder - lens MaybeT mtl network parsec process split string-conversions - text transformers + directory executable-path filepath HaXml HTTP json-builder lens + lens-aeson mtl network network-uri parsec process split + string-conversions text transformers ]; testDepends = [ - base containers directory filepath ghc HaXml HUnit lens mtl - QuickCheck tasty tasty-hunit tasty-th + base containers data-stringmap directory filepath ghc HaXml HUnit + lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th ]; - jailbreak = true; homepage = "http://clafer.org"; description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -29497,8 +29498,8 @@ self: { }: mkDerivation { pname = "claferIG"; - version = "0.3.8"; - sha256 = "1c6dhjg9g59gvcy1hzq3by9qbrab2x4nm06k0d4n2kss15zpn4xf"; + version = "0.3.9"; + sha256 = "1nbrdxq7ynwj6ms76ayl84bb9j9yjmy3qdfdd8w810php95jrkgx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29518,16 +29519,16 @@ self: { "claferwiki" = callPackage ({ mkDerivation, base, clafer, containers, directory, gitit - , MissingH, mtl, network, process, SHA, split, time, transformers - , utf8-string + , MissingH, mtl, network, network-uri, process, SHA, split, time + , transformers, utf8-string }: mkDerivation { pname = "claferwiki"; - version = "0.3.8"; - sha256 = "1qljiwzgq3cm6q9f35nd86am29crxvplbhd4y0zz4zfrq13yf0sd"; + version = "0.3.9"; + sha256 = "05fz0ps2k6g9298jk8y69wjhvfpcidkc3c9g083snylm2cl0dax3"; buildDepends = [ - base clafer containers directory gitit MissingH mtl network process - SHA split time transformers utf8-string + base clafer containers directory gitit MissingH mtl network + network-uri process SHA split time transformers utf8-string ]; homepage = "http://github.com/gsdlab/claferwiki"; description = "A wiki-based IDE for literate modeling with Clafer"; @@ -31174,8 +31175,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.2"; - sha256 = "022fcy0ijwsdnjb1b1jrwy2ypzzbzvfgj9ns0c74hrsj08gjh8j8"; + version = "4.2.3"; + sha256 = "1zs967yx1qv7382qks7fy42qxy7d20mkiw2bxrnk5m1x339hqysj"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -32057,6 +32058,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "configifier" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , case-insensitive, containers, hspec, hspec-discover, mtl + , pretty-show, QuickCheck, regex-easy, safe, scientific + , string-conversions, text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "configifier"; + version = "0.0.2"; + sha256 = "0k7gbkj9cz4rgicnllfh99i3d53qqwddysns0q3xwvvgv50ps8h3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring case-insensitive containers mtl pretty-show + regex-easy safe string-conversions text unordered-containers vector + yaml + ]; + testDepends = [ + aeson aeson-pretty base case-insensitive hspec hspec-discover + pretty-show QuickCheck scientific string-conversions + unordered-containers vector + ]; + jailbreak = true; + description = "parser for config files, shell variables, command line args"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "configuration" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -35794,9 +35822,9 @@ self: { }: mkDerivation { pname = "data-easy"; - version = "0.4"; - sha256 = "07cpsix22gvx23si1s4xsx4359qj5sp3gfw6a8075zzs8f10ci0y"; - buildDepends = [ base containers either safe ]; + version = "0.5"; + sha256 = "1rrq20v1nzkmak1m7x3gpcn262h26y4mcx058g8dp413gvdniypq"; + buildDepends = [ base containers safe ]; testDepends = [ base containers directory either errors haskell-src-exts hlint hspec HUnit QuickCheck safe text transformers unix @@ -41464,6 +41492,7 @@ self: { sha256 = "0ln2b4v9nb5hmivh389jaa3yp0mwc4pm2xizbc3alvjhxy2a83wx"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; + jailbreak = true; homepage = "https://github.com/edofic/effect-handlers"; description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers."; license = stdenv.lib.licenses.mit; @@ -43026,29 +43055,21 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, base, blaze-builder, blaze-textual - , bytestring, containers, data-default, data-reify, directory - , doctest, filepath, HUnit, lens, mtl, parsec, process, QuickCheck - , temporary, test-framework, test-framework-hunit - , test-framework-quickcheck, transformers, unordered-containers + ({ mkDerivation, array, base, bytestring, containers, data-default + , directory, doctest, filepath, lens, mtl, parsec, process + , temporary, transformers, unordered-containers }: mkDerivation { pname = "ersatz"; - version = "0.2.6.1"; - sha256 = "1hbn49ycc47f5zjf5zdgls23a8da389ma19g43bc379l8hm2xrjj"; + version = "0.3"; + sha256 = "1hq6cdw1rvwc0289saz36x2imwwnj203hqk2lsbkbhyghdvqmpbr"; isLibrary = true; isExecutable = true; buildDepends = [ - array base blaze-builder blaze-textual bytestring containers - data-default lens mtl parsec process temporary transformers - unordered-containers + array base bytestring containers data-default lens mtl parsec + process temporary transformers unordered-containers ]; - testDepends = [ - array base containers data-reify directory doctest filepath HUnit - mtl QuickCheck test-framework test-framework-hunit - test-framework-quickcheck transformers - ]; - jailbreak = true; + testDepends = [ base directory doctest filepath ]; homepage = "http://github.com/ekmett/ersatz"; description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = stdenv.lib.licenses.bsd3; @@ -43146,6 +43167,7 @@ self: { version = "1.1.0.0"; sha256 = "1qwbjy71zshlg8vp0qm5wya8ikgac9jpc5xr0x31i85p3yv5xl1p"; buildDepends = [ ad base distributive lens linear reflection ]; + jailbreak = true; homepage = "https://github.com/GaloisInc/estimator"; description = "State-space estimation algorithms such as Kalman Filters"; license = stdenv.lib.licenses.bsd3; @@ -43309,13 +43331,17 @@ self: { }) {}; "euler" = callPackage - ({ mkDerivation, base, hlint, hspec }: + ({ mkDerivation, base, hlint, hspec, hspec-core, process + , QuickCheck, regex-posix, xml + }: mkDerivation { pname = "euler"; - version = "0.3.3"; - sha256 = "16rd09kg7wcnli8fg5m6415hxx2y50930qad7ifglkw2p6cfwxg2"; - buildDepends = [ base ]; - testDepends = [ base hlint hspec ]; + version = "0.4.0"; + sha256 = "069sh0ih88wd35ii0ll8yck41by8m2bwwy4x24cy4sbrbbikg7z9"; + buildDepends = [ base regex-posix ]; + testDepends = [ + base hlint hspec hspec-core process QuickCheck regex-posix xml + ]; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -45536,9 +45562,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fixed"; - version = "0.2.1"; - sha256 = "1ayfya62ngcyyhi736fl5cd39iw568lkl16j4mliw3mi1cs2cic0"; - editedCabalFile = "ebdccc1365c476d64ebe64237dc19d65d2ad11e03c265a88367bdf185f4c6980"; + version = "0.2.1.1"; + sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94"; buildDepends = [ base ]; homepage = "http://github.com/ekmett/fixed"; description = "Signed 15.16 precision fixed point arithmetic"; @@ -46822,8 +46847,8 @@ self: { }: mkDerivation { pname = "free"; - version = "4.10.0.1"; - sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq"; + version = "4.11"; + sha256 = "0k645n6ywy1as2lmw4gv2bmmr9y67pcnar0jhhf9kpaqvl5s2h5y"; buildDepends = [ base bifunctors comonad distributive mtl prelude-extras profunctors semigroupoids semigroups template-haskell transformers @@ -48153,6 +48178,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-accessors" = callPackage + ({ mkDerivation, base, HUnit, linear, QuickCheck, spatial-math + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "generic-accessors"; + version = "0.1.0.0"; + sha256 = "0ssyrdn0cqm7gq3rp3dqkg7il2llagdri719z03ywj96qjh4vxw5"; + buildDepends = [ base linear spatial-math ]; + testDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + ]; + description = "stringly-named getters for generic data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl , tagged, text, unordered-containers, vector @@ -48389,8 +48430,8 @@ self: { }: mkDerivation { pname = "geni-util"; - version = "0.24.1"; - sha256 = "0djfckf2k7wvnzsl7yy6f33csa82c7ps1mah6bdnw31bqijxiyjd"; + version = "0.24.1.1"; + sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -48455,8 +48496,8 @@ self: { }: mkDerivation { pname = "geniserver"; - version = "0.24.1"; - sha256 = "0r12iz8zy3vbcjphprzydvf6rw94qdk2mcl4am9agmyw2g5gqcfd"; + version = "0.24.1.1"; + sha256 = "1597ah64rqag20qx8dvjmdhhhsjzsfdq2f43y3jyy2cnzssj953c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -56115,24 +56156,25 @@ self: { , lifted-base, monad-control, mtl, QuickCheck, resourcet , scientific, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, text, transformers - , transformers-base, unordered-containers, vector + , transformers-base, transformers-compat, unordered-containers + , vector }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.9"; - sha256 = "1qi7azm0j4r310dhyh2xhchw78brkagkig1wdjz9l8wazw0niqzn"; + version = "0.3.0.10"; + sha256 = "0av67yxcnnamg0420v9wzydnm07hfkc58zs0fn6827zrxmxzqcv2"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base monad-control mtl resourcet - scientific text transformers transformers-base unordered-containers - vector + scientific text transformers transformers-base transformers-compat + unordered-containers vector ]; testDepends = [ aeson base bytestring Cabal data-default hashable HTTP http-conduit http-types HUnit lifted-base monad-control mtl QuickCheck resourcet scientific test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th text transformers - transformers-base unordered-containers vector + transformers-base transformers-compat unordered-containers vector ]; jailbreak = true; homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client"; @@ -58294,6 +58336,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hdbc-aeson" = callPackage + ({ mkDerivation, aeson, base, convertible, HDBC, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "hdbc-aeson"; + version = "0.1.2.0"; + sha256 = "0rwmswa5w84clgskwxlv553g584pwldflxdbq630gjxzqshhriz7"; + buildDepends = [ + aeson base convertible HDBC scientific text unordered-containers + vector + ]; + homepage = "https://github.com/danchoi/hdbc-aeson"; + description = "Deserialize from HDBC rows to FromJSON instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "hdbc-postgresql-hstore" = callPackage ({ mkDerivation, attoparsec, base, containers, HDBC, text }: mkDerivation { @@ -61133,14 +61192,13 @@ self: { "hlibBladeRF" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, hlint, libbladeRF - , process, regex-compat }: mkDerivation { pname = "hlibBladeRF"; - version = "0.1.0.2"; - sha256 = "0yg8j1vj9p1i2n1nyd9zq9j66k55ib1y1qz0l7v026mvdd6qx7li"; + version = "0.1.0.3"; + sha256 = "1a74yyx06lxbfyfd2knvlnn7pvhlqgxw4fqmdzy20vr1pg7wrpm3"; buildDepends = [ base bindings-DSL bytestring ]; - testDepends = [ base hlint process regex-compat ]; + testDepends = [ base hlint ]; pkgconfigDepends = [ libbladeRF ]; homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; description = "Haskell binding to libBladeRF SDR library"; @@ -66588,8 +66646,8 @@ self: { }: mkDerivation { pname = "htsn-import"; - version = "0.2.1"; - sha256 = "1gwijlkrdb3p79za7h2m3ilcwnrxmffqn3xvmd3sfszvrj2wws6n"; + version = "0.2.3"; + sha256 = "1c10p1l5rm98c4gyxhmxkhmlv3w6068ca399xjb762wp72xsyz8n"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -67981,8 +68039,8 @@ self: { }: mkDerivation { pname = "hxt-regex-xmlschema"; - version = "9.2.0.1"; - sha256 = "1djwqmd9kd28n7w3k28ks4xwb94d1q6i4yf1kj22iwr9cyy23xc1"; + version = "9.2.0.2"; + sha256 = "1hkcd5p7rhv8z2vlcpd1gcdiyni28m8k8yd5fnxw8a9bvrnnfi27"; buildDepends = [ base bytestring hxt-charproperties parsec text ]; testDepends = [ base bytestring HUnit parsec text ]; homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; @@ -69840,8 +69898,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "0.9.0.1"; - sha256 = "196cv6lidxmjhsj83maflsnxqivw6q60nrw5ib1ssl4iqqry4k02"; + version = "0.9.1"; + sha256 = "1zqck8x48lvvz1biphzv647sw1gsl6b06700d7qpmrcmci0lcyky"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69853,7 +69911,6 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; - jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -70061,8 +70118,8 @@ self: { ({ mkDerivation, base, parallel }: mkDerivation { pname = "integration"; - version = "0.2.0.1"; - sha256 = "1pwykd7jjy1d7inf747mpz2bh7ygakmlb90xi57dwm8h249knbmk"; + version = "0.2.1"; + sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc"; buildDepends = [ base parallel ]; homepage = "https://github.com/ekmett/integration"; description = "Fast robust numeric integration via tanh-sinh quadrature"; @@ -74765,16 +74822,17 @@ self: { "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf - , pretty, transformers + , pretty, transformers, utf8-string }: mkDerivation { pname = "language-python"; - version = "0.4.1"; - sha256 = "174rj38bc3q4ak08d11r476wswfgv936m5x980kar7jj8p26q163"; + version = "0.5.0"; + sha256 = "1z0m0lbvrcjyh04zr52wi1zhmb28m4s67zlvf2wc6qh0z9y4l7wy"; buildDepends = [ - array base containers monads-tf pretty transformers + array base containers monads-tf pretty transformers utf8-string ]; buildTools = [ alex happy ]; + jailbreak = true; homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; @@ -74795,6 +74853,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-python-test" = callPackage + ({ mkDerivation, base, language-python }: + mkDerivation { + pname = "language-python-test"; + version = "0.5.0"; + sha256 = "0sxl2snzwi4v3fzfgdwy2fx1pih4qvh1z8s1qkkq346x76n4rgnv"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base language-python ]; + homepage = "http://github.com/bjpop/language-python-test"; + description = "testing code for the language-python library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-sh" = callPackage ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light }: @@ -76620,21 +76692,23 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, binary, bytestring, containers - , deepseq, directory, distributive, doctest, filepath, ghc-prim - , hashable, HUnit, lens, reflection, semigroupoids, semigroups - , simple-reflect, tagged, template-haskell, test-framework - , test-framework-hunit, transformers, unordered-containers, vector + ({ mkDerivation, adjunctions, base, binary, bytes, bytestring + , cereal, containers, deepseq, directory, distributive, doctest + , filepath, ghc-prim, hashable, HUnit, lens, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector , void }: mkDerivation { pname = "linear"; - version = "1.16.4"; - sha256 = "11ii56sxsr7c4b7n4lbwjc4kbz443zs2g5afklvvq3l685l5zp68"; + version = "1.17.1"; + sha256 = "009bp2lv2fniq0pnn19xiapc9fc9pp6qi9rcnzw1a646gmmb9si6"; buildDepends = [ - adjunctions base binary containers deepseq distributive ghc-prim - hashable lens reflection semigroupoids semigroups tagged - template-haskell transformers unordered-containers vector void + adjunctions base binary bytes cereal containers deepseq + distributive ghc-prim hashable lens reflection semigroupoids + semigroups tagged template-haskell transformers transformers-compat + unordered-containers vector void ]; testDepends = [ base binary bytestring directory doctest filepath HUnit lens @@ -78360,6 +78434,7 @@ self: { version = "0.3.1.1"; sha256 = "1c354ddx9niimfnppbg43d0v2dfr5s9s5dkppi0sld06jxaakxc5"; buildDepends = [ base data-default gl linear vector ]; + jailbreak = true; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -84834,6 +84909,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "natural-transformation" = callPackage + ({ mkDerivation, base, containers, quickcheck-instances, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "natural-transformation"; + version = "0.1"; + sha256 = "0qs8zfd3pwjr539453w94rddssw85ky695jz8rasn85sxp2kflbc"; + buildDepends = [ base ]; + testDepends = [ + base containers quickcheck-instances tasty tasty-quickcheck + ]; + homepage = "https://github.com/ku-fpg/natural-transformation"; + description = "A natural transformation package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "naturalcomp" = callPackage ({ mkDerivation, base, text, utf8-string }: mkDerivation { @@ -86563,12 +86655,16 @@ self: { }) {}; "not-gloss" = callPackage - ({ mkDerivation, base, GLUT, OpenGLRaw, spatial-math, time }: + ({ mkDerivation, base, binary, cereal, GLUT, OpenGLRaw + , spatial-math, time + }: mkDerivation { pname = "not-gloss"; - version = "0.7.0.0"; - sha256 = "0mc0sddkcqbhvawq1zfvypa8n7fhvg8z385w7m9f4awyyaza6jd0"; - buildDepends = [ base GLUT OpenGLRaw spatial-math time ]; + version = "0.7.0.2"; + sha256 = "1mizah0fwpk3nqk772qmp225kpbwbhikr70qrjzwgmlak9n8f54y"; + buildDepends = [ + base binary cereal GLUT OpenGLRaw spatial-math time + ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -87519,6 +87615,7 @@ self: { testDepends = [ base postgresql-simple product-profunctors profunctors time ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -89849,8 +89946,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-content"; - version = "0.0.3.1"; - sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz"; + version = "0.0.3.2"; + sha256 = "09nscaska3jpc0kkz4fgiyini8g6pk9b5p6kw5yp5nx984f8579a"; buildDepends = [ attoparsec base base16-bytestring bytestring containers io-streams pdf-toolbox-core text @@ -89866,8 +89963,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-core"; - version = "0.0.3.0"; - sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6"; + version = "0.0.3.2"; + sha256 = "0wz9khfymnsyjrcvj2dgav1a1sjira481gx9ks7sz23h5pj69bds"; buildDepends = [ attoparsec base bytestring containers errors io-streams scientific transformers zlib-bindings @@ -89878,17 +89975,18 @@ self: { }) {}; "pdf-toolbox-document" = callPackage - ({ mkDerivation, base, bytestring, cipher-rc4, containers - , cryptohash, io-streams, pdf-toolbox-content, pdf-toolbox-core - , text, transformers + ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4 + , containers, crypto-api, cryptohash, io-streams + , pdf-toolbox-content, pdf-toolbox-core, text, transformers }: mkDerivation { pname = "pdf-toolbox-document"; - version = "0.0.4.0"; - sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa"; + version = "0.0.5.0"; + sha256 = "0ilgbwmv2qvzbji79ybam5f2aghlqhq1jgchq39xxwrs2i40vrxz"; buildDepends = [ - base bytestring cipher-rc4 containers cryptohash io-streams - pdf-toolbox-content pdf-toolbox-core text transformers + base bytestring cipher-aes cipher-rc4 containers crypto-api + cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text + transformers ]; homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; @@ -89902,8 +90000,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-viewer"; - version = "0.0.3.0"; - sha256 = "173hc11aiy6zzsz624samxif953nl5gyjlxk8zy0c7a0yaxha1pp"; + version = "0.0.3.2"; + sha256 = "14245lv0jfmvmsldrhnp9n0fk7x2wjzsamwqjphbcxw70h9hw9s8"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -90639,8 +90737,8 @@ self: { }: mkDerivation { pname = "persona-idp"; - version = "0.1.0.1"; - sha256 = "138s5a565yaj2mq6gn8sh9iivwflgl9sxh6jxsf66a0hnr43mz6k"; + version = "0.1.0.2"; + sha256 = "082ly9m0m0g9brgzma489i4b4pkqqy50gv0a6hn7pvyhpr901b6n"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -90648,7 +90746,6 @@ self: { directory filepath hamlet http-types jose lens optparse-applicative pem persona scotty shakespeare text time transformers unix wai x509 ]; - jailbreak = true; homepage = "https://github.com/frasertweedale/hs-persona-idp"; description = "Persona (BrowserID) Identity Provider"; license = stdenv.lib.licenses.agpl3; @@ -94001,6 +94098,7 @@ self: { editedCabalFile = "49b845d840379a6920f4dde4d88ce96a4b7b98760410db0874ed9a322b113d32"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; + jailbreak = true; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; description = "product-profunctors"; license = stdenv.lib.licenses.bsd3; @@ -94077,9 +94175,8 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "4.3.2"; - sha256 = "06dv9bjz2hsm32kzfqqm6z54197dfjm3wycnbbgl9pib711w484v"; - editedCabalFile = "be979686814ec350c42af61b496af101aee25e5be211d22caccf59ef93e6581b"; + version = "4.4"; + sha256 = "0q4ixqv4gkvxx3wsyvp0hys11h4mms90lvka1hp1ni3h739z7kyj"; buildDepends = [ base comonad distributive semigroupoids tagged transformers ]; @@ -101043,8 +101140,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "4.0"; - sha256 = "0clc65rwxdgr1ps7r06cv5dqq91cfb56z9zmmw700xdmjdjq73f4"; + version = "4.1"; + sha256 = "03igvz1xmp20bx2cqsjw6f36p6i10z51kkhpj54xmmqkphb7alpw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -102298,8 +102395,8 @@ self: { }: mkDerivation { pname = "semigroups"; - version = "0.16.1"; - sha256 = "0ffy7xmzbwwbkcrpdyq0yw07w9ibiwnb2y5qmg0f5p71x830f3ad"; + version = "0.16.2.2"; + sha256 = "0mzdv05yhrvnib62mwfwwj66fmyzs3axm0y5sn374ig2r113wzni"; buildDepends = [ base bytestring containers deepseq hashable nats text unordered-containers @@ -105270,6 +105367,7 @@ self: { version = "0.1.0.1"; sha256 = "1gr36qbc1d6j3mhgpyxc08qkgk11kdpschvclh06jlcq3h2j62sy"; buildDepends = [ base linear vector ]; + jailbreak = true; homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several splines and polynomials"; license = stdenv.lib.licenses.bsd3; @@ -107183,12 +107281,12 @@ self: { }) {}; "spatial-math" = callPackage - ({ mkDerivation, base, cereal, doctest, ghc-prim, linear }: + ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }: mkDerivation { pname = "spatial-math"; - version = "0.2.1.1"; - sha256 = "0c5jy0kx88x48zibia8hiamy0fz2wy1gw6yv0271pdiw34b6va1c"; - buildDepends = [ base cereal ghc-prim linear ]; + version = "0.2.1.2"; + sha256 = "18b6q3dmw7xnl53ckhcsj831b98m3vx3nk9p16sjzh10zdpb0nk8"; + buildDepends = [ base binary cereal ghc-prim linear ]; testDepends = [ base doctest ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = stdenv.lib.licenses.bsd3; @@ -108395,6 +108493,7 @@ self: { version = "0.2.0.0"; sha256 = "10fk8kjzksym7qz9xc8pcglcn24rzi6ry03rnhxiy0mc6d6dsrb4"; buildDepends = [ base double-conversion free mtl text ]; + jailbreak = true; homepage = "https://github.com/jeffreyrosenbluth/static-canvas"; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; @@ -114912,13 +115011,12 @@ self: { }: mkDerivation { pname = "tinylog"; - version = "0.12.0"; - sha256 = "1khwwikdgy202b3gscnlw87da0s9mdxzmmflcqk9c9ybmn1mx2jn"; + version = "0.12.1"; + sha256 = "1hh70788d0rd35raybix383s6bb3mnibmmpdxwbqybv2dgmm4jq9"; buildDepends = [ auto-update base bytestring containers double-conversion fast-logger text transformers unix-time ]; - jailbreak = true; homepage = "https://github.com/twittner/tinylog/"; description = "Simplistic logging using fast-logger"; license = "unknown"; @@ -122272,6 +122370,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webcrank-dispatch" = callPackage + ({ mkDerivation, base, bytestring, mtl, path-pieces, reroute, text + , unordered-containers + }: + mkDerivation { + pname = "webcrank-dispatch"; + version = "0.1"; + sha256 = "1w4kfcm2d6iw4d45ywg2g6iysxl2iywk3nbk5ac6p6500y6hh97k"; + buildDepends = [ + base bytestring mtl path-pieces reroute text unordered-containers + ]; + homepage = "https://github.com/webcrank/webcrank-dispatch.hs"; + description = "A simple request dispatcher"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "webdriver" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, cond, data-default, directory, directory-tree @@ -122918,6 +123032,7 @@ self: { version = "0.2.4"; sha256 = "0xbzk4p5jazdkrlvj67xzy9vphl6rw90jp8cv4hr8p63v7ja2kfq"; buildDepends = [ base lens linear parsec parsec-numbers ]; + jailbreak = true; homepage = "http://github.com/bgamari/wkt"; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; @@ -127820,6 +127935,7 @@ self: { version = "0.1.1.1"; sha256 = "1j37ic4v4q1wwysm4gf41f5bxd8ywr4qnqpxscigm0ghbwfs7f1z"; buildDepends = [ base bytestring profunctors zlib ]; + jailbreak = true; homepage = "http://lens.github.io/"; description = "Lenses for zlib"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix new file mode 100644 index 000000000000..d1600ee8a8f4 --- /dev/null +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, SDL2, freetype }: + +stdenv.mkDerivation rec { + name = "SDL2_ttf-2.0.12"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + sha256 = "0vkg6lyj278mdpd52map3rfi65fbq16w67ahmmfcl77a8da60a47"; + }; + + buildInputs = [SDL2 freetype]; + + postInstall = "ln -s $out/include/SDL2/SDL_ttf.h $out/include/"; + + meta = { + description = "SDL TrueType library"; + }; +} diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 857f002cace9..e343536b8fa8 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -16,13 +16,13 @@ wrapPythonProgramsIn() { done for i in $(find "$dir" -type f -perm +0100); do - # Rewrite "#! .../env python" to "#! /nix/store/.../python". if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" fi - if head -n1 "$i" | grep -q '/python\|/pypy'; then + # catch /python and /.python-wrapped + if head -n1 "$i" | grep -q '/\.\?\(python\|pypy\)'; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." diff --git a/pkgs/development/python-modules/gevent_sslwrap.patch b/pkgs/development/python-modules/gevent_sslwrap.patch index 10c61478bd6b..a9bb0eab5de9 100644 --- a/pkgs/development/python-modules/gevent_sslwrap.patch +++ b/pkgs/development/python-modules/gevent_sslwrap.patch @@ -1,8 +1,17 @@ -Index: b/gevent/ssl.py -=================================================================== +From 485cebc4d9bab2dae51cf29f91fad2f1cf157fec Mon Sep 17 00:00:00 2001 +From: Eugene Pankov <john.pankov@gmail.com> +Date: Sun, 21 Sep 2014 12:04:13 +0300 +Subject: [PATCH] Work around missing sslwrap in Python 2.7.9 (fixes #477) + +--- + gevent/_ssl2.py | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +diff --git a/gevent/ssl.py b/gevent/ssl.py +index 21491b7..85e6a86 100644 --- a/gevent/ssl.py +++ b/gevent/ssl.py -@@ -81,15 +81,14 @@ class SSLSocket(socket): +@@ -80,15 +80,27 @@ def __init__(self, sock, keyfile=None, certfile=None, self._sslobj = None else: # yes, create the SSL object @@ -10,19 +19,31 @@ Index: b/gevent/ssl.py - self._sslobj = _ssl.sslwrap(self._sock, server_side, - keyfile, certfile, - cert_reqs, ssl_version, ca_certs) -- else: ++ if hasattr(_ssl, 'sslwrap'): ++ if ciphers is None: ++ self._sslobj = _ssl.sslwrap(self._sock, server_side, ++ keyfile, certfile, ++ cert_reqs, ssl_version, ca_certs) ++ else: ++ self._sslobj = _ssl.sslwrap(self._sock, server_side, ++ keyfile, certfile, ++ cert_reqs, ssl_version, ca_certs, ++ ciphers) + else: - self._sslobj = _ssl.sslwrap(self._sock, server_side, - keyfile, certfile, - cert_reqs, ssl_version, ca_certs, - ciphers) -+ ctx = __ssl__.SSLContext(ssl_version) -+ if keyfile or certfile: -+ ctx.load_cert_chain(certfile, keyfile) -+ if ca_certs: -+ ctx.load_verify_locations(ca_certs) -+ if ciphers: -+ ctx.set_ciphers(ciphers) -+ self._sslobj = ctx._wrap_socket(self._sock, server_side=server_side) ++ self.context = __ssl__.SSLContext(ssl_version) ++ self.context.verify_mode = cert_reqs ++ if ca_certs: ++ self.context.load_verify_locations(ca_certs) ++ if certfile: ++ self.context.load_cert_chain(certfile, keyfile) ++ if ciphers: ++ self.context.set_ciphers(ciphers) ++ self._sslobj = self.context._wrap_socket(self._sock, server_side=server_side, ssl_sock=self) ++ if do_handshake_on_connect: self.do_handshake() self.keyfile = keyfile diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index f2aa1e06ec80..fc64caf1053d 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"; }; - enableParallelBuilding = true; + # nondeterministic failures when creating directories + enableParallelBuilding = false; buildInputs = [ pkgconfig SDL2 alsaLib gtk3 mesa_glu mesa makeWrapper libarchive libao unzip xdg_utils gsettings_desktop_schemas ]; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 668f86b83332..f9b7ad8fe64b 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.82"; + name = "pngcrush-1.7.83"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1cxg0a6x7sq0dh9ia8isgx3awwx1db96wq4n22rs31sm3niiw0fl"; + sha256 = "0324l1czflplz49i1i3xs72pzi9p4f8h6yk626q5y81fn29kg5mj"; }; configurePhase = '' diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 7a42ec48fb67..5312445563a6 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,13 +1,13 @@ { lib, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.4.2"; + version = "0.4.3"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { - url = https://github.com/untitaker/vdirsyncer/archive/0.4.2.tar.gz; - sha256 = "008181mglbrp5jsvpxr59b6w4mw26h4s4gwij152i47mfbrizsl4"; + url = "https://github.com/untitaker/vdirsyncer/archive/${version}.tar.gz"; + sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai"; }; pythonPath = with pythonPackages; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8ce9205c5bd..29380ca4fbbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5905,6 +5905,8 @@ let hsqldb = callPackage ../development/libraries/java/hsqldb { }; + hstr = callPackage ../applications/misc/hstr { }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; @@ -7286,6 +7288,8 @@ let SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; + SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; + serd = callPackage ../development/libraries/serd {}; serf = callPackage ../development/libraries/serf {}; |