From 84a6a3683b7e10122d7a2c00a150cc1b1c02c4bb Mon Sep 17 00:00:00 2001 From: Volth Date: Wed, 2 Aug 2017 01:18:57 +0000 Subject: [PATCH 001/213] libvirt: 3.5.0 -> 3.6.0 --- nixos/modules/virtualisation/libvirtd.nix | 34 +++++++------------ .../development/libraries/libvirt/default.nix | 15 ++++++-- pkgs/top-level/python-packages.nix | 4 +-- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index b24ea0f33c9..e07fb0f8fe4 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -15,7 +15,7 @@ let ''; qemuConfigFile = pkgs.writeText "qemu.conf" '' ${optionalString cfg.qemuOvmf '' - nvram = ["${pkgs.OVMF.fd}/FV/OVMF_CODE.fd:${pkgs.OVMF.fd}/FV/OVMF_VARS.fd"] + nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"] ''} ${cfg.qemuVerbatimConfig} ''; @@ -102,9 +102,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = with pkgs; - [ libvirt netcat-openbsd ] - ++ optional cfg.enableKVM qemu_kvm; + environment.systemPackages = with pkgs; [ libvirt netcat-openbsd ]; boot.kernelModules = [ "tun" ]; @@ -129,7 +127,6 @@ in { dnsmasq ebtables ] - ++ optional cfg.enableKVM qemu_kvm ++ optional vswitch.enable vswitch.package; preStart = '' @@ -155,23 +152,18 @@ in { # Copy generated qemu config to libvirt directory cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf - # libvirtd puts the full path of the emulator binary in the machine - # config file. But this path can unfortunately be garbage collected - # while still being used by the virtual machine. So update the - # emulator path on each startup to something valid (re-scan $PATH). - for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do - test -f "$file" || continue - # get (old) emulator path from config file - emulator=$("${pkgs.xmlstarlet}/bin/xmlstarlet" select --template --value-of "/domain/devices/emulator" "$file") - # get a (definitely) working emulator path by re-scanning $PATH - new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator")) - # write back - "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/devices/emulator" -v "$new_emulator" "$file" + # stable (not GC'able as in /nix/store) paths for using in section of xml configs + mkdir -p /run/libvirt/nix-emulators + ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/ + ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"} + ${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"} - # Also refresh the OVMF path. Files with no matches are ignored. - "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/os/loader" -v "${pkgs.OVMF.fd}/FV/OVMF_CODE.fd" "$file" - done - ''; # */ + ${optionalString cfg.qemuOvmf '' + mkdir -p /run/libvirt/nix-ovmf + ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/libvirt/nix-ovmf/ + ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/libvirt/nix-ovmf/ + ''} + ''; serviceConfig = { Type = "notify"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 805a4c0b63d..b3066c4eed8 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, makeWrapper -, libxml2, gnutls, devicemapper, perl, python2, attr +, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -12,11 +12,11 @@ with stdenv.lib; # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "05mm4xdw6g960rwvc9189nhxpm1vrilnmpl4h4m1lha11pivlqr9"; + sha256 = "0gcyql5dp6j370kvik9hjhxirrg89m7l1q52yq0g75h7jpv9fb1s"; }; patches = [ ./build-on-bsd.patch ]; @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH substituteInPlace configure \ --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' + + # the path to qemu-kvm will be stored in VM's .xml and .save files + # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations + substituteInPlace src/qemu/qemu_capabilities.c \ + --replace '"/usr/libexec/qemu-kvm"' '"/run/libvirt/nix-emulators/${if stdenv.isAarch64 then "qemu-system-aarch64" else "qemu-kvm"}"' + substituteInPlace src/lxc/lxc_conf.c \ + --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' '' + '' PATH=${dnsmasq}/bin:$PATH patchShebangs . # fixes /usr/bin/python references @@ -77,6 +84,8 @@ stdenv.mkDerivation rec { --replace "lock/subsys" "lock" sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \ -i "$out/libexec/libvirt-guests.sh" + + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill '' + optionalString stdenv.isLinux '' rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1333c071b3e..e8ee822bb58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26512,13 +26512,13 @@ EOF }; libvirt = let - version = "3.5.0"; + version = "3.6.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "06mc0cm4k90z8vxaslk3ifpajg8w8dvm0m2mxwcd6fdzps8fwpsw"; + sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; From e355f7044d7efaa49761bc4d4f43e94b0f2f3ab2 Mon Sep 17 00:00:00 2001 From: evujumenuk Date: Fri, 4 Aug 2017 18:30:53 +0200 Subject: [PATCH 002/213] wireguard: add per-peer routing table option This adds a convenient per-peer option to set the routing table that associated routes are added to. This functionality is very useful for isolating interfaces from the kernel's global routing and forcing all traffic of a virtual interface (or a group of processes, via e.g. "ip rule add uidrange 10000-10009 lookup 42") through Wireguard. --- .../modules/services/networking/wireguard.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index be832ea45d8..f76909af4ca 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -160,6 +160,14 @@ let interval of 25 seconds; however, most users will not need this.''; }; + table = mkOption { + default = "main"; + type = types.str; + description = ''The kernel routing table to add this peer's associated + routes to. Setting this is useful for e.g. policy routing ("ip rule") + or virtual routing and forwarding ("ip vrf"). Both numeric table IDs + and table names (/etc/rt_tables) can be used. Defaults to "main".''; + }; }; }; @@ -207,9 +215,11 @@ let "${ipCommand} link set up dev ${name}" - (map (peer: (map (ip: - "${ipCommand} route replace ${ip} dev ${name}" - ) peer.allowedIPs)) values.peers) + (map (peer: + (map (allowedIP: + "${ipCommand} route replace ${allowedIP} dev ${name} table ${peer.table}" + ) peer.allowedIPs) + ) values.peers) values.postSetup ]); @@ -240,7 +250,8 @@ in peers = [ { allowedIPs = [ "192.168.20.1/32" ]; publicKey = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; - endpoint = "demo.wireguard.io:12913"; } + endpoint = "demo.wireguard.io:12913"; + table = "42"; } ]; }; }; From 6070d91e93c29dc53a2d71c7a9505255f1a48459 Mon Sep 17 00:00:00 2001 From: evujumenuk Date: Fri, 4 Aug 2017 21:00:45 +0200 Subject: [PATCH 003/213] wireguard: remove "table" option from example Most users will be served well by the default "table" setting ("main"). --- nixos/modules/services/networking/wireguard.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index f76909af4ca..5aa4f13d452 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -250,8 +250,7 @@ in peers = [ { allowedIPs = [ "192.168.20.1/32" ]; publicKey = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; - endpoint = "demo.wireguard.io:12913"; - table = "42"; } + endpoint = "demo.wireguard.io:12913"; } ]; }; }; From 2dddc6dcf6711fb3c1264a520262d00f4a3e04da Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 29 May 2017 18:03:07 +0200 Subject: [PATCH 004/213] libvirt: don't suspend and resume on change --- nixos/modules/virtualisation/libvirtd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index e07fb0f8fe4..57178e05e5c 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -175,6 +175,7 @@ in { systemd.services.libvirt-guests = { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ coreutils libvirt gawk ]; + restartIfChanged = false; }; systemd.sockets.virtlogd = { From 5a9109fffa0ae5fc5c46167a29a97aba4ad462ff Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 28 Jul 2017 17:43:11 +0200 Subject: [PATCH 005/213] mopidy-iris: 3.0.5 -> 3.1.3 --- pkgs/applications/audio/mopidy-iris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index 88c95086c1a..cca2e1730f3 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.0.5"; + version = "3.1.3"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "0rabpzmiis13z4qz3vqlsfc9xjkwracafckahnq2cq97qawyq9y9"; + sha256 = "144q83cfgdwlj5gv9wyi902xfjybsaa9n7d5azs14jpbnmmbj61f"; }; propagatedBuildInputs = [ From b7290a283aec78fb3bc4d9e0124b16801bb506b6 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 5 Aug 2017 22:14:24 +0200 Subject: [PATCH 006/213] fish: fix the fish_config tool It requires a python interpreter to work. --- pkgs/shells/fish/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index c328329bb26..9da7e407e16 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, coreutils, utillinux, nettools, kbd, bc, which, gnused, gnugrep, groff, man-db, glibc, libiconv, pcre2, - gettext, ncurses, python + gettext, ncurses, python3 , writeText , useOperatingSystemEtc ? true - + }: with stdenv.lib; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ coreutils gnugrep gnused bc - python groff gettext + python3 groff gettext ] ++ optional (!stdenv.isDarwin) man-db; postInstall = '' @@ -132,8 +132,10 @@ stdenv.mkDerivation rec { "$out/share/fish/functions/__fish_print_help.fish" sed -i "s|/sbin /usr/sbin||" \ "$out/share/fish/functions/__fish_complete_subcommand_root.fish" - sed -e "s|clear;|${ncurses.out}/bin/clear;|" \ - -i "$out/share/fish/functions/fish_default_key_bindings.fish" \ + sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ + -i "$out/share/fish/functions/fish_default_key_bindings.fish" + sed -e "s|python3|${getBin python3}/bin/python3|" \ + -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} '' + optionalString stdenv.isLinux '' sed -e "s| ul| ${utillinux}/bin/ul|" \ From 46eb0e2cd143883856ab9b2768b2fd5b82aee029 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 5 Aug 2017 22:23:49 +0200 Subject: [PATCH 007/213] fish: add fish_config tests Checks whether the fish_config script does run. Cannot check running the web server though (since that requires a port). --- pkgs/shells/fish/default.nix | 182 ++++++++++++++++++++--------------- 1 file changed, 106 insertions(+), 76 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 9da7e407e16..5832c8ef891 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -85,88 +85,118 @@ let $__extra_confdir end ''; -in -stdenv.mkDerivation rec { - name = "fish-${version}"; - version = "2.6.0"; + fish = stdenv.mkDerivation rec { + name = "fish-${version}"; + version = "2.6.0"; - etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; + etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; - src = fetchurl { - url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; + src = fetchurl { + url = "http://fishshell.com/files/${version}/${name}.tar.gz"; + sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; + }; + + buildInputs = [ ncurses libiconv pcre2 ]; + configureFlags = [ "--without-included-pcre2" ]; + + # Required binaries during execution + # Python: Autocompletion generated from manpages and config editing + propagatedBuildInputs = [ + coreutils gnugrep gnused bc + python3 groff gettext + ] ++ optional (!stdenv.isDarwin) man-db; + + postInstall = '' + sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ + -i "$out/share/fish/functions/grep.fish" + sed -e "s|bc|${bc}/bin/bc|" \ + -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ + -i "$out/share/fish/functions/seq.fish" \ + "$out/share/fish/functions/math.fish" + sed -i "s|which |${which}/bin/which |" \ + "$out/share/fish/functions/type.fish" + sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ + -i "$out/share/fish/functions/fish_prompt.fish" + sed -e "s|gettext |${gettext}/bin/gettext |" \ + -e "s|which |${which}/bin/which |" \ + -i "$out/share/fish/functions/_.fish" + sed -e "s|uname|${coreutils}/bin/uname|" \ + -i "$out/share/fish/functions/__fish_pwd.fish" \ + "$out/share/fish/functions/prompt_pwd.fish" + sed -e "s|sed |${gnused}/bin/sed |" \ + -i "$out/share/fish/functions/alias.fish" \ + "$out/share/fish/functions/prompt_pwd.fish" + sed -i "s|nroff |${groff}/bin/nroff |" \ + "$out/share/fish/functions/__fish_print_help.fish" + sed -i "s|/sbin /usr/sbin||" \ + "$out/share/fish/functions/__fish_complete_subcommand_root.fish" + sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ + -i "$out/share/fish/functions/fish_default_key_bindings.fish" + sed -e "s|python3|${getBin python3}/bin/python3|" \ + -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} + + '' + optionalString stdenv.isLinux '' + sed -e "s| ul| ${utillinux}/bin/ul|" \ + -i "$out/share/fish/functions/__fish_print_help.fish" + for cur in $out/share/fish/functions/*.fish; do + sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \ + -i "$cur" + done + + '' + optionalString (!stdenv.isDarwin) '' + sed -i "s|(hostname\||(${nettools}/bin/hostname\||" \ + "$out/share/fish/functions/fish_prompt.fish" + sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \ + "$out/share/fish/tools/create_manpage_completions.py" + sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ + "$out/share/fish/functions/man.fish" + '' + optionalString useOperatingSystemEtc '' + tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} + '' + '' + tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} + ''; + + meta = with stdenv.lib; { + description = "Smart and user-friendly command line shell"; + homepage = http://fishshell.com/; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ ocharles ]; + }; + + passthru = { + shellPath = "/bin/fish"; + }; }; - buildInputs = [ ncurses libiconv pcre2 ]; - configureFlags = [ "--without-included-pcre2" ]; + tests = { - # Required binaries during execution - # Python: Autocompletion generated from manpages and config editing - propagatedBuildInputs = [ - coreutils gnugrep gnused bc - python3 groff gettext - ] ++ optional (!stdenv.isDarwin) man-db; + # Test the fish_config tool by checking the generated splash page. + # Since the webserver requires a port to run, it is not started. + fishConfig = + let fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' - postInstall = '' - sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ - -i "$out/share/fish/functions/grep.fish" - sed -e "s|bc|${bc}/bin/bc|" \ - -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ - -i "$out/share/fish/functions/seq.fish" \ - "$out/share/fish/functions/math.fish" - sed -i "s|which |${which}/bin/which |" \ - "$out/share/fish/functions/type.fish" - sed -e "s|\|cut|\|${coreutils}/bin/cut|" \ - -i "$out/share/fish/functions/fish_prompt.fish" - sed -e "s|gettext |${gettext}/bin/gettext |" \ - -e "s|which |${which}/bin/which |" \ - -i "$out/share/fish/functions/_.fish" - sed -e "s|uname|${coreutils}/bin/uname|" \ - -i "$out/share/fish/functions/__fish_pwd.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" - sed -e "s|sed |${gnused}/bin/sed |" \ - -i "$out/share/fish/functions/alias.fish" \ - "$out/share/fish/functions/prompt_pwd.fish" - sed -i "s|nroff |${groff}/bin/nroff |" \ - "$out/share/fish/functions/__fish_print_help.fish" - sed -i "s|/sbin /usr/sbin||" \ - "$out/share/fish/functions/__fish_complete_subcommand_root.fish" - sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ - -i "$out/share/fish/functions/fish_default_key_bindings.fish" - sed -e "s|python3|${getBin python3}/bin/python3|" \ - -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} - - '' + optionalString stdenv.isLinux '' - sed -e "s| ul| ${utillinux}/bin/ul|" \ - -i "$out/share/fish/functions/__fish_print_help.fish" - for cur in $out/share/fish/functions/*.fish; do - sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \ - -i "$cur" - done - - '' + optionalString (!stdenv.isDarwin) '' - sed -i "s|(hostname\||(${nettools}/bin/hostname\||" \ - "$out/share/fish/functions/fish_prompt.fish" - sed -i "s|Popen(\['manpath'|Popen(\['${man-db}/bin/manpath'|" \ - "$out/share/fish/tools/create_manpage_completions.py" - sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ - "$out/share/fish/functions/man.fish" - '' + optionalString useOperatingSystemEtc '' - tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} - '' + '' - tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} - ''; - - meta = with stdenv.lib; { - description = "Smart and user-friendly command line shell"; - homepage = http://fishshell.com/; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ ocharles ]; + # cannot test the http server because it needs a localhost port + ''; + in '' + HOME=$(mktemp -d) + ${fish}/bin/fish ${fishScript} + ''; }; - passthru = { - shellPath = "/bin/fish"; - }; -} + # FIXME(Profpatsch) replace withTests stub + withTests = flip const; + +in withTests tests fish From d3107e4508ae2821c482db20c8a0e8c49f28b5a1 Mon Sep 17 00:00:00 2001 From: Heitham Omar Date: Sun, 6 Aug 2017 16:29:09 +0100 Subject: [PATCH 008/213] openelec-dvb-firmware: init at 0.0.51 --- .../openelec-dvb-firmware/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix new file mode 100644 index 00000000000..b60ce6f1b4a --- /dev/null +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "openelec-dvb-firmware-${version}"; + version = "0.0.51"; + + src = fetchurl { + url = "https://github.com/OpenELEC/dvb-firmware/archive/${version}.tar.gz"; + sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + DESTDIR="$out" ./install + find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm + ''; + + meta = with stdenv.lib; { + description = "DVB firmware from OpenELEC"; + homepage = https://github.com/OpenELEC/dvb-firmware; + license = licenses.unfreeRedistributableFirmware; + platforms = platforms.linux; + priority = 7; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60f5378a662..62af809b16e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11991,6 +11991,8 @@ with pkgs; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; + openiscsi = callPackage ../os-specific/linux/open-iscsi { }; openisns = callPackage ../os-specific/linux/open-isns { }; From c6207abe9cc2f984402d31244c34bcaeef97c366 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 6 Aug 2017 12:40:13 -0300 Subject: [PATCH 009/213] pluma: init at 1.18.2 --- pkgs/desktops/mate/default.nix | 1 + pkgs/desktops/mate/pluma/default.nix | 38 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/desktops/mate/pluma/default.nix diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 528f792a600..014afc5fbb5 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -2,6 +2,7 @@ rec { atril = callPackage ./atril { }; caja = callPackage ./caja { }; + pluma = callPackage ./pluma { }; mate-common = callPackage ./mate-common { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { }; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix new file mode 100644 index 00000000000..29df4fc475a --- /dev/null +++ b/pkgs/desktops/mate/pluma/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "pluma-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1z0938yiygxipj2a77n9dv8v4253snrc5gbbnarcnim9xba2j3zz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + isocodes + wrapGAppsHook + ]; + + buildInputs = [ + enchant + libxml2 + python + gnome3.gtksourceview + gnome3.libpeas + mate.mate-desktop + ]; + + meta = { + description = "Powerful text editor for the MATE desktop"; + homepage = http://mate-desktop.org; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} From 541377e5f0189819cfa50dacbb7569e26c06a3c0 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Fri, 21 Jul 2017 19:14:03 +0100 Subject: [PATCH 010/213] rsync service: modernize config file generation --- .../services/network-filesystems/rsyncd.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 2018bfa14a5..a52fec4c407 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -8,22 +8,21 @@ let motdFile = builtins.toFile "rsyncd-motd" cfg.motd; - moduleConfig = name: - let module = getAttr name cfg.modules; in - "[${name}]\n " + (toString ( - map - (key: "${key} = ${toString (getAttr key module)}\n") - (attrNames module) - )); + foreach = attrs: f: + concatStringsSep "\n" (mapAttrsToList f attrs); - cfgFile = builtins.toFile "rsyncd.conf" - '' + cfgFile = '' ${optionalString (cfg.motd != "") "motd file = ${motdFile}"} ${optionalString (cfg.address != "") "address = ${cfg.address}"} ${optionalString (cfg.port != 873) "port = ${toString cfg.port}"} ${cfg.extraConfig} - ${toString (map moduleConfig (attrNames cfg.modules))} - ''; + ${foreach cfg.modules (name: module: '' + [${name}] + ${foreach module (k: v: + "${k} = ${v}" + )} + '')} + ''; in { @@ -91,10 +90,7 @@ in config = mkIf cfg.enable { - environment.etc = singleton { - source = cfgFile; - target = "rsyncd.conf"; - }; + environment.etc."rsyncd.conf".text = cfgFile; systemd.services.rsyncd = { description = "Rsync daemon"; From 94fc613cc7b2be6fb92ddfd5f2c1649b27459be0 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Fri, 21 Jul 2017 19:14:21 +0100 Subject: [PATCH 011/213] rsync service: restart service on configuration change --- nixos/modules/services/network-filesystems/rsyncd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index a52fec4c407..0759fcc2a3b 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -95,6 +95,7 @@ in systemd.services.rsyncd = { description = "Rsync daemon"; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."rsyncd.conf".source ]; serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; }; From a4d07290cba3208a2ff930c8cfb594ff809ec7ad Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Fri, 21 Jul 2017 20:15:27 +0100 Subject: [PATCH 012/213] rsync service: allow running as not root --- .../services/network-filesystems/rsyncd.nix | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 0759fcc2a3b..054057d52ab 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -83,6 +83,24 @@ in }; }; + user = mkOption { + type = types.str; + default = "root"; + description = '' + The user to run the daemon as. + By default the daemon runs as root. + ''; + }; + + group = mkOption { + type = types.str; + default = "root"; + description = '' + The group to run the daemon as. + By default the daemon runs as root. + ''; + }; + }; }; @@ -96,8 +114,11 @@ in description = "Rsync daemon"; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."rsyncd.conf".source ]; - serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; + serviceConfig = { + ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; + User = cfg.user; + Group = cfg.group; + }; }; - }; } From b27d8c5d0af76a512fd85c4e3d83833a4b514bc8 Mon Sep 17 00:00:00 2001 From: Richard Larocque Date: Sun, 6 Aug 2017 15:54:36 -0700 Subject: [PATCH 013/213] nixos/mosquitto: Fix instructions for password gen Fixes https://github.com/NixOS/nixpkgs/issues/27996. Updates instructions for generating hashes passwords for use in a Mosquitto password file. Using `mosquitto_passwd` to generate these hashes is a little less convenient, but the results are more likely to be compatible with the mosquitto daemon. As far as I can tell, the hashes generated with `mkpassd` did not work as intended. But this may have been hidden by another bug: https://github.com/NixOS/nixpkgs/issues/27130. --- nixos/modules/services/networking/mosquitto.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 5451500b56f..81915b5a2ef 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -125,8 +125,8 @@ in description = '' Specifies the hashed password for the MQTT User. overrides . - To generate hashed password install mkpasswd - package and run mkpasswd -m sha-512. + To generate hashed password install mosquitto + package and use mosquitto_passwd. ''; }; From 311a7ca32902639fc9756b950653ebdc4d48f656 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 7 Aug 2017 21:12:44 +0900 Subject: [PATCH 014/213] firefox-bin: 54.0.1 -> 55.0 --- .../browsers/firefox-bin/release_sources.nix | 764 +++++++++--------- 1 file changed, 387 insertions(+), 377 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 33591b5365a..5a34d305af7 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,945 +1,955 @@ { - version = "54.0.1"; + version = "55.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ach/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ach/firefox-55.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "60057e48d8bda98dc63597aa795899ca1fa856f8a9f9380a8de91d0ca0641dd291a3fb27bd1f69b1effebc5288575c0a0661199e8e8e95ef8d924fad25831678"; + sha512 = "0ce9a2852a86553f96018e8873e966996f5386204065200f0b24dd0b939aa815efda0fde06133974d79ae4f944c5a77ef4d91929baddc6d72a5a457203ef7784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/af/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/af/firefox-55.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "08a2cb7ee7bfdd4a5c205a38e1d966bbf8c67a3a5abf52bdfc73dcb527cf0dbe361bec4996d52e33321180f5c1778e8304f1b377bce04e62fca7457df8ee69b5"; + sha512 = "97c01c8794e2ffe0cc25e6352ba4c6155ea1e1dfc8bcec669036ffda1aec943326ac38c43eb8260a55d46a264858144bdf0cceb9912c4f2d0d373d4d0d4256b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/an/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/an/firefox-55.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "200f10de4f714afb10a9c6d1b4ac8488d5bdc18673b8db9aae51b8d0e8b14fc3f5f6211447abd10e13704b07499fc1a273d9ee060329d8337cc413d7ed6d19b3"; + sha512 = "f30070803ac80d00e4fb248f0c1e871b51bb4c78f8c3b12923d6b96c9686ea22768aeb9204da880647893524aa68e44576be4092d44a6b189b5cf01f493f9c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ar/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ar/firefox-55.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "564c72c485c593342c7056bec7dfa7a0cafbfb26eff278e08b0938194b311633b3e3275fd0eeaabc63eace36712efb194ecb700f61957bf0553b79a71977132f"; + sha512 = "213d73338a3087f925a5137432e84f1c0f881d37c33c109d9ab6e2744556341697e56c7efcd7f4d5011cdb6fec03de072afbf14c34a30770456f71c8971d4b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/as/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/as/firefox-55.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "84d14f6152bbc17caaf4ac8d421835032da45dfbb34dd198ea5ec65d972e10a774aeba830eba5256933f3df395b5aef71aede2e334fb35aee8f9f27771d65dce"; + sha512 = "1d33b5602db1a326be0ac9ed726e38b5e871904685e6586211caf6b330417d33c717399663d94d725d4f8784591c5b7eaf4b4ecb867b8d99e2c85671b31f5877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ast/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ast/firefox-55.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f5851e28972b5e87b48e8498a01c685790e4ace5e3d0f4c286953d6fe417495a9fb26ca3bd962d1f798a178115d2bb60367c48057c55b2e601dcf208ad146cb4"; + sha512 = "93a08c86dac4a81fee72cd4c35f39f578222ef11e28e503851c9a7ad7cffec3e3324c32374ed851094b8ae91c642a2d726b98cade60fb4511a935320ba790faa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/az/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/az/firefox-55.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "6ed4bb73da6362ed4598d5c6de8b072e919894778ecdec49b2e8e406d0c68b88c32f0b208a546834cba7ebbbee9a09595a67473e29a5c11bc2390d3a1721aa42"; + sha512 = "4661628ea83c2101481bf08c1484952a30c27b9cd1d169bacd96fb6416ef77321e7e606e989521189c5135c63b2b82b7fbd3e85d0f50919f6c9c277176aa34df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bg/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/be/firefox-55.0.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha512 = "7062919a385600ed74972b1851ab7bd20a46003c37e058b93cf8fdb853ebb890b173aa6cc572d2f51661b571d3efbc189d04abff4dbbd9e93398ad5a55015e7f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bg/firefox-55.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "bbcd618c9bf86c7ee49a3ee1a3aa799c72ffb048d694ba0e97ca8c4a9341d1ee109265529aeb23f578aaf66d34ef3a81a7031033421933c0f6d5d0ce136c3d68"; + sha512 = "d58389193c33aa24aac09ad286b83f0f808116f20907506d2d37a3cc45ae43223784fc12face495cbba34be24358584e38add83048b477a27a93f8934c86c82e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-BD/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bn-BD/firefox-55.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9c3114291cac3b6df9bb92b398ed644f4851baaf99b6db9959e5fa841dd535da39cd3aae343226ae5fd713ab872efb4d4902f4a4f85e836372c67a416134c03c"; + sha512 = "9d552eec9497565bcd71faba474338e97465d1902280972a04f4f7e5fae88cdeac144b12fd1bc80d079b8c16b0c7e5a4dd5da6e56486e688820653cff35ae517"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bn-IN/firefox-55.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5662dc48972153cc67034b148d96e120c802ade4d7ef532fb2964f8ffcbec30878489c81d758e729135488d39123bd404ab53e1ae1389b0c4e22303096c7e3cb"; + sha512 = "4f150944cc42c829fc619e3a20fbca9f5116180b5c2e160d48c8b9f42325898847abbc0bb0724343527e97cbb74b7286dd8b7901c0ee9ce83559198994486505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/br/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/br/firefox-55.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "166dca485d947bb42b1b5ac9781d48104d876f952cd8ceb4006f7e0f79773aa2f285413088cc535610e6209538c03bbeb63f91255712466a50a12cddf747f0bd"; + sha512 = "18f0d851b249c7bb8979499b146756efbad587ce48ded72a58bbfa2dd1fe951d5ee6d1188f6e659c760aa4e60095b481921feb016e69f78e439de18f7ecc0bcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bs/firefox-55.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "81226d4550310d61d2198298bbc859406ee7f14e98ccab326b83bd51c8c33305771e9353d0609477eb381083f1e0f1a8bc0c0bbd085a738cfe00697877051516"; + sha512 = "b0b838026b932d558ff3af52bca708e3f60929c2928c17c956b1d4f2e023edd45d98d65b7ea268c2ae04299944d26cf19d9a9deecabfe447c8548cd8afe98b28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ca/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ca/firefox-55.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "833096d35ca517d21b45e78d895bd4f535a55fff7a9990e22c684fba8549d2207317a715e2a42b7ecebf1ab474df262f2c25c9e44863cf167dad70f191ad39c5"; + sha512 = "fd700550d5983f53d80330d08754c84e7683f965316f738e9ca5d45176d7fd42ec57a02aaef3e82358d8c7913cce9284e04299d32cac443063184c41e5c7b0a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cak/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cak/firefox-55.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5b05bf2b0a256e135e7d687520b901caaedd66593ca3cb458c01f8ddf85149144f75c24f8b0fd4bbe2d9cbeafedbb569f080970601c40895db96e7a14aa3c5d4"; + sha512 = "4cfc69ef47fee1a8a2127be92cef59d2dfb40c99ac172eb78de978e7cd7aced093a7c1da91fdf518a0c9b23a81f393919c44c353b52fcb71b53b41ffe88fa22f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cs/firefox-55.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "63ea3c524c3e91504fe1b0d5cd1b74fbfe9b22cbfb18d9aec73569452a2766b90f29e2793f6bd235d68854d16b8862f46bf3ead132cd693866bd70502e0b8b39"; + sha512 = "33c912c591e8856bad1130281db996c82df28fff10d7f7031ababeb7acd385df6ef14165c491b48edd285cd8086071dbf41e3448431f028364d62810b3fe4a34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cy/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cy/firefox-55.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c804908472ab1a59b6a24e448b9bf37ded669dbf2d0a4fe0993ff2dba666e804b0fb846efe6c7f1923e4472a3735f9f33876dc015826b03790f4c445ab6215e5"; + sha512 = "5cdc13b0317d7b0998c534a92e094374ffedea9f430e0f27c97b972985ca050abb7ddecff60f87ccc0d6c240db453b335fba12eec3e8448f0f830b402dfa6171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/da/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/da/firefox-55.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c289354eb5443b9f5e3027e80974af9aa9a5da045034ee147cf75d52de16a1e35328027fdcde149f2ef1d3a72213e3837668fdab4b610949b36e180aaa1dac56"; + sha512 = "c0cfc7e4a398d5004c1a3f1afb3ee5c32502e7929cd7ff7cbdced2f9104452a6754db8c22764cdaa90885698cdf40379016f866595f98adf1498f48576a1fc86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/de/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/de/firefox-55.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "99f214b83822243530a8194edbf50284bb703ba07695c1c5f7bd3cfe87fce64477806cbff852af92ad6eef16c85329c1b04608490fda12bac27300daef23778a"; + sha512 = "544e6069c5f2c92b80f804d105d4a198ca360415701d9a9ebb08044cd877a2e0793b03381bdab55e31649b021a1343647ae8f21844915096347fdc2e8280ed45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/dsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/dsb/firefox-55.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "96682d6d27e4d2c57930059a6cabe2649d4a52e006eddcfd4f940ed816f448e3d476488ab23de6a1106c66007268aaaea21ce3f621ce7e21aabca1ec00a5f0bd"; + sha512 = "53e7bbac4a479e06a14dc91313b66f28c5731b88faea2254c0e72e40ef4eb772c61bf494557474f03e1b52d3d85f8cfd2785085b4d7324907107080342899a56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/el/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/el/firefox-55.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "122c72046a3cc621da62432fbaea9ef690a5e1930e8ca3214333fd05cc397419eeb8e7f46e7998fd12f2fa17fa780d7a0df0cebd50ab81a677a363855f4dd818"; + sha512 = "304085e04c30b73476ffc84da692d9e08c3edfebb31e7e9777afa7a1e12ee0d15c5d9bc4124edade6701833de02813c0549d8a731a58e824b00e483f4965f49c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-GB/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-GB/firefox-55.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "bfcde5aefcfbbf6021f6c3085f27a5c9b88cb11b33a132d0a05c6b6f39a32aae8e140b3e73d2e09d6719d00fbb9c9998a27cd6897bb7e2e5c01f37190522320f"; + sha512 = "237cc95b7c83b2e76627fcd2f417d21868d62398dd5477bcb9355bc0c73f53e9e595e95bf9de0597c15f7eec836aa9e3f9b1fab29309599cd4ec1c7b69b938d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-US/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-US/firefox-55.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "59416ec212626d225db0f12037eb68c98f564252c5f62743ec884af259d705a9310d9758bfd37bfb33c792eebb37d07824a197aff1261aa0496896482f6539cb"; + sha512 = "1d86223b3f56266eb83307e92c4d39c0d765b94015b089bef8eec5730e0a8e4aeb7cd06e4cbd43b445ac4d24cccabebfae02f003b791d1be03dbec3c9a46c9ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-ZA/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-ZA/firefox-55.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "a03e96de441a3f390c96b1bf2484dde6d423fe1f0b9d7e518d8d6d99a6e61d6e44dca2cdd212a74f935c8e94aee00c3bd48b7fba9624ff17cfbcceea70802637"; + sha512 = "8411248503638d44933c38bc105874befc160e90f2323764c7bc02667c634456c7c79cc8a7931e10ccdbaf4e20e3b2d5098b9b87ec63f75ffa56b6c62aa5b746"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eo/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/eo/firefox-55.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e54744f4d412f2db9f78f518479cd457953f9a29c6ce0fd32aead8c04951337b72c6fb149c0d90ec3dd1e93bb6dbfff57d46c29dd526e1b9c406a3018677a65e"; + sha512 = "fe376d69e5a8100e3ae70036d875019b04ff2c8d62d7caf32adf528fa90f78a0d16c986b7077c61c38be5331f3413777028a853681b090d42bb3e09475a5b5ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-AR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-AR/firefox-55.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d9d3cdd8c38605f0738ff95f5f2cd2188f1058709fc63f21d06c14f6e593150918b793c8f3c291c8d208afb398efbfc7ffc2509f5f47091abcb804fc7b47df5d"; + sha512 = "7ee72d922075b528dbef56bcf784690bb54582094a113c9ff0dec0f8ef64ec214f2ee16e930f8ba7963c4bffb4a8d5fd23e5cd76ad8557d70b1632a6124ca6f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-CL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-CL/firefox-55.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ceaa8bc10238996fdbc0552e4eda3edbfbb5e89b70166393e638cf4267d8077df0179213e1e692cb5798e6fb77f590f151535d2e40b4c278cccee9df8a776057"; + sha512 = "d03c2d4fb96b2d64c263fea62ac3cd643648baeadc4091238fff87cbc2fc37cad3069e1e4fe949a4ff7162fedc85dfaeafe49326aa5de780c96a0160e91ee9f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-ES/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-ES/firefox-55.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a75745381f0ff97fb298923a6c2c83a734ae1ab7b873e22e9d840cd5854ab8af01269214b844d0fbe1cb1ae4cd083c2c4e02779088280e82310535d9359a83de"; + sha512 = "6893e72c09cea00bf2b7e05f0e170e97967868675d8d9752c18bae61a5f147b60db5ef165138a3355b0221515838d526b14f09cc1f99ee893b7c9cfc618ddfe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-MX/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-MX/firefox-55.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "381ae266297cfc6fd0d05785b2a6c945da20d368754521cf358ae4c4e7dda3a473086bf9a2679716f2b15b01413574ed413fd7f610a795a3536baadaabc926d4"; + sha512 = "ba8469977b4f61df8165b09d333fa6ffb718d7e3710f62a459bd0da3a80a63b947ef1cac26704b5c4e9f4eb2380b2047e500fae372a82808cc7e5fa4ab9b0e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/et/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/et/firefox-55.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7c0151ada40b55e96ea2c36a98ef6de954287e2ee808e0387080816fec1329313e0e8ae5b613300c806c17f6b31752443e7f1f4ca6782b96826af23d3173abe7"; + sha512 = "07f6ac8fab7a73fde5c607b31be1630fc2c01778808259f0f1472ad3bde56dfcdbaa584de0f9fe1fba6a540fbea6709d124daf64bdd89f755ae98884c971cfc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/eu/firefox-55.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a080119cbd5c60499c7e9fcd55275f37d771ac4a352ef48088352b59bf86858b3cf70a5f6ef5b1b0e9e90ad9058e548393e9739cbfadbce1eaa95b39240c0a76"; + sha512 = "4f26a97eef55cb6cb4b236fb69dab897b9263ace1de3ac9fca099118b7f96db41e5b8f1dc371e636715ab2aa078d2e5e76c88fb907234d7a206e8a96f8dc9a21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fa/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fa/firefox-55.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "aa537898df126eb699dd91146e579afceaa9283c15d7b4d436f2078363a7b9b7dd63e0278d197d8efe004ea81fb0401653395f8d7550da884d0af80c32baa981"; + sha512 = "86a1accb6903fc0f2cf49cc86920e5e4b4a20a610c6a212864ae83e2bece1d818be515fcf9823bcb1c31ae748776514ce54fe6a1a57c728d1745d67c45856a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ff/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ff/firefox-55.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2998dcbead43b03d7e1b2cb9e6318aef185425de3401f89c875736fb124af2d126d482bdabb81535e5b5a46d68213574515d55410a6c6d9a60fe71afff64efe3"; + sha512 = "b33df9a1488989cefb5bc849d44c5194c25874c679e48634673ccf8cd32cee3274b6417de6b58bdc45a68c58adbeb3e0fe36dffd9b0526b9c79a902cb7b5077c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fi/firefox-55.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9ab8eeceb5f22e138550ef149cbd8c46e0c09bbf32e07ebc0b5abd3e5a460bf5f58608fa8e92401f68e915de7e83bfc592b5e3680f779a5b514fe4c71be56cfb"; + sha512 = "c03b784f3d13078fdc760f07f5bdc2352e5e3ea2d8d49931f6ca6a9ce91b787d85624cb1f2d6bcb624cab6a3c018669c1f47443e2a32fc0472d2139623275885"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fr/firefox-55.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bddc6e30f0d210009aa5d2d76ea15d9dd429c1b027f1d6104a51a69f364c8d9e985c33816daacaf2712c34c6743ea14197ea28934eb37340ccda21e2c3bfcf4f"; + sha512 = "d9f0baca6f54ec4bd60c33ec87bc7bb307054c5214182ba7c14ddbfba6748e77f87914b6373d288f8514361dc2627ca75cba9bb97038f183787dca07ecc629a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fy-NL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fy-NL/firefox-55.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9fbc84c8aa485f55319138518eba1bd020870193432cafd0ed01e08663298ec29b21a571b808fcb90d73ed052554defb11796d1fb1dec016472ebb79afd78e17"; + sha512 = "8452dfef5134afe2184cb8d2589d95fc75bb9bd487a2451fbbcb873f72b3612f7eb552772e4b9957060d506274d2655505838628d468efcc1b534697734466d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ga-IE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ga-IE/firefox-55.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4188f5c0eb666cccccb3e343cd3e4921bb168107e63727d67aa040b002f544724fba25a17d787cf8e1377f5947ba8fc124512e651ef3acf8157c072f5f02a4fa"; + sha512 = "ca465448eb5ca014579e73c5e9aa09129f7ac3725f90e6ba8bc96f67ee74e5bf916050d968ed91d52b60cd8f291f5553bd66ab4373af6537c43fce4e8a526c5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gd/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gd/firefox-55.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "2e3407d0d1c22f4b451b1c56a871f94deee43d0d4aed22ad90dd0643dd75b7d512c58a6245b51dde6a19330ee154304e6b577b82f01869d222bf89fb8cd6b9b2"; + sha512 = "c79b3c9c3970cc3eb8d0de8004479e1d6832d8b1c40640112e508ddc3db36a318f620c519a11914d5a103e01d8227016e4a57c41474aae346af15cdd5d5754e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gl/firefox-55.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "5fc10425d2f8bb1d53d2e5f9b9d65f0ffb01609c018a06b850195f01f8feb200e15ac36fb2e03031bc776453220fd2af200ce26a21c9a30eb4b4f54caaa6de34"; + sha512 = "ed98aef69f2aa9de72508e6860935b4465777cf26252c4a4233a4809e1e5f91e44d737bfa13d2705bae2e0c250cd9b4a92711cb022d84c109dbcf61a47286a85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gn/firefox-55.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "92f46e7931cbc8a7d4786800838fa9f4af9baae2d8a4aecef82034a9875b8f16fc813781146dabd7c31ea1e0a3505bf3b2040ed305bee17a3dac9a00eb3560ff"; + sha512 = "0c6eb876fa8ab4c0896d96cf87e52eb43f0ded62c93770ad3f59ed7c2e81bb7a231d4d698e83aead3f557e7c3443cb105860b2f98998804ae14e49c3ab3bafc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gu-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gu-IN/firefox-55.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e1e41c981d4f690c0b239917e06b1405a796e43d5ea419287cd353ee2bb0f8bbe04f0f7c94ea4b3a600e362577dfeefb12f286c311becbaef1ff840b20fd766b"; + sha512 = "3a57b1adba2f9fe33f91ac645665ab8301b1adc5a22f2f1a04d1a3c3947c25499b9d14a3e00b8f147ecc2664a3ef5ee1c4f5b397283c5fad454dcde94c261932"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/he/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/he/firefox-55.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "11545bc832cec83171a00c7500a220fb64815e514cce017fb6e60e549e43472aff8914e19818401aca20730fd8d063a05051fd53ecaffc790b982ac9bd63463e"; + sha512 = "46002542fa8baec217d26a1b246e2e2403cbe3af1a471da0fcb936c67e63bdf547577bb9655d1df414bfba8a16d2abd29954697dc967328f77678d08196ead3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hi-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hi-IN/firefox-55.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "63507d0994eb52893daedfa3fadcdc9ae1ca27608149d51132fda86616a45aaf4d114936fb6305ce12d75a9aa5ee5779db6def3866a8037c18e055734b0ddda6"; + sha512 = "c905d2044a685dda24288c3729261f58e1d896c71a8d437471dca5457676e9a77d2a112252f2482ffd744c08f6c8090541c53f8c27f85a609557603ddd114025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hr/firefox-55.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "8274ba4fd8bb881bbb788cd402a3fa49cdbec8d777e003c63dd425ba8693fd8e26a88533dc7c839f0bfbc47d16a72105e4099e67c0473e6b8c6aa29ce75a6b83"; + sha512 = "f4a0084786f61e6586f0cf4f534c4402b66c82654d95db92fadadeb743766a976a4c349097633a536aad8f5dafb25127c4366ed002cdcf93f0a963ed431d827b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hsb/firefox-55.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "c956043fdde6ff492a687447c01ab15e874756d6c249c7751d4255f99ad60b21bb898c1472eaea73c91a1467e6a6b239ff60a36333da1fee21bb3dc5d2da1a37"; + sha512 = "d1366512fbb61a283f363a29ebf8e8570844ebe29bc0068a68837261181f44aca5e8fb5c3ade82d930b624e1ae7dc2cf30a0e6e0d830a60c529f6fa9d2bae1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hu/firefox-55.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "28efaf842c1afd6ccd7882dd257ee9234015e641091c39c1b954d458a543fd9e0d6ac472d23953948fca69f5a62583b5120093f7186d1cc36a345adb166b4d17"; + sha512 = "d76a3a892c22efa04e84ae9c66ee76494709b1185f8d1033fc3bffbe67e433607edd152277218501ca94d5cfc88f8e9de356176c7ac2204ceab18eddf51cac75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hy-AM/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hy-AM/firefox-55.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "2aba8bced1431caee4d9d70d515027e3d08a7175b1d28b9f743e63d25983a52a8934e7e3155a5b220d0cbfdd61c76438bde56ed2c29ff2eaa46afcef6db75117"; + sha512 = "f771b69e18434a8f9a5fe5e381702e078e37c87c4bc1cc4e0fa30be0c46f3eaf36462e6d4dfc1e12d5896ac6a5597f5987477fb8aaa5a5a5f0648c92d159cbe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/id/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/id/firefox-55.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e2925f40f632aa14ba25bc40246a9c06b833062bf30d5e9666c87c22db436229f2b36730f6330a77fad58ec05a1589efd8353c2000cae45c7b322b32d1823559"; + sha512 = "6fb40ff190d292d18da43a769aa679da1ed6510f185023ba08e749af46b4b0fecb3d305d9dface2ea1c2096bd8176add235daebcfde6bfae767407d57e040ba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/is/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/is/firefox-55.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0e56ab6054de54804a1f094f81c9180c58116e6786de47306f000e69f656e039aacd447d74f2119836c0f4d4d65e6841f94e527f8524ab7529461ab35b0e55c5"; + sha512 = "47f51627d21b803477b237b8f3599cb02efe107687fc25ca14c82a7d1413a0b49f3f47cadd42a937e10142ec0db6e538f2fd17ec1fabbb868e0db45011ce1365"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/it/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/it/firefox-55.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "449bdbc26af56503bc1a480baa7a98d4de9f745e85c443d2d0726bed16a676f4ba8bcf738c94aab42d4e79c96f1dc9de7b1117d72a953bafa9bb24f87fcef25c"; + sha512 = "5707b17aac678c28ebfef28b062799f4683c2f2192de7b305b8699ed788de54aead0012c1a41c999a2270a30e368dbf25d53bc887f5249279220ffcff143dab4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ja/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ja/firefox-55.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "47b417a6683be3329218c0b0894086acf588eb15a979e65f7102540d51e59b744878d2b5802036f5bc4534f8b253e26b6a947fa49a18e6f659122f2f193e18e4"; + sha512 = "9290d777a33e434c587c19b5193a32c2130662c0c74917dc1c298b0f906aa3ccfd8631dfc3c396ec771efbddb254fe603ea9adf42524e72c9b607a7eaa81485f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ka/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ka/firefox-55.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4796dacf4b8d180e0995b1b743d8d076d68c23031407f8d475107bc79c7773734e80c37d870c38f60de4115873fb872bbcf7e7862526aa5101c3b1a6d8e720f2"; + sha512 = "4ffddb53f2f9ed891aa75ff92dee070fbed1570585bdd8d1517af6cb604fef9ef98e4efa0ff5672a911e2934e91b8e74ef808826b6f4a7c08ffba45bc1e2df1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kab/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kab/firefox-55.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "674b955f5f474c2d76efae044d1ff95069315447d370cad182e09b0a2b5360efaa1eeeb33e59adfc7754619538ec6acac661f61c805e04b94c5092999f68edd9"; + sha512 = "6cf1f5f445a99a90bb509e9f962f63c3674d1f621c469b354044f2ecf30f756599d1c920b34e4665412694da7d6f85729608522b5f7e6c3c0b02ae23b0b12fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kk/firefox-55.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a647e65b76c203a42a8edd47c67b849877f2ea4cee467ee3203554cf02de5787b72cc245e4f83ba0bc8011b26bfc6991326c2593973b746cdb69762e35fcd5da"; + sha512 = "0b5810e34c15a1152524e4a437399e627edce29bf9edad54cb4731f23ff3fe06fa94fd750f35398ee2577dbb0abf94d9f965c90520e1cc24bfcb97aa5bc2696d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/km/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/km/firefox-55.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c644399b50b16ecc3b021fcd8325a18f7fe293155187d59ed99768756f9e493c51e54e5b77ab38485f4479b09af396355340ebb2e597cda9d9780532b7a5ebd4"; + sha512 = "86ffecf5a046d4084bb991e527e3fa009dc4a228f4f9595fa594967652fa926ac3c126b9848002b856b9c7a0295d757311b4475a88f42f6e9087df6dd29886cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kn/firefox-55.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7991b8118e773c1adc0473ed2b08ae50fcac57c9ca3b5bee67779f64c8034bca64500db90efa052547a05866d5f5f6f5156db18d3ee84a54cf8562187bb3fbc0"; + sha512 = "ada203b9d3edcb87fa87f421509738dd023c0be9444ecdb411c66d6f3dce567a1720b1bf013fbaa259628b399f117e20d365ab6d2e5a2b02d1ac93d7b857a0e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ko/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ko/firefox-55.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "98bc9ef98c94c9e4c7746fcbb8f45c5e24bd01280c2573e2a0019ccbfcadb4689b93c183abd8afdecd97f490342295c278282beb0b2d3fb2bc14d988fc5048a1"; + sha512 = "ea8aef83aab3b5f8c6d1add9c7be91f883253c2042312daedccace4254e64cc352f45b1ff0b18c1f20fcce852bf3a203e579660acd9c15f90a27b6002670c626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lij/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lij/firefox-55.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "f7e82f1ea02935eabf2b9f525f89d14bace88069bc5f3572202c2795cfda4bff25d2edc89c31ae0edce7d16ec127941a64f362f8899bbabadd5a7d871447bd47"; + sha512 = "43a44b2f0c0626399593b386c8ecd278248bf63ce2646dcb1a2bd28c3da32d99bb7fecfddf42097f7f89966bbbc78094f04b0ce2771f2319f83d19f1e0aa6e44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lt/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lt/firefox-55.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "8b19b7e8134772186a14f0880f96f4af407dd6c081f9995d032c66cf1c9776529b5d5a08cd3a0f2a42f63cedb5b2ef94da0414fd194c19d6976f3ac4e22d0470"; + sha512 = "959869c39df29073c5a10ea314884d474b77c0c40832651083932785db629b0dc7dec8554da33306bd8db588c1a54cd042443970fa7c8aef26ef7f218ec49719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lv/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lv/firefox-55.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3e4f978cb253014cf3a46747c11606a2be484f5e4866ce26a979329a4c5f9256135d40e0596d1a9c23bd6fe51a27019d23599a8535c71a1e0ec3e9a26eee95e8"; + sha512 = "594a01d1b5dfc77082696b754065e4b6b5543ed5e4d356dd38255d323b8c1803447734ea631b5d5e5a9b4f8611167c3bd6527e076d546731f9a8b406c8afbc23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mai/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mai/firefox-55.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "9a1205743ad46b39e6e05860d6152004fe6c5995d2817416020574b706ce194ff44414c7e5ea5c3c2b39f62fcc6d17b2bd2f85b249aea9803b1a1722b9d91c2f"; + sha512 = "90d6997dc57a5986d62760d6d163c0a56460959964f0c2e9acda5570cb768e95be04b5b8648437df9845169262954d2b411656d3a054e2fec408f71453928c21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mk/firefox-55.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "96bae83111abc01ac9a20a1f55a990f3c856fdc5f4302215e861457e737e2ba5de40af76a2024fa6878c129a3864b0c689fbdf5e6c2c67c0a1e06fb594997f96"; + sha512 = "06c3a0a722059ef6db6cdd5cb38875c1916dfa2a8bf7c27b0eca2e9ae893348cd935f208dc1e09c7760dfe3dd63428e83b1f8b2a364394507188cdc4eb86763d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ml/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ml/firefox-55.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b55f6b4eae279811e461a84cbd32c78827090f8950af4327c0fa31056c04b7105757f6cbd70034c6c12887a0e60a326ae6635179c289ee0890446dd8404136a1"; + sha512 = "8d51b7daa4fc768752dc9a48ca9c38c62e0dd35925518ac4f4d80ff6178789205a7c2c8935b5336751106d8504900bfcd2af8aff2f977c7b35d1295071581c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mr/firefox-55.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3b3f98606d66e68a4d45f5029eae89d7a1e838c6f0bfdef5a551d11b9fc28c64455b28d742705bdce8748844cb869fab21c5b2164bd441a78998bdd1efe9d6fb"; + sha512 = "f9aec2aa02c336c8699b4420abe7e7a94e0d376529275e24a57e8158c99e472e3fb78d757782ab9510abe6e0272a66865e7e84ab599e3d5477c2af91f079bb0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ms/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ms/firefox-55.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "6619ffd4aa274511a7b10c6c3d869045f1b394b286001cad53f3f8f7fbf797a1d0d3e1c099e9cd95edf678c4e2f49251a5eecb94b6c0821d84ba075f04d1574b"; + sha512 = "3e6879f56f8e4b85c306c73a5c59ef463ed287793ff2bca0834b2640070eff9417d4c59bdad4963229d3c3e38fde67386531ac69abcd3164adfabc668d68003b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/my/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/my/firefox-55.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "ee500522c7fcbf4b8e9b86162c869c6238978b0b9e68b3588d79f1030f304c5d56a37db0775b9aa5edc40e1571d10245ee805bb8a90fff2dab436742676dd4f9"; + sha512 = "64c34b420d5e9e0cee53486947dd634ef015a2c043601e3ff040b08a840375755390ed6b2898e8024f9c6a87e367d7dadfe04f26bb6c500c391056100eb01fc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nb-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nb-NO/firefox-55.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "780dcdee5c19295e367d659820e59a9f60fc712c00214f9d8caa64647cf399411cb74460b88ac521a1c23738357770cad1def1c1bf840a3676db5819272ed8c9"; + sha512 = "17e1ea276a3000105018046f53752c0b4498d701844aa29ad7cfe5857ada0c3ecfe29f9bc11bf09801db35b0c58be030069229096e01eddbc702e6f8917b5167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nl/firefox-55.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "487685f711257e285bf1f8a508d4167e6bdfd081ea30f560a5700b9ca487e110463ae6d8d607cfdff9349d7c1f2dd3c8e57e8fb30b49200e17754a596d2716f3"; + sha512 = "70fe41e9c3f6bb8d5fc3be480a469bde02197036c763839021ff38c25050be3a4b0f15f71b16ddd4c0827fbc635be81751e1d679e6445f509b2b8cc30d70a5a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nn-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nn-NO/firefox-55.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5db13d9e1db3331943c19be06849dee993726e99e519e1c03f8e3db9e44f9a4d2d8ef7c82e77c814654e66991352c94979754ef4f8b18295fe9c4ef0bf965bbd"; + sha512 = "803390f1850a286531046e3d3d9499050680f8ec8d8f727f0755b69af833fef7aa1bc841566809d38dfdbff0433b20853e4cd64ff0648789279b1cf9181e64fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/or/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/or/firefox-55.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "98c90abd9abb1d34816fcd98ba96bb9f4fdec070d9a37b536bca1f7fbd75f95c7b0e58b7a02725e4f8b3a1b545e6da54cb7ff0b716319bb25e4ca64da616fe6b"; + sha512 = "79d474b2c0e3dd1b09f42895370ac7cccaa7ce71f1d1154665865114dc6db2a165e099de03f064ad6603e7fba967f85865070184ae7d478940d250c0579a8b14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pa-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pa-IN/firefox-55.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "01e67b60bf6d2b7a8ab6dbba92678af6102173443ee938ca3f236403169b90d00aa3696af2ae445d0a21f25695e768968bd4f7769c9b63dd5c2ec06b7320459c"; + sha512 = "958cf459da7c99979c2684bce55f47ba5bfcc3ba908bf11f3c981bec565406aedeeef2ab691e28bd35b7763695fe1cccb9ed76de9442612c99e01960925758a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pl/firefox-55.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "af44cadc8a4032c5ec6e6cb2d502e59f11d43a474806c4f7b98259023ceac8d196633f4a6f6c6f247a042eabcf204ac4310b885d0d47a42e58cf91d81626f3b4"; + sha512 = "a3c0c0b388ab02a2014a7a1ba18d373557e1828f449fd5ed713c8ea2ed110e3450fca2efe093a0e9ba0893fc447e5189ae7afdc77ba3eb1b7c5eb416b4efc50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-BR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pt-BR/firefox-55.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "24d95447c5d4d117b1ccdd415157015b473e01489cc768403edb794eb409fbeba0e35ed74f2d6c5668d9853ada5ea04bb94fc2240d01252f7f51c3982896601f"; + sha512 = "5ea81d1719cfbb161ce4a27a72bef3d579850bc26f911729bfc46cf495d680898746361fd3e73d0096b962c498ed9cf7706d6fd940f04d1f6a2b81f0790001b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-PT/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pt-PT/firefox-55.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "7d6871788279c9ccb54a62a8eac5a6dcd69481a993a8c76dd3a31bf94e2cd5e8c4abeafee5bc6e0f0724419d7a38d6680720bb9ba8c68c8dbccd2dff46be6fcb"; + sha512 = "460393c862a11816d7b3bbbaeb3fef4c566c1fb4c479ddbafa4edadc1f085e00bf8e9b01e5d5342058fa384512701e48745015d3a56d98a8e954679e0258c703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/rm/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/rm/firefox-55.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "be2420b9cb9956a7c8145bbb5ec0fa841621cb0672141ddc0c8c0c3135c9372e7e5b82387a2a123c5f838393bf5e22e14edf127325e6767461e758a4aee6fb36"; + sha512 = "0dd87197bf700923f771fe96bbabddd209f5022ca6248599beaec3f32d86559b560342989d24612977c30f61797a02d453e0e36259496128314a87f8a8b3aab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ro/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ro/firefox-55.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "65dd955dec8460892869e3fcc555e153bc51af059fafaa1cd7a250441f166ad2c5aac2cfbb573f7320badde424c84007d121b88bbcff09ca2f474db84524de53"; + sha512 = "60f1d69e881aabb32b40566f907560eb17d5b700fede8ecc1b5c8d198041cefa774b953dceb69e30c0d5ee57ef32b27b9cb4f43d550452b43414a8d712943c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ru/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ru/firefox-55.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ebb48f14805236b8cd36de37e514b0738f7d49b93713d536b1f2deafc1abdb67ebfce74629c131304eb440032563f17260ee319be133f0fdeadbae5bd93cd2ea"; + sha512 = "fe4c0ada1acf61cf784ecd6975d3c49a897285f2f816d60c33b82f8c4f0cdcc221bfc5032381488202454ecfef5bda99de12eca7336ea1028c2c13f2c2d052bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/si/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/si/firefox-55.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5be8bfe9ef8f1096983d087c1e61ec197c2b1cf0388175724480898ab48ea0511127356a041045ddef7afc61d65e568b8c19bc5041a06b575f76338c88d1130c"; + sha512 = "ee52d9a71535bb8df0101a91b414e5a60b2f4d3db9e2ef65a1dc737d2f81d20bce6813968c5f8d25db40b14dd253149fd7511505ac43f2bdede7363df8e1f594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sk/firefox-55.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b70627c2fa4d5b4bb90b919cf1324b3463e28ebf918b000a64ffb0ac64c997a370042d8e7029dd2fa749206645a381126ec5d24a952226c876d788d0af6f9cb3"; + sha512 = "be8e5677c9e244ef4f8c660380f3e2c141b80534685079c8a76f6d74a12defe5517de04a2504dbf5c4027dfcf76e4c80414320f36dac8701c8baf16ca75740bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sl/firefox-55.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a0ba640ba12ad5b0477942e4eb91c9e9ee1f602d5e51999ced88be2f150311b15e72d70d0de2295916b82ea577d8e07cc33b7ff4a8425a886ea4dc3a6f6634bb"; + sha512 = "cc693f834b5017fac4c2655b3b362cf54a0920dd25194a5c1fbd8af8c68a9d130d0dd055eaa9fb4c4348b0bd479da517e6b3546190f83222f2ac2fcbf411f19f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/son/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/son/firefox-55.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e2dfc2ff732a3ded0465ae50879e4ac6c180040a24391b8e7e879051edd7b67c4022eaf03d5abbb21d0baccec795ca10b811fb14a5ffc823d860255871265873"; + sha512 = "39618b1e8d08c7ef70ee7873daccfbcc41d0ede0a3a39dd861bd3155e82f1104b72d4ee7193fc30b4f53aa9f6ca12209a68b68470bb319189c5dffd7a9db4d1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sq/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sq/firefox-55.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3e56f0d47c77c6cfc65f40088cad10bf513369a78b1d2a1ceff7e92e798f136f93333dcec4bf780598b3e8ce47a55cdd47696f20337d27ad2e2908bb6c047052"; + sha512 = "e518cbd7d40c96dd2ce6171bbfa76b946cf4d397790b4b9ae8f00691cdeaa95d3104bf174900b18115eb07c8ac5d6158ab5aa01533f9bf06d435ebccc1a034a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sr/firefox-55.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aae94358f83f888c3ff8fab2a55e4239d2f280813534d21f199f89b8fd95cd7a37b2862becfb7e1c14a9b180cf1844df59689fe818df8ae490786a5dd65921f8"; + sha512 = "9ac9d605aaf3982ce6ff4d76ce54b30bce251e9739061607377483663b1654805b818d08b29a636b8a9f8b83bed38d8f91d2d48f29e39b4caf03fc895b7ea605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sv-SE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sv-SE/firefox-55.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5c672bc0ea10b65eb93077e0f23e52fa081b49e12760e2d9167026d8d208710916b38b56dc24c5a78378e3f7646dffb77b3cef49923028889324ec7da39bd842"; + sha512 = "7bad9194fa09f4785317488b430b1cfc3add9b460d340756477631b8f2d05b9ade9326cacd735f804fd26f702152906cbab844d9b7abc7ee7f68a7e52e6d60a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ta/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ta/firefox-55.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "6649f6153c6b173d13dfa5f6bf7017102645b54d9c847bdc01d155ac005fa2ee5c997eeec13fe7897b55468912b70105c449e51947af270ceb44fa1ad02fb1f6"; + sha512 = "501093bddb36797bc4e6b97e5101dcb5f7c630aad13db5c8b4c3cf8db3d8182a4b9c68c43835c9366db72ea4dd6cef2b1d3c429c28d104a107e969bf852ea318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/te/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/te/firefox-55.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "5c0836df0350d5b282420d96ea2886c2343641c3ecb2daf91a81b67dcdda6145532f2efd480fbc7be412bb8332247a49ef48958157b33c33c444c55ce85c06a6"; + sha512 = "d3bb8e779529649794daa3efc52fca016195da4afba374500951d87dbe74f4ad2856e7549c959eef4e5711e7b1d1f66e04f6e7e622ba9a3c27b2f7e769f00496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/th/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/th/firefox-55.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6c0a888749580afef4946b4037d722d736d654f2748827af42794ae452c6ba4eed6b0889dd20435201e19f629d5104389f42a384b637d6241fc9c0b8f22935d3"; + sha512 = "7fd54688fd6fcfe3042d02b4204d82ebf11391784c36be3f479f41a32f1e7fde704773345f16a562044da5bac02302722ae248aaac5a4b2cb8add484939c8d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/tr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/tr/firefox-55.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1301f85151378f74a7de1a33c42373feebca433f1cd6d0aa5daae229271741561bef2bbb214a104195d93664f802fc8b233d5b60913f901583eee68827643537"; + sha512 = "1d4fcec068163b55461d082f87c070a4a04db04e0b9d292a29e41baaeb3a44415f60338174a7589876bb98ff271bd0b4e1fe58a794053d534e27bffc522ad599"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/uk/firefox-55.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d178ac2bd9b3c7a29b14effb005d046f43e78867e560ae38be3f5f55c39447d100d18958aeb9c4894579fce4a46849d7dd8a5c4951ee1bbcc4ccf4fa269da744"; + sha512 = "2f048f195269c652e642250014ba6b3012ef0e212ea794a989ecbafedc6fee27976869b807c87411896da344fcc81b3803f226a70f881f2d66dd517c86f98511"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ur/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ur/firefox-55.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2de7c4b29a6f897fe2df48e070164b2963a8117c1628f233d6ab93b1dc32660d957ba557f78344ab1588acb5144460068d34e4c804475813e9a39f4fed6780dd"; + sha512 = "0700f646fb81bb96a7aafe0c8246fab8cc39200e34fda0b89535d026e6ea71d3216679f13867a8fd6f43c2efa23902e926f68ec15ec65aa1d5f67373ea3b7341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uz/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/uz/firefox-55.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a3b720e1c50bfded6d44dab4044fe283b1f718e600879663658d5d99fdc5ca36a996b79149434c71dfb951523525b59757b84dcb383ee7673c3e6e2d719048ac"; + sha512 = "17c0be62adaa2f3a930e727910f0ffd9dae03eb53ef6fb72ce3fcbf9b6facf49e12164632acd8446c24560f2d8a233ee946ffdbcb270c815b9beee146e93875b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/vi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/vi/firefox-55.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6e53d4418ce4d325e705e32ca215e12c97daecb81ae5a2bd0531ae4043878a9c2fab006652f08e0eaf8ddb2893fdf4aef8b0157f04e6b9be4b63e5e191028f24"; + sha512 = "8b120d1ec2fdbcd7b0276975842604c41f840e59739166f32c35a8ec93805b6220e3570fa6c5cbea66dc988e354d4fb5f900b5a359a784279f1ee78a32a7ae15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/xh/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/xh/firefox-55.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "fec4dd19fd5e109d1fcbb62538d1a0b9ad7867b111effba8fa4ca09921cc0d3d224e33016a60056e2d556c2cac4127587fcd379f8b023749355eb47ca92dc337"; + sha512 = "9b981b60acc1d5fb66208279a3dc5ed113c3b1cf8c2169d5ad7ea258654b311f2338afdf9fae38c88b1c575cbe0f00b2359f928beb90288ad5b456e9f956c19b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-CN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/zh-CN/firefox-55.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "78c162de2ecd7e698ae59f7d814f333885fdb4d5bbce2890f493008c709a3057524f098a36f437ffce0ffd7856ce5ca527bd2c03265abbf76c106ac8446d4442"; + sha512 = "5148d542265e62ba50129526bed91f15ae06018e097fe0afcea228d183b38521a6025e83ac7325f8db991c3517ec38b4590b6065028abcce011cb1ff3f89e8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-TW/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/zh-TW/firefox-55.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2e6e0084a37129adbafd524f0a8353ff0e26c4a59726be90a7c8bbedcba84d20a72d3c66c21335e302d929c5ed5aae9b67134a840a31c887c45363f957172f1e"; + sha512 = "466f5e6edf90c6e2864d234cad8271cc9e278dce0748054b109fad9f0c2f5df75ae6b50098a4130a55355dc7cf65556a3cd1a1b3d62e6fc5551317b86b464263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ach/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ach/firefox-55.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "2710b4a940c3df0eb4f4a5a00e857b030ea4126bfd1d1154f169865e31597ef0f17c8e328d87bc68afbdc19a0dfd980464c1254df15dc69eed952da2c57f947d"; + sha512 = "c0fecaed3198f68ff1504be584fc74d6c4efa3ed785eeb330c65ff2f8a4c3979efb01ddf9e6dca047db6efbcdcdb51720bc2612ea0954b340e20c5d9f90cde04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/af/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/af/firefox-55.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "aae3f0465180bb14983d6fcbcf29d2f361e4c9703f37806889c35e60d7645dfd344aaf33a2fbac276ced63d906eb29452303ded125d86878d6c3492077d8868f"; + sha512 = "b9a1ba9d7b48997fa4ed799276da18cfadcaa29a206c135c7c7d74bf677f5f40621feb50fe258bd341fa57840dcd3d5144ddc5385f408a6200e8f5ddbc5c02eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/an/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/an/firefox-55.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7f02c46293d5c6baeb75b80f3d5fdeeba5112ea350c5b04dc5750f5410be39fe4d0b9f03d21e8855922b97e1a6684b90f6eccd06d198c9f9b259b42fc51d9e46"; + sha512 = "205d0f8893cd5d90eb0b5bd34341bfd7857c88089685d7560a57e6a46e65e03bbd447e8b3b9471f1bb2f0a69c2abbb9ee96d0aacd5d544053dd7f33842402e7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ar/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ar/firefox-55.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7c4fc8f0276029deab6756a6442cc29d75e8a31a0d62d045023c68c4f80878b920a34faee8a3e40f823de67015aca6f32567b6cf57f9a593aa1ce6ed5fbabae4"; + sha512 = "3db4dae2cd2a4fc51792f8bb398b47c91e13fc5dfeeb8ad14c7bc101b55d14f1d75e719d5ce03e96d29245805471ce0ad2f38663b3dc837d83a16a365bc1de05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/as/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/as/firefox-55.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "e6825cbb7d228a1b8354b6030724f9e3407b7e5a33f1fe59e7b19fc71f0c28bab2db649314edff5bfab3c37b154ba9847b77fbe8e0038a7a3565c3136115862e"; + sha512 = "5b06bd9944c38dfc8c5c92930e2d3c2470d8cadcb11cb97d1ac98426624e4082fb0f61ce27a70572967525166b1343d84ae4cf9c46c4aba9c9afb4e4513c74fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ast/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ast/firefox-55.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "8a1e64a1afe3b22349b1cad0d51ec299e02c5a9ed330792d4820bd0be4ab33cff6f05d03ce4441e2b2b757f45d23e6760d2bc370fb13d8dd1417cf562e82f331"; + sha512 = "5653c855893160419dedf857b6568f9c1bd122da27593f749e81389aef248eb4f1d57b85de70c2a122ba2d941a8da3cb320975ffbb9b56d7647e5bfc18ea7c0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/az/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/az/firefox-55.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "cf72d9045c2dd9e9c6da619ccf9fe537ae4823b3623e9873bb8ea12ba1881fdff3b05264908fa5738e0c2ee0d119ebb5799b32c90ae37186284a60cacd75b7b5"; + sha512 = "dd6b4c7ff6362710dd631f40a33b5c97f3e3cdd245443ae9a8ba03e31335ff73c9ab695addea10b83733bbc6b65dc68ffa54315c50602661ab447a25cf58912d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bg/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/be/firefox-55.0.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha512 = "3688df68952a358e7005ccd64c2b0912d9b113dc146ecce19739043ccfd37f92fc2b470d47c2723a24c8b53d113f705afe56d1fdc3c1b7304c3ed4546b9d347f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bg/firefox-55.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "686ca0b866d1e9504f21adec227396ebb6c6957b6d4aa9a3a74249d4ac8c23f1556bd1282f54abd82ffedf89e2852794014c5bf7bc46bd1d0df4dd5352e34725"; + sha512 = "b3ef5094491445ba3544a8a4880f8474cd9d7092cd67184acbebf4e3768b6a0bd43e03938120f3d67ac519e86f3c538c26458963c1c32ed3bd89e9f8019cb5e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-BD/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bn-BD/firefox-55.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f0e7bc6ae6297cf9e83cbdb8366def1885b96ff64a855b312d31346e9fc476f4f80877f9251520c77845fe1f695f39a757dbab2411a42e694de27f1772cba085"; + sha512 = "3584ed2d1eb05f217cd475edaaf1869ae3e564af8738cfeca7d0484dee12abb4040c56d4e7c20cf15c983cb2245fd84e9ba1561b27f4dee57a50549fa07c20ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bn-IN/firefox-55.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "6caf0d5f71c1135272072439c0e2c84bdcd967cb23c51d980c47d3c6a3748e90e041e89eeaa88a42063dfa0d3369597c8eface6593d91ba1d604882e16b4cd5b"; + sha512 = "0632856baad0891c3d22454146e64e884828d7aaabb58c1f1fb3c45314eec95765df9bf6bcf68e1edbc5873c93d0d99135f71f7ffe979ff656c2748df1305edd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/br/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/br/firefox-55.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "10cc66d62e68346b896c0fa081f8d8c1ebbfbfa364a52bbef5c7f368aa854afb7e968cfc344378707b93b2cf478fd74d4ee97f9b7bd160199533f26df222ea66"; + sha512 = "dae7d1bdd93492303adf1ebe37b92fb3400437911ee0c8bda33840c5cd1fd0307d631a65300dcade93c116fcd3c85d04c518d2aa2ca792eaf20a7d10d99ce3d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bs/firefox-55.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "6c87de221bbda9639d5751f8e8ea2f4aa5be191dce18f0b4f038f8a2fec989eb4cd3ae3b2ff36ca13c168a8ce92b6ac6a60b46ec6cb022ce6a95e921856973b6"; + sha512 = "d9fbb02a07176a8063c8317f795859e2bce1ec56f63742cbbe88fce9b07f03ad3b536ba459a1d655b50f3a867e84f8f56dc041a9f57ee93eebd14f174b938d6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ca/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ca/firefox-55.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "67ca5ea84b6243bc8869b96fb9dcecbc0a8e7018e256101874791444d57b5fd61a69d7ed064df41faf9ef3cc9059777412fa86ed445e9e40a3570d030f776d68"; + sha512 = "cd93cc44280eb61b2958e745ce27b94fe583535ccb7dc7788f0f74c625a0189db6515328f479224dd3899beaf9a878969ea945da053f2819510b1a9584ced229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cak/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cak/firefox-55.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b343dea962cd69bcec30b5a274a118e6ed2740120cd09d8155d0ad32e55730d9bc223a213df447ae50ec6bab67f5be2b910feebb73b4b57b30ecef49a3b0803c"; + sha512 = "14c43245c2f91db0d7ccaf010572fad29f29687156ae21abaf98bcdac578d49673342fb4ba7143aa5d6268c03d37169d7fcf95dfaf48cb494ea721657f66d0b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cs/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cs/firefox-55.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e4f55216ef51ba1232e15b1b842c3964a49aa31a9bff2cf292bb7cb913891057ab4cb3e351ceb57d3024f2854defd693a75aeb23431a7b7e8fb82c41f500507d"; + sha512 = "40c11bc35d1d781cc8c76f7bf42997a0781627c0385fc67b0562edcac04d8bf6f2a4217702ef4ea681f4e39147afbc814a89e23df46b561b1a4f5149404fc955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cy/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cy/firefox-55.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4d4340737549368855b21f11a27073c60112cfb7aa0b5e1329b27402ffcdd222eb009bb13e81a8403a72ed67b57d2ba2ff349fe0255d1cf11f32f4f32a73986d"; + sha512 = "9a946b301e70e7afccbb599e4d4c4d43645cfee27d3e3afbf5862ebb36436c66e0a59a5136ab9729e9d2e01f752feaa2ea341726b41fa03e91d7e909b0dd0b95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/da/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/da/firefox-55.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4ab3cd2e39cd13608331c13bf788ebb5a75600cdc3e5bcced2adeaee3d1c70fde0b57e93be9d8ecc72bedcf14560129246baa8b6fe5549de5614dcd14bbd76a7"; + sha512 = "cf42e36971c0d743daca66b5355ccfeff994094bda6ad3526af76c89818f8335af49d0dfb520d2b58d40da64587f85588cd4c61eafdd12a0763ce1034bf44fb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/de/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/de/firefox-55.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5b4ec879e8bab2bb4233da0745a4e905736d98816377458333d0d5a9b8a72e6cec8f450e8a4ed49f69d75b3a5b1c223bfe96844cadad2919044c637d78a13f04"; + sha512 = "7cec9410debcbf95489e3d9a8129a53507de27fce635cff7a60b7f977f6407f7396d03ee5570528eb4524901a1703b2ce7798a637711c9166d3789e95e4b6d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/dsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/dsb/firefox-55.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0ff0443ec9dcd3cb11978bf8689d41ef69db93d8b50b6dd53f4d31fcbdab2e459aa93427bce476ec989e907d743fd392add82426c002aa604fbe251ae438e912"; + sha512 = "387ccb1bea5c49115a89c6b64399647e9df08c3b4c2997c9aee761ca73bdacb6a3a05a594453f44aae119512cd5dc62a1adda94ee1974a8809fd9ac6907a5562"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/el/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/el/firefox-55.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "5cc24ec6bd4823e5360b56ce78a97319e15c8f2a47f7138033dbc52e7df001d09577de3d9e8cac6314cb7809da0e7674faf8845e4610d6ea08e47cbc9fde7f03"; + sha512 = "b894fcd577e94288d785eaf058707a456841b2a50786de9a8e9324008e76e29bcd83960f4e292d046f304d90b1d95c941e126d701417b58708a68a85c0f25496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-GB/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-GB/firefox-55.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0b8a1576ce8b112ae35ef388191d2308aa2c7222f575bf354d3d6654c05f073429af8ec9b1a1a77a268b9191d2fb8b758a38609c6432dbe827b739b3ba25ec61"; + sha512 = "74b06f6c1d61ea89994df6ed8716b72e9b8cb256bc4420e6011600aee9f161287250baa9f39ad7f8b806fdecfc60c4d7e5bd31e6b02a2f2fbd20fda09c2da2ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-US/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-US/firefox-55.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9b28b30e136b9bd89b4b374a9a6c8e6efef936354b7eaaecfaee2efca6381abec646627c57856f64b96ba5a8f771a411c4164f3a54b783a8e3e197c0a78d1622"; + sha512 = "d40f8913e3a280f846c8507ef55d934b5e183ad16e01c27d05767ab660235673a4615a8a10f52d5562912f4e88d4c0d4be3ee6a3ab13508a0bf9a8768a06743a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-ZA/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-ZA/firefox-55.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "360a4048ea81b10b5b834f3c2ef21776cfbaf372f3a329ec9da016728e1b83f956476ec98295e70ae3a9fe63a5f4f87b6be8d47627d6f36eff9b2909073fa70a"; + sha512 = "eeab81e4954ac3ad4ecb1d973d592f137c59fbb62190e6128c6728c78a3ffbcd0ab053a31529bf6a4b2c59787c25e3c62b41e6de682cad7530a40bfe34f83f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eo/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/eo/firefox-55.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "23e95684f5bbf6b209a3077e173c3212b77e89dd64f22fd378ddbb8eaa43682c50f4021e743e25189b2d1cc6754bce6d0c8604d3884ec1b32cd7c51c0dee5f0c"; + sha512 = "471b7b8ade86cc0584d3354e074acbdcdfb1afd048e6b6532e10c664668fd3d42d3c57412befa7905d9eec60b4aa2e484982e72e3f2d1c10c4a2f8025083c8db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-AR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-AR/firefox-55.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "88b7085fa2b4b1013a7242ca293197d0d26916f2ffbe1f1a4e8a1d2000e45705301ee83b0de8daa271111f586c3e5fad54c8e241da17f3f8cb9912b50e61538d"; + sha512 = "7f8ba4fdfa1114c52dafc0b20aae6decdaf79d273494f9a758172d0a66f38b77a1eac6470afbf5f1bdca0844ac43be6b59d70ad24992146959c358e6732b4400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-CL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-CL/firefox-55.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "990214ab2abaee7b607ac0a46fadc7c8be0fa12ecc5c0819f58324175381309742e0972ba54c144ad1dbbe0ceca076621aee0480e9e954f593c841d58f1a174f"; + sha512 = "85705a9875897c45fcf0ec1edc87cd3b7f68d4bdc271a9a998609d71ea49e58ab5440913ba33e09153d7095d4303572be84c01f1d7ea1d08251c5194b983de34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-ES/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-ES/firefox-55.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "7dce1007e0c52e048d441405a1a6c02863da24b8b8c4b7f3afd61f2c866ee6b19f29c82dd6efe34badf52df9a66c76fd56e788d047c3eac0503e3a74e41240a5"; + sha512 = "5d900419effda0612c0f45a0c8023938f2d8b60cd240d71f5b334b2f903e3c4fad8c7ee548431bb85f3868af844b7214ef67ccd9b7a3775f8bbbe0cddcd53ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-MX/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-MX/firefox-55.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "80b3ebb80a3682b6588175fee7243bbed87312463ea4bfa02d52be21b1e889208e8aedded74e9a94968969a2ede82fe63c83f742ed7c5754984f38b3f83a379f"; + sha512 = "054cf514419b9b30fee31554ea08aa58d8d36b6b1b51c1bb91cb2436dd26db349b31a1ee807906b113536d94a73c352430f3044b32a0e582c0ff328ac10d518f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/et/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/et/firefox-55.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0d31b34100214a588fc2ce5a217fde7a41f484344662e3402b69daca937e73213ae7ecfcd081437f3f4afd4bb8ad2f3810ee9e6cc160c24d81b81e20013176dd"; + sha512 = "af38aefbf277b85fff536a35a4138354ce12ac8b3536f7c0cf5a1a3d5ecf79f138adbcdda1f68cfefcf137c1aa1581fe34749d1d005ffcf369db8561bf2ae536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/eu/firefox-55.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b8ee5dc7124e8115af11d58770562d51bf7356992e84c443e4974b096dbe2e47f4f57f90ad238a68d712d9fc7c27c399719a8c4f8a4726fafb9220e448ee69ad"; + sha512 = "04176bc464fa903a4a04c9e3ded80dd909d5820ef75bd2bd9ecdcb703cdb19675430d9561e2bc49338ca59eac1be1cdfda9d4acbc4ca5ff61893d32882161dba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fa/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fa/firefox-55.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "5bf7b9f0db610f5e1033f38e65bc86308b26c1dd6f51b0ba01064b9a0e0debc288aa5f34e7346aa68bb8eec6b81d104ee84d475968cb0a3946767f311dd85332"; + sha512 = "ef46e0a4b523b3ba883e07b79ebbb343caaec7675b5f6aa456b13b3e362c17069a563c18ce0692fb7854e2f6c72ca880130bf9ae0671177262027564803f971c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ff/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ff/firefox-55.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f7d57a36612a82f94aaa5a05ee6764863ecc7c769880aceffe572ddb738cc899cfdfc68aa15cffbbe687d0413d38cd87483e78711f075eaac063d7f5f0b2d29b"; + sha512 = "fbeb3f00058cece9df5181aac388f57a60dc9bfb2c5971af6d96e2fa876e7d55a43aed82e56eab302e470c67831c84785dce08ba926e1649c13e0641675bb325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fi/firefox-55.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9f58c3a937ea4d7eaca80c63c2ec822511335f27c254fd086ab2583a55e457dd1da98fc1e2bb8d299010e59c982b54441cf157afe3aefb9778877d25f43f545b"; + sha512 = "4af7d213d3fe7e30940adeaa5ac59d1c7b20bd243935684a83ce746576ea68347c41cb897fee50636852402f05aab757208db03a7c746025212dd028b43b7f4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fr/firefox-55.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8179c3840850a6c353834f052fd8d4529423311385fc39d0d73d6c97082573c5035cf7714a167bb3d9f0c77e64c9fbecac30bf53a03f6c01c338ac538a23e0f4"; + sha512 = "09c81a787cfde2292b88960a7b95a2e5c18e9f0c40a5972f18580c27fe3d2140c4295282e8b8ac2b3ec1b1dcafe1244b7392832805878d7231e1531ddf1c923c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fy-NL/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fy-NL/firefox-55.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "819d140b832ea5820804b0d888f96b82737926a08854c4e93d133636c633a52433e8246a0ce187cfbfa56ab4bf09a4b4c000efea697c0d50f22edb02ef756f87"; + sha512 = "e495c0b559da6d9173786af68760a4fb0b25f4e5d504a9a8e58b21e37903336e4eb15c4beed8a5a791f8c25da0d46ba95256cf5edd31fdcc2acb47ffa85a1b87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ga-IE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ga-IE/firefox-55.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c71d04d8ec3e7dc07eb909192c176b456daae54cc105199f675fd8e612c0f6527cda0635c0e1aa6221e2d5ef3f6c8168491b02571054ab0d4b7beab59ef692f4"; + sha512 = "29b28a8c717660ff3b0f07b330ee377927b17deaa887802615e447544b88279871e72a4c73441d9bb76eb6a60e85907ca94ac8375c0125eeaed2500e815f9a6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gd/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gd/firefox-55.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "98bc4b44b2075d615e682b7649a0a0cc696013b908aaef11a60bb299881e0ba243e70ec2e6e9205c965d31c68c6a8a66e9826fdb711676aa0cc3c8f4c44935d5"; + sha512 = "2e3d7902773255a69990d1f5176637aa45753eac4d6c903bd8dfdea505f2a07d714181bb4662bae4591b4155fb04a87e09d65eb19476ce2c4d0143b7f8f2641d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gl/firefox-55.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "034b22ffe1a16ee330a8c85c18975d541b27d5ae1e5e3cba3796307c641af14797b329162a6e3f4f642de711a9f0ffe5b2fd274a90a396190ba176c5c26790e5"; + sha512 = "5af911b6e1bacef308491b10b21592f06539f4360a84d126d0f78fb43196029ec352f8aeb9fa6180899f5d74334ae002602aa70e1b4112ed4cbe79b00bc4a929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gn/firefox-55.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "85ba634e0b991b582ad0795c368d5df28d5e2fe773525792ab071752ac773d0d81dd3991996d6e9db7745707cbea8ccf86784b6a8f117d97e08b5ac88902d5bd"; + sha512 = "721330e35f1632969c92cb732af6a1873c0516292f58e04db3d0c7a96d1cca2ffdcbbacdfb65ff3a958f8757fbf788dd7e667e3037f3b1505a1cb5c34114e02d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gu-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gu-IN/firefox-55.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "92561dd2d270c01d9e2a1568fa9fa0e75bed2d5ac2ea49d965fa2aed6f32bfa8639cd57d564d310198796621fc1696444f976e12a26fa96b55aa7b445f81afe1"; + sha512 = "c56f1f632cf4bc89c5f2ae69c375878d9f4aadb3ace0c228f36ab42311ea41eb2aaa4b858596e820729a7474a568c57f6a259a2745902243c5cd21b94ea59fa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/he/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/he/firefox-55.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d1f67f3e34bd67f993177ea9cc62ba432eebdd1169ded1b6ef58e9cb07a62a0ce38afecf001680b8ff6a401950ce9c13834345d7481301d59d024572fd2b8ed3"; + sha512 = "69336ba52a347549bf684bb5238ab14dda633d485de617262fc9377572b7c77cfd024cae9f299ff58425d95984939b95cd02f2a3a23ee07879ebc5455a7f7adc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hi-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hi-IN/firefox-55.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "8a10d69c6baebd21b2988a42979ec675e6ca29c96299407bd307a33c0bda11b6626cbb69bd6ab64a55f347be30d5fbbc64078b6e33209c26139efa050050541c"; + sha512 = "a141064e138094b02989aec9c3801dfbb6dd70869e3fd590325e6fa4b84968d73270a6559156e774ed27f42062b0fa5f78f0c0a373bfa2a02ae2525d3b516781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hr/firefox-55.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "667411553ac3e00e7040ff2b6f350a6586498a38409380d5c822bd1bdf2989e2e34b9b83ac2ffb00c7d3cbd57d2cae4450cd208ca1fb89480d91df1981d2802f"; + sha512 = "1547872d6d1535cd106b0627830c093d33622f42ff01a419695422af5c030a54996c8b9c95e89589c8ec75eed68485e3ae78bc7cfc0a3b09d303e3a1c0bbbe76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hsb/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hsb/firefox-55.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8becf0d2f7a0c208ac38d390be0114159d208931da07b996e1f05138fa06f07f027c1ea429153823c580217a5d3e855f50570a5c5c2e4f264164d59b0f5cc9bf"; + sha512 = "796500589c98757a7986158bd08f12ff76ccc09aa4d6132b78c011cb58ecd4d5d0798d780e6178a0597bf5c921e6168e606df56106c8ddbc49262991e10233b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hu/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hu/firefox-55.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "494144c9c2a3d06d4bc8126e106e74d72b3ec5992dbbd47a4b618a1a30905ef59e550bb4bf8a698c69d4dac09a1bb7c78b5580f77d00f103918d6d58ae74be73"; + sha512 = "7801da792cca62683a7d1ab812fb831ea80d90994b18a151623c05d2f30979d557cc1a6aa0a7ecd44f440c76e71cec9a4749fdd4c49442ea151c1720a7a5d988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hy-AM/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hy-AM/firefox-55.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4d8160d109ccd6fdd407673c855b445eb287aaaf09c55e11b277249b54129721c60596139860cd578b297415383ebc83a9f95feec3b5deb229e5f5834df5f94a"; + sha512 = "d47fccbc883ca137200c613aa96899e356cfb09190952805c20d36653d3477abee4db49471a1416ce13455ad5bb6836a7217ae51fce77dd0fb12f1187e11bae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/id/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/id/firefox-55.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "faf8df37c2b7ff621d9dc73fa225ffeb9263a6de05ce540fa4f7482b26df153c75cad46e395cd4c3994598dd42943eae7e552836d3afdb1fab56bd55e73f7207"; + sha512 = "41e111080bed45b7783cd50e7069811b17b35eb0268a92f901531dc1e0a7e7fe07b94ac325f5b5b436b71ceffc1d329837c74875a32e13d3205537b750fbee58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/is/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/is/firefox-55.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "a0a5fdfa889d61365c9da182ab7364f3eef51ce7bfe75273a9cc50b948cb5b979629972171dfa3812edeafba76ab71b3780f11265b2026cbb70fb8c2e1bbc7a8"; + sha512 = "9172c69ae72fa83a05f0926cbf87ed4694653395027b91f441ab976790c581b9383dbe62bfc74a425279ef68f8c6f6d2ef003b20aa241be6269c34bbab147150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/it/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/it/firefox-55.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "59530850ea817f7bcf0ebe8813aa9b653fca3127139e8b97ba7f9fcca16848c272681b59409c0dfd1b10a1e75ae6b1d0bb46bae628fb0c95daeb198189c8a173"; + sha512 = "daaade14d2dafbb76e021f87773a535783e533474138652fcb0b25bc41a1ad4f13d7cf65119730fed56c43116a3392f3adc435a7f8e8326ee8ea4d9e9cf19ef9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ja/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ja/firefox-55.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "67501fac457e820f2e731a77095f37817e8a44693d740cfb540d48dda8e1b10d93eb578b7d94c5efb0812688728745cbb508f497c02bc74b50fb514f8da4551b"; + sha512 = "6741bb18a17559482f8b95c1fc6acfce6b0e31e474e5d88905bdf3b939967c0ba625cea7e1f1b2f2ce6e77f3128f1f85069e946e7e6a16fbf4a637cac7e79565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ka/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ka/firefox-55.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "dd9dc48dd50cce43b48dd1a17aef95c89dbdda8e4b670044c422085ceaebca7410c24b157213acf4592c007ada45e6fdb154e690f6ba626b81ec3f8a099f205d"; + sha512 = "c1849ec6d69ffc87918515a7de95e0405a14b1cc268e68dfa11f8c832ced907e73a021b5c9b5f1839e99d692c13fd3f33197eb91de98f588f5750de03fe098f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kab/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kab/firefox-55.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "51dd94346d62fe810208e6bcfb930880ef14fafe2b859af80da4b494563db38b4226ad43b602ac86f426c6a731cb135ac674ef65bdb2039e0aaccde0956c616f"; + sha512 = "aaa9a9d415f39dc957ec59becf3b649c650cce619417dd5182835190aa8bf361bfd048ff647099320cbda296c9a992927de9c6a90e84dace4a1e5cbed0b9758a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kk/firefox-55.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "604b59670103ce78e3ef4db5a209d68981e1168415ca4512a1edf15fb4b2554b9f655985b2a0921cca44a4c51742155822b0b6514e91b1a5fec43be57b36bc44"; + sha512 = "e7f47f9270c909135dcaea2e4a47e1e16a6a0d3b886ef9f4ff0e3e750cd8b6b253eb7944c6f7155df6e91c838bc84544c2880f9c75eff12c97f68ef8da098575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/km/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/km/firefox-55.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "a81f6b44bbc9669af09b212d1960ca93e70ac085d20c37db52a474b81072a06165312207567ca4351bd110ee7e4125fbfd67981996c08b0a19c7c6669db16cb6"; + sha512 = "3e46f8ffba4f93450dcc2aadd010ce0b181e1461902a517c4d6030baaf6814debd2280202308980b3e02879d23144aa186af5c9af6e53e8d6b8d5e5b430bfc26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kn/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kn/firefox-55.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "7a54f78285290d3a9062d71a5b1de69a3a98ea95a1593b5a0a0c2b69098c55ec054c8575361bd5cfb67b7558b411b8b83861ecd5605906b15a06311f477bb0c6"; + sha512 = "8de3d801bfe8a1b87719715982cc9eba3b39158a8933b26379884d795bd2eecd43578197165a97f514c50286713bb83c06e200818c2e4ff2714baea72b8a3dc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ko/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ko/firefox-55.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "6a97670f62f70422f0d5d02091fa6ccda700705a248831d55c95034a1a63bced1bd0f282e938855a751eedf0f897be71f7257aa5ab3f8f7162ec756511f15830"; + sha512 = "5991b9223486acba78015b19d6d0e32dc28aa0e341b4b11928a9f28b1a6f4d366c38690d311ee15ceb607933887cbd8c93940ef0dbab8fb129c94868a5a5d27d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lij/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lij/firefox-55.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c4b4bd74169731d6909acc76c40ceaaddd853e03eefad27233c05dc869ab66a208f072dfe538f1f8e2323feba021f6b3aef73d81d02ff69d31feab688838424b"; + sha512 = "c5ce8dbb363667ef0b037c5022404b756a360272505d756593860598e8d08a04bebb45edd9a27ebc279547658f142ec1e65798c2e2d13ebbfdfee56cd30e20c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lt/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lt/firefox-55.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "319bb6442b6dfa25551dfcb5704241de8b248659cfdbcfa0124c6332ff828e793ddc007f3be57d51033e334c3bf504d0a1330b1cc539e8a5a0d2587bf14604cd"; + sha512 = "131d67e7bfcaba8ff55d7fbde587aaa1039cb73980e728b29a445acb4bc8f2f17f97802e03a400ef3d6933c2475fe35e7a3acb1b30f949ad71dc054b8d496c36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lv/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lv/firefox-55.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "cd255f0922a1cd2c13baddb350082b3ef7fa130e28cf5bb1811345bce3a9d4e65aeba188304c8fdc8336b5e35c280d2a298bea39567d5309fa37e35d191ac18c"; + sha512 = "7e9b614dbb86ef76fd752180c5b633345d37d24e731eeb10ded7694278903d42f5beaab8a17c5a6472401754b582687595f34233058bacca00dbf3d1f774a5d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mai/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mai/firefox-55.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "5f44ecbd0dc239f3ed77871d548a894996192398dd845882a7c6cdaeeeb18dfde369b2e8e6d0b56883b494f537f5e0b115665d1411c1de4295c5cacb07021c54"; + sha512 = "cdf641eadf20fa21c5384377183c7797d199c3232f55dc1377d52e330d1ca2d0b1478e3301fef696726a4094284a94d77257462d4a5447ec2ea6b99e2d009e67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mk/firefox-55.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "de8a9ea6a75a4d597442e0116c70de5342f7270b2f41e9a889c7f71a44f41753d1fd0d1c029cb86a5958f8a2642ad8bd8943c30f5f3534d38d0428c83697a351"; + sha512 = "ed8d29a7a6a0c255a24be9c6c670677b2cb081129b36490ff59eceae374e2da3911cc279975c55b5ecc8fe7988364b069145b16633ab6c4c945f35c91772c484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ml/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ml/firefox-55.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "86f7a299f66f4d5c074b59f5512571c78fe924792815a0dc2ecb9b2f5e1c0a10d798bbb16c03f912051ab014c102b8e428f98ca29eeff2c30ce72962b50109f5"; + sha512 = "a4a4758635913dc8a4b5d55df97fc9e1141a7120541a0a962aa4b2c566d0985a6500bd25319b0a5f81821c22ee3745e12603499d8f996276db9df07033741f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mr/firefox-55.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a3e79a8f6b03e63f91c69232467704e91c73e1a4b6085a0b979f15bfb67b63bac7637130783d47755b50179a15f894223b76f572941464963bfd61e073ed1886"; + sha512 = "59144a70caf75fcdb3b7b4898899e0e3f48449d2b0ae0a92ac5cb022ba8a72e076b53c59bc7dab61dbad17561930b0e1182e47081712bbee66f5beaaef84206e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ms/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ms/firefox-55.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "65ca4ef417722cf12b3c7dc7081b374caa3626ddaef5ff2a0b929fd5d1b6716c4e020ac8eab9cdd4dd161d990d0bb3633757c03995426e18e0d23b1e20e0e21b"; + sha512 = "833f8d447913836f26588aa0e5054658cc38b986b72385486cce8a2c9e7e7519615149e7a4da4eee64f83bacd24c924a4cbb5c7f5b8450b75070f28fc558dcb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/my/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/my/firefox-55.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "200008b97d3a811533d97e96cdbe8b7f1ce30ea5b7cebe3a77f58269d2ee871b8591907f2975377e655fb01bf267e69851ec3b3680de2796183b3ceccec8f471"; + sha512 = "d44980bbf4e9498eba7cc0170a558a0ed1a6e3fb9d4e55cbe4250d35e9a06c1a7e221f2f81e51733e28662ddb64a5de9833e78068390087d42ff8a7a10e3527a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nb-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nb-NO/firefox-55.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "03d502600bf3edd8890a6d3bb394acd4c2f310d762870784192e3515b9908f14c2db4b7e5762a323b73b4c68c13cdcee9bb952fc503421f41b59f9d2bdd3e617"; + sha512 = "757b17a9e585bfdedfa6d72860903e7b6430a434a747cfe590f3886f846e03f5f584b62b4e6caa73840260a82d7a9709f99b2a321bfe872f4a81859ae1d3f5e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nl/firefox-55.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4bbdc99d32f2d576db66e2aa5a12d568e17f3d544e5ef613286e2d3620d4f833ed4b7385a9091fbb72e8bbc423e8e383c9b4e616f562a83c2dbfc606056f97ac"; + sha512 = "7c4289a63586f2420609f525b28a01ce19943afd8b9417583a51afc50bf741439cfc8a2aa706c6d2230f45c6603a86a595a1525dc1abddef1496737bb321b01d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nn-NO/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nn-NO/firefox-55.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e0267e22ed0041d8a436bb38b9641481889b716632cdeb50bc1761bceda8d0dc6065937d15be56622cee5d4c73ba3e6f96c7fc00ceeef85ea9d852954ebf2d16"; + sha512 = "5508f9dd6102f45694c2a7145b9b58f35ba2f0d2703f9e8bbb84094b81f384a2c7cad6df4de245dd87b1dee379d7fc202a66b46be8cad50de94f37afc1e51e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/or/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/or/firefox-55.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "faef925bcd51fa0851e2583e590bfe6c194c8f64f8d13a3a3f13f2129571ba7d9a403c0caefd933e94e1d312b39d1d051c5e2a1e6bdcf4b7a1962080d3874dae"; + sha512 = "a5acda036bfaeb2c06c9b8f2e74475f67624416cb41069654b5dd104e353d2f84ee9a51a036a828355aaf6bdfa9f8f3f9495a287f2c237dd9b15e06d2a774272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pa-IN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pa-IN/firefox-55.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e95ba361380a8061fdcb4fd336fc5bd906666873f4ea84af6b5d21c05fa1691fa395bd0fe4529778d91e5d500aa162da09660854867ccf4734c737b0b4ccbd55"; + sha512 = "a3e807fe14653a8d55925f2c7ca8e963534b14fd5163b1eb168aa9de31f39da90b1a01c2510cd91117e3949b90bdded0666397d7383c4ea20a70fece438ab7ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pl/firefox-55.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "780079a117734ed5528b8efea3d0a7914cb8e8e1e81aaef33f877317bc18fafea8ce2433ffb69bccff01fa75e97e40048ed22805bcf781216116a76472f3260d"; + sha512 = "5f256d8ad06ad7dcb8898ad5b7abac13c01ad34f94a2c1a457199a61e94e5b89f76f271f17d90d9686eb49055ef14dc222773d33fd3f53617b2a2f51577bd9db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-BR/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pt-BR/firefox-55.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d0243251d0793d5e3202e45e596eecde6362af25d95b8640fc5d69d3983ac4899249da9a1d5099522fbae9fd5ccb08d024ecab018fac8f0858a4f1bf201e00f0"; + sha512 = "e36673066bc2d6c68b0c4eb1b6e493d5d5f7f14c29c3c117c76057168f35bc5b7d5966d9f310930e1f8172baa8ca2ed3f04afefa9a752648867c3a3dce48fff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-PT/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pt-PT/firefox-55.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "337c792cd35fcc6bde89fbba2da9a42846af371b741c79e1226adbdfa801914bc39323b0ba2e600ebe1b12191f746b524421c8ea6e5a03f1875cf4ba24369d9a"; + sha512 = "d57456e2da3f1c0287554cf2a1aca6b19e99a08c34423711e13176ac8d47da25f2856cab56ad0daa99c60ed0fce417af2447fed1d94c2d0daf4b35f22a9b889b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/rm/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/rm/firefox-55.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e316df164058d8f380274958b17a3812a6e31d9da6eb2fd0373e7bf2befc45a668a572ad4f8f8c33a7aafb5d1f8b7331fca00e12d7ef511017b1a002811040e4"; + sha512 = "036a41157ba884430046fdcead68a37fe254447016cef723754f70cfd88f2fd385ac7c374e82adb06556c541f0ae82ee5f739d1a190ba06a1cf04405e4669b1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ro/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ro/firefox-55.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "04717cd979c8440639b407e919bf2d61814d24ea9969438397fa56fc73b5a8104d8a448c40cb0b3923ece0a61b5d232a8b94eab456f1b89fb4e24bcb0a525b64"; + sha512 = "ac349bd51e8fd251f9581ba96c4ca6c69e24e736e44d28c9661e5163a3893ec9ae42c437a0a5b465266a35b966bff0bed8ae081fc93b56d59134fec4ff38cda3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ru/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ru/firefox-55.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e0f76ebbe996f9989b00faabc08931873490c4048453ed4f32f0461c6ee977cbcf4b2ff4ff650a39e1a536f7bb214c6821c099a1f212cb4600187c698130bb2d"; + sha512 = "dde58da3b6789ab33fdd8982d328412ac9c6821fd59268dca2fae0bc8dfb8558dfaec4a1d3c9802b33e2c10f7cb0bdf5480dcbbb1fe8e6b8be1774064ca5b85d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/si/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/si/firefox-55.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f98a42fa1faee4be0a141d2dcd5e88641e89baae55d70440c1fc7f92cd12bf9f3d7954c23b42b16c02052f79f9451f76074c1a7aa0993ff84bde64ae12267e68"; + sha512 = "41b96f0c5c4dea98296f791e121e2421545b04995d92326176561f0c034c261e19bb2a7db9e72df52a9285ad5d1ff96a4e38559a386212c7267ccf475764b281"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sk/firefox-55.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fad8a8c70e8f354e87b19fa9387c81b685c79b133ab03dad937e84e2c927d814844d281e39c45016a51056bca56cfca357ec10250035dc07b831a4e4c83ff147"; + sha512 = "c19fb32205523afb74ac7edf29f3e55a9ffef4e24d18c47cca493b38d5e1bab8fda308f6c5889a64b8a8ed266c8795a67bbfd690bc381c02405be1ff6cb5e9e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sl/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sl/firefox-55.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "39f8670cbcf942210336477cb153b7b2b39a7692103a76a476a820f2b8b9809da65351e02b4f80da7ccae3e9cd18ecb7fa1af292f507e9920f50261ab67b81d1"; + sha512 = "490c0174c5d6bb8cdf0619eaf00b87fd15d5365b40680786943cc7c775ba14cadd21e5aa6948b82f0f45bbf17d747f0217ec43b3da8c523b1acff60c3a6c7c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/son/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/son/firefox-55.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7eb79e3638c0820b1db421e13f71805d24e2147ebe78f48497ff574058a3da91f9afb40d050801711550283b692972f4b973ea8579376bea03059d70557c20f9"; + sha512 = "b0e9ad5e3b2c0c274d70a048855c2a923304be5464ddc7066f64cd20833929702c413816f466c98693fab9c7167f4343a12a7d528bd499d3c4d7fd3b268c4a49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sq/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sq/firefox-55.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "84c410d7f7dc4524c4e8a7ff3fc186afcf922d8ca843bd81de83c1ce1d22aa2c07fdd57d1594a49aab014b07f1902c929bb9aa8d55b00b323f06ee70907b4a08"; + sha512 = "285224e3a62ad4c93f63c24757e4d3d973a2c599baa7cb8729c3e4446e7ca054b38f80dcfec26b52491631f04aa10406b4fe25bd9e9d60174609ff6c446036f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sr/firefox-55.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9f91c5c33e3d0f01ab28601fa41c02a048a3ef3899481c6ff5858a176b72e05f8113c2fa2dfff2527ad3477a7d2bc7df5fbaa1096b1765113da855da710d7abc"; + sha512 = "3a4b5082d7f9afe834ff3236304b6a50a5b2262f9024ba8477bf6b2d25908d0aa440432b093a5e2d6a7c698a683e00ac299ffb1913d28298005dbbc38c8c1515"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sv-SE/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sv-SE/firefox-55.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "35c8fd0980cc641fd7bd4fd084f3d308840279ece55a33243396bbd0a3d9e500a3aab797fda63ff5d551acd82e21e48c152ff218e1a97ab395b009bea124df43"; + sha512 = "dcad45f1cfa03e12c594665666d715310d29f0984ef4af446356c9d030decd9551782a1b591fad218c2421edafe7f2262200a2e6a1672ac41d7f16a9664ebd7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ta/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ta/firefox-55.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "037257799dd7cd3383a35c334ec99f53be8682ac14020c7f96426a7885d9257519e3d5ab8643045e97df703a4bc63424db9dfa29cd65d6291402a034000fcf21"; + sha512 = "a351f1850772b6086a70d6c8f6edc5b0906b8b5a9dbb8c05dea8a75f4ebeb46b1e9077f2c145b5b557acf3e7382d72f94949a1a0420c5c04d9e7b17292ef5d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/te/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/te/firefox-55.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "f0216fd72eba20ae094c54a4654356947441564661f6ecf5de399f55f05f7cb60370ac0072b2721d74cb40cf4c938cd3736cbd9b3a93cd641e3ef1a9089b4502"; + sha512 = "8f1a725b309eff87d1ba130d02e6807a7202d91f0d7cee73672e6dd0dcc90b92b5a7aa73150d9c69140e9c27140b364557d289a644c1131c57d19a34d96acecd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/th/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/th/firefox-55.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff62cc5280928c0d9aad58c3b7fc52435f09e08d65e89ab0b7fb7280f3e61289d513f893dca2746e913121753c0f15e5a34c675c4074a0ff159e790d2bfad0f0"; + sha512 = "95f20d59433954c0b26a709378a853f6297028126ffaf2beabbe0332acc9df3089dfbc0095f3aac503a04b0cdfce9f79199eed9ca04b810f213f5692a1fc4cad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/tr/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/tr/firefox-55.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fc7f8d5120fb3b3c3699f13870fadf265ce7a43a1adadee89457a7df863d6da0f4d64b7f0b633d3526da39d825f30fbec3b9f1ae09bffb4c61681f4105bb5db7"; + sha512 = "6eb68dc198c1106d48ea93b924dc961aaa10a7e89a74f7ffcd219f1de4952c403b19062bd23fa625f82cc9cdad0506f777aa57da6fb106050e962deffa79cc76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uk/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/uk/firefox-55.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f0fb3de841925f81c64877efbc8b151cec744bd0b4997bdb9a086413e7106cf05c1dca49ee797dbd2d80bd1603554e006f47b21217e60d390ae91c6a1badac47"; + sha512 = "c43f597db5027f6c1ba76e4308a7e733a78f1d3711a4529b5cc8f51eebe7bd2a55007975f248be698485fecb91ecbc43a141a94869e41445a07f90fa81d70cb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ur/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ur/firefox-55.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3480fca8ef85b5db62b471c2986f124b92bd17c5682d57276b3f30fe0d3fde02f3d2a6e044f6c5157fc2bd3ab882e235f264aaeb319e09d234492c1aed674b92"; + sha512 = "2d7af1f97cf035519c43e57ba4be3f95f64e2da816d01c924e82dd4c442d767098247f1bd7535f3d5c658254ba7a9ade752f97ca4951a6a0989f6303cfeb3354"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uz/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/uz/firefox-55.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2460a419db6406542279daae938882fcc3ac29446b88a6315f3f7626925b906aed2d8a6250dfcc50c7eb87da3d57d231e4fcb5659a0fdc84ac188d4bbaf436aa"; + sha512 = "f5173c595187661731aa3e4edb3fa35f3be9c0f494882a06e765142e193488e50538b1558ae094b8a0c462758601a89dc9105ecee6ed485435083f5c9ea67f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/vi/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/vi/firefox-55.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0e54d8a00a734b4fee5ef7cc2a831453c732573d53477e53bb202311de5524839ed2290f5ed6d93a20d5b63da765f7a621d8bafaf0150d522c755347ca49ff6f"; + sha512 = "2b30eea824bf032526033203798ad34337e7151c45cc055ad7eba9def8f46b6108de2730ae5dea45627b65ed7ec617ca15b5372f23e3e4a33a303bb51ac4983b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/xh/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/xh/firefox-55.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "67950de9da98ae7bf867079f831cdcdcb5aca1f9caf951813f394e1e266787d90777e95fb33f46351086b25927ef108ee78f34b8152084410f8727ad7f3579ae"; + sha512 = "2d098f192bfee274dd9c4cd806bf35bd311c50eb73a45e23eb5e497e636617e020c518f131520f5f0ba3d23864c97f09b4d9b46db9cc4d55c63be3731e990aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-CN/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/zh-CN/firefox-55.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "56b6bf4bdb5994f2550a47a0d6a6e5bf4eb5d456fc30e3472adb3efa909aeea17b86e24d799bc5eea11e60046afcb0eac61fe601c6e1c795ebb5a5440fc32738"; + sha512 = "f89e61ad4c1b44d48e0e0e7be3dcd80df548e5f0d0932b915a2c37b36bd882cfd4d19c2d2261b64266a8317acb066b2c48db0348dbe37c14b748d5832f6c0e84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-TW/firefox-54.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/zh-TW/firefox-55.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "22fff4e32f6451b4378b45007c0fa7a1170a6897d13dfa1b0f814ac0ec9f48ea4dd5439a14aa7e9b1dabea19d0dbacd22f23dc431c38e023958692c5073147fb"; + sha512 = "c8547fe1196a6b0ef8644edf69cdd68b74e208260c7e51f51a03d854374b0ed8623ebfb1e7c6e6c4d05edbc13e7862d0fdf260d77b7f2e125379258c4b3d44c6"; } ]; } From 39e6dfe2f600cc1fff763008a7e7fdd8761f6273 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 7 Aug 2017 21:14:31 +0900 Subject: [PATCH 015/213] firefox: 54.0.1 -> 55.0 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 11d9324c042..359b959b94a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "54.0.1"; + version = "55.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2"; + sha512 = "b3ca0a926faedfc12c859965629330489ac6c05730a0dc38748704a1a25e876decfba78a3d665e22a6773b0a3bfed3109cd624be77d130785b4097d6d9f9c94b"; }; meta = { From 5021ed9dd2e65778c6420d67d3d264f507f5f991 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 7 Aug 2017 21:14:34 +0900 Subject: [PATCH 016/213] firefox-esr: 52.2.1esr -> 52.3.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 359b959b94a..19dfba0b0eb 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -25,10 +25,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.2.1esr"; + version = "52.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3"; + sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9"; }; meta = firefox.meta // { From eaab02b94f729c8e230c6b7f52ad83091f6fc0d6 Mon Sep 17 00:00:00 2001 From: evujumenuk Date: Tue, 8 Aug 2017 01:45:19 +0200 Subject: [PATCH 017/213] wireguard: convert "table" to an interface option Do the right thing, and use multiple interfaces for policy routing. For example, WireGuard interfaces do not allow multiple routes for the same CIDR range. --- .../modules/services/networking/wireguard.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 5aa4f13d452..4f54b45639f 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -79,6 +79,16 @@ let description = "A list of commands called after shutting down the interface."; }; + table = mkOption { + default = "main"; + type = types.str; + description = ''The kernel routing table to add this interface's + associated routes to. Setting this is useful for e.g. policy routing + ("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric + table IDs and table names (/etc/rt_tables) can be used. Defaults to + "main".''; + }; + peers = mkOption { default = []; description = "Peers linked to the interface."; @@ -160,14 +170,6 @@ let interval of 25 seconds; however, most users will not need this.''; }; - table = mkOption { - default = "main"; - type = types.str; - description = ''The kernel routing table to add this peer's associated - routes to. Setting this is useful for e.g. policy routing ("ip rule") - or virtual routing and forwarding ("ip vrf"). Both numeric table IDs - and table names (/etc/rt_tables) can be used. Defaults to "main".''; - }; }; }; @@ -217,7 +219,7 @@ let (map (peer: (map (allowedIP: - "${ipCommand} route replace ${allowedIP} dev ${name} table ${peer.table}" + "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}" ) peer.allowedIPs) ) values.peers) From 260bab6c7f5445f08c1c6200479251b10af7e426 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 7 Aug 2017 22:50:31 -0300 Subject: [PATCH 018/213] higan: 102 -> 103 --- pkgs/misc/emulators/higan/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index b1495987e61..be9a39e47e0 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; - version = "102"; + version = "103"; sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "1wcr2sxk0n4rngnf9g2qcjcv70s8rf5cqj195sav1yjwxkrdrnjj"; + sha256 = "0xj2k5g1zyl71hk3kwaixk1axbi6s9kqq31c702rl7qkljv6lfp6"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { make compiler=c++ -C higan ''; + # Now the cheats file will be distributed separately installPhase = '' install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps install -m 755 icarus/out/icarus $out/bin/ @@ -42,8 +43,6 @@ stdenv.mkDerivation rec { install -m 644 higan/data/higan.desktop $out/share/applications/ install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png - cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/data/cheats.bml $out/share/higan/ cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ higan/systems/* $out/share/higan/ ''; @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { cat < $out/bin/higan-init.sh #!${stdenv.shell} - cp --update $out/share/higan/cheats.bml \$HOME/.config/ cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ EOF @@ -68,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "An open-source, cycle-accurate Nintendo multi-system emulator"; longDescription = '' - Higan (formerly bsnes) is a Nintendo multi-system emulator. + Higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - Nintendo's Famicom, Super Famicom (with subsystems: Super Game Boy, BS-X Satellaview, Sufami Turbo); From 4b1bcf8724c1b9a9409a88e930c10f0a50d19b1d Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 8 Aug 2017 09:57:10 +0100 Subject: [PATCH 019/213] pangolin: init at 2017-08-02 --- .../libraries/pangolin/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/pangolin/default.nix diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix new file mode 100644 index 00000000000..f5b2f4c2b99 --- /dev/null +++ b/pkgs/development/libraries/pangolin/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg +, ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }: + +stdenv.mkDerivation rec { + name = "pangolin-${version}"; + + version = "2017-08-02"; + + src = fetchFromGitHub { + owner = "stevenlovegrove"; + repo = "Pangolin"; + rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407"; + sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; + }; + + nativeBuildInputs = [ cmake pkgconfig doxygen ]; + + buildInputs = [ + mesa_noglu + glew + xorg.libX11 + ffmpeg + python3 + libjpeg + libpng + libtiff + eigen + ]; + + enableParallelBuilding = true; + + # The tests use cmake's findPackage to find the installed version of + # pangolin, which isn't what we want (or available). + doCheck = false; + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + + meta = { + description = "A lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input"; + longDescription = '' + Pangolin is a lightweight portable rapid development library for managing + OpenGL display / interaction and abstracting video input. At its heart is + a simple OpenGl viewport manager which can help to modularise 3D + visualisation without adding to its complexity, and offers an advanced + but intuitive 3D navigation handler. Pangolin also provides a mechanism + for manipulating program variables through config files and ui + integration, and has a flexible real-time plotter for visualising + graphical data. + ''; + homepage = https://github.com/stevenlovegrove/Pangolin; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd9427c2ce..eb0ee3bc767 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8179,6 +8179,9 @@ with pkgs; cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; + + pangolin = callPackage ../development/libraries/pangolin { }; + pangomm = callPackage ../development/libraries/pangomm { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; From 668007f034ab1207836a87923563f74c8abc1164 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 8 Aug 2017 21:12:13 +0900 Subject: [PATCH 020/213] flashplayer: 26.0.0.137 -> 26.0.0.151 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index be9aa16e151..c20ce2cca30 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "26.0.0.137"; + version = "26.0.0.151"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0zmslmy7i7ywb2frckg5afkmfqb2lm2mahq0qs8msjzcx9jk4pyx"; + sha256 = "0l15k2ws3256zyvbfx66j8p1liqv4k2m8hhw2jz8nzza7q6il35p"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index c25390a7c99..0452e7486e6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "26.0.0.137"; + version = "26.0.0.151"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z" + "0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8" else - "1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl" + "0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d" else if arch == "x86_64" then - "0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls" + "1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l" else - "1fm6p91c63pyr0lra29vcq2dplb2c7a5114nm4r9rrrzjxakqw5w"; + "1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index d7dd83b58f3..9a805eb55e4 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "26.0.0.137"; + version = "26.0.0.151"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "095457h83zs6cvdyyrh01069kgg8cnhgs1by6s9xpdxgc851n8gp" + "0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb" else - "1zw3f612cfb8lr331hwqzlpd0gn3r0139bq76pbbbahh2chq99f8"; + "0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8"; }; nativeBuildInputs = [ unzip ]; From 7cdf149fab0dda14b2c11d81e4f440176e3334b7 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 8 Aug 2017 12:18:16 -0400 Subject: [PATCH 021/213] flann: 1.8.4 -> 1.9.1 This should also fix the darwin build on hydra. --- pkgs/development/libraries/flann/default.nix | 15 +++++++-------- .../development/libraries/flann/no-examples.patch | 10 ---------- 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/flann/no-examples.patch diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 145d2b42a9d..eda18bc432c 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,18 +1,17 @@ -{stdenv, fetchurl, unzip, cmake, python}: +{stdenv, fetchFromGitHub, unzip, cmake, python}: stdenv.mkDerivation { - name = "flann-1.8.4"; + name = "flann-1.9.1"; - src = fetchurl { - url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip; - sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz"; + src = fetchFromGitHub { + owner = "mariusmuja"; + repo = "flann"; + rev = "1.9.1"; + sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; }; buildInputs = [ unzip cmake python ]; - # patch out examples in Darwin because they do not compile. - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ]; - meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/flann/no-examples.patch b/pkgs/development/libraries/flann/no-examples.patch deleted file mode 100644 index 95a6f0eed8e..00000000000 --- a/pkgs/development/libraries/flann/no-examples.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -155,7 +155,7 @@ - - add_subdirectory( cmake ) - add_subdirectory( src ) --add_subdirectory( examples ) -+#add_subdirectory( examples ) - add_subdirectory( test ) - add_subdirectory( doc ) From 57506bbb2800d5afcf02cc82efd81d3db67fff9c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 8 Aug 2017 17:40:50 +0000 Subject: [PATCH 022/213] xen-4.8: update changed patch hash --- pkgs/applications/virtualization/xen/4.8.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index f6205f5c467..3429545557a 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -53,7 +53,7 @@ callPackage (import ./generic.nix (rec { patches = [ (xsaPatch { name = "216-qemuu"; - sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5ma1"; + sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn"; }) ]; meta.description = "Xen's fork of upstream Qemu"; From 7e943b5fdb103c2a9a245dbde6ffcc8f19e08860 Mon Sep 17 00:00:00 2001 From: kiloreux Date: Wed, 9 Aug 2017 02:40:36 +0100 Subject: [PATCH 023/213] Enable opencore-amr in ffmpeg-full --- pkgs/development/libraries/ffmpeg-full/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index c0c9cfa2749..d9239989cf6 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -100,7 +100,7 @@ , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code -#, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder +, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering , openglExtlib ? false, mesa ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder @@ -155,7 +155,7 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame + * libmxf libnut libquvi nvenc opencl openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: @@ -360,7 +360,7 @@ stdenv.mkDerivation rec { (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") #(enableFeature opencl "opencl") - #(enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") + (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") #(enableFeature (opencv != null) "libopencv") (enableFeature openglExtlib "opengl") #(enableFeature (openh264 != null) "openh264") @@ -403,7 +403,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump + libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib mesa ++ optionals nonfreeLicensing [ fdk_aac openssl ] From da430a159791a624f87cad9735afca412b2c105e Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Wed, 9 Aug 2017 11:51:14 +0300 Subject: [PATCH 024/213] elixir: 1.5.0 -> 1.5.1 Also homepage URL is updated --- pkgs/development/interpreters/elixir/1.5.nix | 4 ++-- pkgs/development/interpreters/elixir/generic-builder.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index 23c4db804d3..e85d2500223 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.5.0"; - sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz"; + version = "1.5.1"; + sha256 = "0q0zr3v9cyb7p9aab8v038hnjm84nf9b60kikffp6w9rfqqqf767"; minimumOTPVersion = "18"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 3d779e665cd..8f83a338484 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -59,7 +59,7 @@ in ''; meta = with stdenv.lib; { - homepage = http://elixir-lang.org/; + homepage = https://elixir-lang.org/; description = "A functional, meta-programming aware language built on top of the Erlang VM"; longDescription = '' From f337be57eefdae3da5067d301d8eb2bf0a8ded1e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 9 Aug 2017 12:27:03 +0200 Subject: [PATCH 025/213] mpd: add lame support --- pkgs/servers/mpd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index b7eb0b5397d..63a781c5941 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -18,6 +18,7 @@ , mmsSupport ? true, libmms , mpg123Support ? true, mpg123 , aacSupport ? true, faad2 +, lameSupport ? true, lame , pulseaudioSupport ? true, libpulseaudio , jackSupport ? true, libjack2 , gmeSupport ? true, game-music-emu @@ -72,6 +73,7 @@ in stdenv.mkDerivation rec { ++ opt mmsSupport libmms ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 + ++ opt lameSupport lame ++ opt zipSupport zziplib ++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio ++ opt (!stdenv.isDarwin && jackSupport) libjack2 @@ -105,6 +107,7 @@ in stdenv.mkDerivation rec { (mkFlag mmsSupport "mms") (mkFlag mpg123Support "mpg123") (mkFlag aacSupport "aac") + (mkFlag lameSupport "lame-encoder") (mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse") (mkFlag (!stdenv.isDarwin && jackSupport) "jack") (mkFlag stdenv.isDarwin "osx") From e8020e272d1b335d2d5d513984df54bf1e90b5ea Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Wed, 9 Aug 2017 13:43:27 +0200 Subject: [PATCH 026/213] idea-ultimate: 2017.1.5 -> 2017.2.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 186f9d2c23b..6970c771aa5 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -307,12 +307,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.1.5"; + version = "2017.2.1"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0gjj2g9fcrbbbp3v4clg0kj48qdw0gqcn9im4h8p3z2zscpg16ag"; + sha256 = "0y3r82i229d7lywixyifv4kkrwivixl75flagaqbkzw3j9wklg3k"; }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; From bd27239c068b6ab1be668e3682d12861d77d08d6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 9 Aug 2017 09:13:28 -0400 Subject: [PATCH 027/213] atom: 1.18.0 -> 1.19.0 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 9f0c97ce154..ec8bef7deee 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6"; + sha256 = "1gdasqpmbyasd05p5920aw6bf8j58crs51gxjslsgbl1azi4yfh2"; name = "${name}.deb"; }; From fa02817cda46e781d39f3bda212617d72e548824 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 9 Aug 2017 17:59:47 +0200 Subject: [PATCH 028/213] docker-machine: 0.12.0 -> 0.12.2 --- .../networking/cluster/docker-machine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 5016dc8fca3..95ad83cb3b1 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.12.0"; + version = "0.12.2"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "08y87d0whag9sy1q5s84xrz95k12c9crh3zmdcr1ylrwqnszrn2y"; + sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf"; }; postInstall = '' From da93220fff10b96f4853fad6d5f3c463d33a0212 Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 9 Aug 2017 17:11:01 -0300 Subject: [PATCH 029/213] mkvtoolnix: 13.0.0 -> 14.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0877df0a68c..b902b96a7cd 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "13.0.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0dz86fzv19wknd8p31nnx2imj80v7m944ssapp8fmq9hkc36m777"; + sha256 = "1ygc2qrd074vz2yw4iqml5ir31kkvkv7pz3hcfy423p9s06xi1k2"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; From 7cd44aeeef932551c2b3d5ba41e5897115103b2c Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 9 Aug 2017 22:14:23 +0100 Subject: [PATCH 030/213] pangolin: fix OS X build --- pkgs/development/libraries/pangolin/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index f5b2f4c2b99..09cbd86eb92 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg -, ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew +, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen +, Carbon ? null, Cocoa ? null +}: stdenv.mkDerivation rec { name = "pangolin-${version}"; @@ -25,7 +27,8 @@ stdenv.mkDerivation rec { libpng libtiff eigen - ]; + ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb0ee3bc767..996691fa435 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8180,7 +8180,9 @@ with pkgs; pango = callPackage ../development/libraries/pango { }; - pangolin = callPackage ../development/libraries/pangolin { }; + pangolin = callPackage ../development/libraries/pangolin { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; pangomm = callPackage ../development/libraries/pangomm { inherit (darwin.apple_sdk.frameworks) ApplicationServices; From bdcb21c4667599aaef7ff9d23799f00b6b199000 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 9 Aug 2017 17:09:22 -0400 Subject: [PATCH 031/213] elpa-packages: 2017-08-09 --- .../editors/emacs-modes/elpa-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b5c0d465368..0fd05f934c7 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -752,10 +752,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.14.tar"; - sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx"; + url = "https://elpa.gnu.org/packages/exwm-0.15.tar"; + sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg"; }; packageRequires = [ xelb ]; meta = { @@ -1446,10 +1446,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170731"; + version = "20170807"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170731.tar"; - sha256 = "1vf91r4ifnjg5r82l5ikq0bwsxd5dsbgywzmwaspm6ckx49nksnl"; + url = "https://elpa.gnu.org/packages/org-20170807.tar"; + sha256 = "185pyc0v4vwzvkygqhpld14lk62ygvfb9ycz609n99m0wqlamwz3"; }; packageRequires = []; meta = { From 05bee41510b17bd58b6ba211162ca9ddcdecb3cf Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 9 Aug 2017 17:09:37 -0400 Subject: [PATCH 032/213] org-packages: 2017-08-09 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index f51fec80075..e9eccf83334 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170731"; + version = "20170807"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170731.tar"; - sha256 = "0lphzjxmk5y9g6b9rnacc9z55hbws3xmycsqdvsz56xr3aawx255"; + url = "http://orgmode.org/elpa/org-20170807.tar"; + sha256 = "0cpkkfw7wmz242r5zzpcnzp7gfsmja90gqqb5h20azxmq96kfzga"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170731"; + version = "20170807"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170731.tar"; - sha256 = "1bba4m9r598f9l8wmr1j670d1qp4fcbbhzp9m4qd2md09rm3nsnw"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170807.tar"; + sha256 = "145j9g1lx5nj85irdh9ljhh4rhwj9ys8nnca549lyxd9a5yiav5k"; }; packageRequires = []; meta = { From d887748507c8cd2f460b41af49e72d3f5b21291a Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 9 Aug 2017 17:11:29 -0400 Subject: [PATCH 033/213] melpa-stable-packages: 2017-08-09 Removals: - aurora-config-mode: removed from melpa - fuel: repo moved, lost tags for stable version --- .../emacs-modes/melpa-stable-generated.nix | 483 +++++++++++------- 1 file changed, 306 insertions(+), 177 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 434e4384738..61a63efb67e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -86,12 +86,12 @@ abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abyss-theme"; - version = "0.5"; + version = "0.7"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "emacs-abyss-theme"; - rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc"; - sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia"; + rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14"; + sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme"; @@ -1136,12 +1136,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "921b1d39ee1122c0f6935598dc17aaa904e74819"; - sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f"; + rev = "97c20b1fd9ad3f138e1100e3a837d05108c4c564"; + sha256 = "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1981,27 +1981,6 @@ license = lib.licenses.free; }; }) {}; - aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "aurora-config-mode"; - version = "0.0.2"; - src = fetchFromGitHub { - owner = "bdd"; - repo = "aurora-config-mode.el"; - rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; - sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode"; - sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; - name = "aurora-config-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/aurora-config-mode"; - license = lib.licenses.free; - }; - }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; @@ -2028,14 +2007,14 @@ pname = "auto-compile"; version = "1.4.0"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "auto-compile"; rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; - sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; + sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; name = "auto-compile"; }; packageRequires = [ dash emacs packed ]; @@ -3124,12 +3103,12 @@ bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "plandes"; repo = "bshell"; - rev = "0abd93439895851c1ad3037b0df7443e577ed1ba"; - sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw"; + rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68"; + sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; @@ -3166,12 +3145,12 @@ buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af"; - sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma"; + rev = "1110217973afa1329c47a1f7e6962aad36a90134"; + sha256 = "0hb75npk1d9bdqpgdrin8vvfn64arhgq0h69xgvhwcdlm7xjg1bf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -5152,12 +5131,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "2cb03c48f44a5b3cbbbbe05e9841b2c61bd8ed81"; - sha256 = "1i13w1pziv8c1d9gi6pg50v60z7jyx2grpamrbnazvd6rci88paf"; + rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; + sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -6541,17 +6520,19 @@ license = lib.licenses.free; }; }) {}; - deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "deft"; version = "0.7"; - src = fetchgit { - url = "git://jblevins.org/git/deft.git"; + src = fetchFromGitHub { + owner = "jrblevin"; + repo = "deft"; rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40"; sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft"; - sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; + sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp"; name = "deft"; }; packageRequires = []; @@ -7284,16 +7265,16 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "a38b64aecd037556c91d9aef29f1d04496295f2b"; - sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds"; + rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c"; + sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode"; - sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; + sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g"; name = "docker-compose-mode"; }; packageRequires = [ dash emacs yaml-mode ]; @@ -7808,12 +7789,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "1.5.5"; + version = "1.5.7"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19"; - sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md"; + rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c"; + sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -7889,22 +7870,22 @@ license = lib.licenses.free; }; }) {}; - ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1"; - sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q"; + rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83"; + sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg"; name = "ebal"; }; - packageRequires = [ emacs f ido-completing-read-plus ]; + packageRequires = [ emacs f ]; meta = { homepage = "https://melpa.org/#/ebal"; license = lib.licenses.free; @@ -8970,14 +8951,14 @@ pname = "elx"; version = "1.1.0"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "elx"; rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d"; sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; - sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; + sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz"; name = "elx"; }; packageRequires = [ emacs ]; @@ -11802,12 +11783,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0"; - sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b"; + rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f"; + sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -12324,6 +12305,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: + melpaBuild { + pname = "flycheck-popup-tip"; + version = "0.12.1"; + src = fetchFromGitHub { + owner = "flycheck"; + repo = "flycheck-popup-tip"; + rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c"; + sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip"; + sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx"; + name = "flycheck-popup-tip"; + }; + packageRequires = [ emacs flycheck popup ]; + meta = { + homepage = "https://melpa.org/#/flycheck-popup-tip"; + license = lib.licenses.free; + }; + }) {}; flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; @@ -13424,25 +13426,6 @@ license = lib.licenses.free; }; }) {}; - fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fuel"; - version = "0.96"; - src = fetchgit { - url = "git://factorcode.org/git/factor.git"; - rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0"; - sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; - sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756"; - name = "fuel"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fuel"; - license = lib.licenses.free; - }; - }) {}; full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "full-ack"; @@ -16163,12 +16146,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "0.2.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; - sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; + rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; + sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -18512,22 +18495,22 @@ license = lib.licenses.free; }; }) {}; - ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "3.16"; + version = "4.3"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; - sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; + repo = "ido-completing-read-plus"; + rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533"; + sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; - sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; + sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z"; name = "ido-completing-read-plus"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/ido-completing-read+"; license = lib.licenses.free; @@ -18620,16 +18603,16 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "3.16"; + version = "4.3"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; - sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; + repo = "ido-completing-read-plus"; + rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533"; + sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; - sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; + sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; packageRequires = [ cl-lib emacs ido-completing-read-plus ]; @@ -18872,12 +18855,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "94bab9136e1264e98a10d9325ad53d735307f8f3"; - sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j"; + rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; + sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -19040,12 +19023,12 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "135e049d763ceb4cabd0bab068c4c71452459065"; - sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq"; + rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5"; + sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -20675,12 +20658,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "b488c3dbba657bbd524402f48fde16ab6b1211db"; - sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5"; + rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041"; + sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -21459,11 +21442,11 @@ lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lms"; - version = "0.6"; + version = "0.7"; src = fetchhg { url = "https://bitbucket.com/inigoserna/lms.el"; - rev = "5f20620f62a1"; - sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9"; + rev = "f07ac3678e27"; + sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; @@ -21692,13 +21675,13 @@ version = "2.1"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; + repo = "mac-pseudo-daemon"; rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon"; - sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon"; + sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0"; name = "mac-pseudo-daemon"; }; packageRequires = [ cl-lib ]; @@ -21924,6 +21907,27 @@ license = lib.licenses.free; }; }) {}; + magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-imerge"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit-imerge"; + rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; + sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; + sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4"; + name = "magit-imerge"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-imerge"; + license = lib.licenses.free; + }; + }) {}; magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; @@ -22050,22 +22054,22 @@ license = lib.licenses.free; }; }) {}; - magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "283bde94b3fe5cd8f4634887812c58eaf55aef60"; - sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7"; + rev = "959e7b259697c79ccf46b95827575d3e15e83d30"; + sha256 = "19m7qmp5pi5l3mak1j475qxgnpr4kc4dm7qj80qc4m844bkacc4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab"; name = "magithub"; }; - packageRequires = [ emacs git-commit magit s with-editor ]; + packageRequires = [ emacs ghub-plus magit s ]; meta = { homepage = "https://melpa.org/#/magithub"; license = lib.licenses.free; @@ -22669,12 +22673,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537"; - sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb"; + rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; + sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -24119,14 +24123,14 @@ pname = "no-littering"; version = "0.5.9"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "no-littering"; rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; - sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; + sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh"; name = "no-littering"; }; packageRequires = [ cl-lib ]; @@ -24638,12 +24642,12 @@ obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "obfusurl"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "davep"; repo = "obfusurl.el"; - rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e"; - sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961"; + rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5"; + sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; @@ -24680,12 +24684,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "032599b162624a4b65c82c20be06433f24b00e8f"; - sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; + rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -24743,12 +24747,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; - sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; + rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8"; + sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -24873,8 +24877,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "ad147956b936fd528d26ca88158a8af96ff5827a"; - sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm"; + rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e"; + sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -26299,13 +26303,13 @@ version = "2.1"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; + repo = "mac-pseudo-daemon"; rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc"; sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon"; - sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon"; + sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z"; name = "osx-pseudo-daemon"; }; packageRequires = []; @@ -26655,14 +26659,14 @@ pname = "packed"; version = "2.0.1"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "packed"; rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; - sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; + sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; name = "packed"; }; packageRequires = [ dash emacs ]; @@ -27277,6 +27281,26 @@ license = lib.licenses.free; }; }) {}; + pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pelican-mode"; + version = "20170808"; + src = fetchgit { + url = "https://git.korewanetadesu.com/pelican-mode.git"; + rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c"; + sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; + sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi"; + name = "pelican-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pelican-mode"; + license = lib.licenses.free; + }; + }) {}; per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "per-buffer-theme"; @@ -28599,12 +28623,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.3.2"; + version = "3.4.0pre1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "5532abc15b97f3489183b266b41844306052a3fa"; - sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4"; + rev = "3afcded28a6aa9c44adf801ca5bff2133fcf3030"; + sha256 = "03m1fprfz6cwxijp5fls502g6g3svyz760bwwwnbvyx4carwzmsp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -29583,6 +29607,27 @@ license = lib.licenses.free; }; }) {}; + react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "react-snippets"; + version = "0.1"; + src = fetchFromGitHub { + owner = "johnmastro"; + repo = "react-snippets.el"; + rev = "bfc4b68b81374a6a080240592641091a7e8a6d61"; + sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; + sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73"; + name = "react-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/react-snippets"; + license = lib.licenses.free; + }; + }) {}; real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "real-auto-save"; @@ -30237,12 +30282,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749"; - sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9"; + rev = "4a24c86a1873289538134fe431e544fa3e12e788"; + sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -30447,12 +30492,12 @@ ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-electric"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "knu"; repo = "ruby-electric.el"; - rev = "dfb4b448a63ae749c74edf6415ad569d52cab904"; - sha256 = "0z3whvjmxbyk7lrxl3z2lj1skacwd050b5jvpnw6gcdm2hr8mfbs"; + rev = "d04313dbee42c0d1009558a7c9424e4ae8611908"; + sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric"; @@ -30871,8 +30916,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; - sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; + rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379"; + sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -30991,12 +31036,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937"; - sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c"; + rev = "d1fd5d47aacba723631d5d374169a45ff2051c41"; + sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -31558,12 +31603,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2"; - sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd"; + rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; + sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -31663,12 +31708,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; - sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; + rev = "d461c462c237cd896553adb468cd77499d0d26ad"; + sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -33256,12 +33301,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "26e8b0615def4f0531682b8a849f55d330616ac1"; - sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np"; + rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f"; + sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -34514,12 +34559,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; - sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; + rev = "541f73c779e72eb6ebcc6814a75771e91679875a"; + sha256 = "1rjxn5pfryxbxsgfmmzidcs83azvzvzq0nnphbxmlxybp97wzimx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -34556,12 +34601,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.8"; + version = "1.8.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4"; - sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk"; + rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4"; + sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -34577,12 +34622,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.8"; + version = "1.8.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4"; - sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk"; + rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4"; + sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -35315,6 +35360,27 @@ license = lib.licenses.free; }; }) {}; + vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + melpaBuild { + pname = "vc-msg"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "vc-msg"; + rev = "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee"; + sha256 = "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg"; + sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9"; + name = "vc-msg"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://melpa.org/#/vc-msg"; + license = lib.licenses.free; + }; + }) {}; vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vcomp"; @@ -36451,12 +36517,12 @@ with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "with-simulated-input"; - version = "2.0"; + version = "2.2"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "with-simulated-input"; - rev = "568bfb8e1d59a19cb309fd72a7ab0e9e51229e31"; - sha256 = "1aa8ya5yzsijra7cf9rm80ffddv520kzm9rggw3nr3dj2sk03p8c"; + rev = "9efeb236c8f6887a8591d6241962c37266d8e726"; + sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; @@ -36532,6 +36598,27 @@ license = lib.licenses.free; }; }) {}; + wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wordgen"; + version = "0.1.4"; + src = fetchFromGitHub { + owner = "Fanael"; + repo = "wordgen.el"; + rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d"; + sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; + sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m"; + name = "wordgen"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/wordgen"; + license = lib.licenses.free; + }; + }) {}; wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordsmith-mode"; @@ -37015,6 +37102,27 @@ license = lib.licenses.free; }; }) {}; + yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yarn-mode"; + version = "1.0"; + src = fetchFromGitHub { + owner = "anachronic"; + repo = "yarn-mode"; + rev = "99891000efe31214b065fa9446cd5e68c5c42ed8"; + sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; + sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg"; + name = "yarn-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/yarn-mode"; + license = lib.licenses.free; + }; + }) {}; yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; @@ -37254,6 +37362,27 @@ license = lib.licenses.free; }; }) {}; + zephir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zephir-mode"; + version = "0.3.3"; + src = fetchFromGitHub { + owner = "sergeyklay"; + repo = "zephir-mode"; + rev = "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c"; + sha256 = "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; + sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j"; + name = "zephir-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/zephir-mode"; + license = lib.licenses.free; + }; + }) {}; zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; From b43888b973390852ddbcfa6d262f21fc9dc7795d Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 9 Aug 2017 17:14:51 -0400 Subject: [PATCH 034/213] melpa-packages: 2017-08-09 Removals: - aurora-config-mode: removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 2106 ++++++++++------- 1 file changed, 1216 insertions(+), 890 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 8caa31c5dad..ce7c1845d59 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -169,12 +169,12 @@ abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abyss-theme"; - version = "20160420.512"; + version = "20170808.645"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "emacs-abyss-theme"; - rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc"; - sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia"; + rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14"; + sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme"; @@ -822,8 +822,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1095,8 +1095,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d"; - sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c"; + rev = "15ee28a9dcf025f30626313ebd376c0586013c8e"; + sha256 = "187j3ixxrxkbja8xy7xgxpsx0ngwmn55gw0rnvlpj2pyz8vl192q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1112,12 +1112,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20170421.428"; + version = "20170801.1334"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "0a59342b7aafa9f89b477b0cc28f41a1abb8096c"; - sha256 = "05wkd93lm7mp5s3bgjqg6cq70dz5429cj27bj0pmls8nbzmyc5bw"; + rev = "6aaf1e634414e7485b47ff94aac6c34588f2a371"; + sha256 = "1dmb4q1xgf5mk4riihk2mmn7k182y9j1amcr8m2dmdw0hrgvsfcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1487,12 +1487,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170614.218"; + version = "20170803.414"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b"; - sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7"; + rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57"; + sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1508,12 +1508,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170629.2153"; + version = "20170803.1852"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "24f2495ab209f8f00b7883285637e207b6f07201"; - sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm"; + rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f"; + sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1794,8 +1794,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "1e7c9322c1ef395c4c4585bb29f5a421f2aa3077"; - sha256 = "1bb090n8nz8vacspihvnq37dx8knjgnarjbx5r4mqy9bp1v8i52p"; + rev = "0f9576791b86e0b315447e6823b3a7db131cd826"; + sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2894,12 +2894,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170610.2241"; + version = "20170804.2158"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "d6222c2959caaca5c4980038756097da8a51e505"; - sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; + rev = "d395e92d2a12e8b944ccfcdc1330c8665a3187f5"; + sha256 = "03n93cwbwrbs73kv2ysgc1qw6as8wd2q5cl743zb58y6h74kshv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -2978,12 +2978,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20170117.1905"; + version = "20170803.916"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "44903ab7c349ef225499d642f249b6dfef5c5161"; - sha256 = "0cjp2p018xsj3sx46adrlsc3zksph4hgkn2gdqb3w8illgzp9nyp"; + rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1"; + sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3101,27 +3101,6 @@ license = lib.licenses.free; }; }) {}; - aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "aurora-config-mode"; - version = "20140520.203"; - src = fetchFromGitHub { - owner = "bdd"; - repo = "aurora-config-mode.el"; - rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; - sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode"; - sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; - name = "aurora-config-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/aurora-config-mode"; - license = lib.licenses.free; - }; - }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; @@ -3207,16 +3186,16 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20170728.942"; + version = "20170805.447"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "auto-compile"; - rev = "c9786234bdc32237e6c304e6a7c917504370358d"; - sha256 = "0x9vmq9q3hkljv2dz57q97szsv60sbiyp6bbzp3272ykz6snpj76"; + rev = "ef7d0fb0ac902e40a5010f8c54d3fe1f279723ef"; + sha256 = "11ha04cfs8pm3f23hy4v8cfkfzkhig2mapwyq4brjcrbrwpac9zp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; - sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; + sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf"; name = "auto-compile"; }; packageRequires = [ emacs packed ]; @@ -3625,12 +3604,12 @@ auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; - version = "20151025.2311"; + version = "20170803.1005"; src = fetchFromGitHub { owner = "rranelli"; repo = "auto-package-update.el"; - rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410"; - sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2"; + rev = "0b296970d09d7deb7f780cb041fcbc313d39aa5d"; + sha256 = "1nicx2sjnmf3i7dlzi788rh2kjc7mj9q69knp3g2x72zxqy8x07d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update"; @@ -4044,12 +4023,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170702.237"; + version = "20170804.1135"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b"; - sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7"; + rev = "0ed6408f18bf13840f6f57638f86c3b9dfe4a07a"; + sha256 = "0pjxjgk39n6spman4grqgw2r82idld7agmc4q2j4f2gp9a0k2bll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4090,8 +4069,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "71b71e64900d0637e17013781042e086e9bf56e7"; - sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial"; + rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0"; + sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -4424,12 +4403,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170718.1307"; + version = "20170806.1329"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "06d54b58f2ea5c49507164d97e8837406484a274"; - sha256 = "0a4xhq5y4vclv91zq83vb8irsvf0xly09y3zxvddyliy4bn3f8hi"; + rev = "7b4e0dd8750e7a10fe446201e85346aeb18cca8e"; + sha256 = "1wcdzq4smi0070inrr5pc4zi6rbyxrf1ba0pj206cq14nfvjywj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4693,16 +4672,16 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20170127.516"; + version = "20170809.444"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "4dfb1f7c7f0402a0abf45e00007edc2c7f98a25a"; - sha256 = "0vm83ccr9q93z4cvnrzz0al5rpxm8zh9yysn5lja6g2474nm01wy"; + rev = "3957374b970901ebd4a48509e97a8f78307cf1a5"; + sha256 = "1psrrw1770v9bb3i8kgc2fjqm8r48fxfys13raww2pcl9fy2j199"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4409df77dca17b3f9556666a62ee924cb8794364/recipes/bbyac"; - sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; + sha256 = "1pb12b8xrcgyniwqc90z3kr3rq9kkzxjawwcz7xwzymq39fx0897"; name = "bbyac"; }; packageRequires = [ browse-kill-ring cl-lib ]; @@ -4777,12 +4756,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20170714.709"; + version = "20170801.2308"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "6e489758708cf7797ab3619cfdccd7422615dcda"; - sha256 = "0cjc9c2sr081b9nfspballb032h2809n1w3533v3ci8pcq82vq96"; + rev = "f8357cb7516ff9d7f86c1e7306a74f812a72dcb4"; + sha256 = "09n0810r00nli0jg1z3rcw8hpybsa5jxrh0gcg9n12hz5vyy3a36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -5069,12 +5048,12 @@ binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "binclock"; - version = "20170725.121"; + version = "20170802.416"; src = fetchFromGitHub { owner = "davep"; repo = "binclock.el"; - rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876"; - sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk"; + rev = "87042230d7f3fe3e9a77fae0dbab7d8f7e7794ad"; + sha256 = "0bbcn3aif3qvmgbga7znivcbgn1n79278x7xvbha52zpj584xp8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock"; @@ -5361,12 +5340,12 @@ bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bliss-theme"; - version = "20141115.2301"; + version = "20170808.607"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-bliss-theme"; - rev = "2c6922cb24118722819bea79a981f066039d34a3"; - sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr"; + rev = "c3cf6d8a666ab26909b7da158f9e94df71a5fbbf"; + sha256 = "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/bliss-theme"; @@ -5632,12 +5611,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170709.1244"; + version = "20170802.1256"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "d45fecf0aca62f977ceb3b725aa7b7625ae82f33"; - sha256 = "1ma40xnbxdpb49c9w1i65g2q1hl0b731c2vagqazxw21ng36mf71"; + rev = "d5c4e762fcfad605b95125d8422f0071494ddd91"; + sha256 = "1px37ymsakw3yxpa32sw7q4vi1mkiphaz0qfbl02gwxigdylpzlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5674,12 +5653,12 @@ boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boron-theme"; - version = "20150117.952"; + version = "20170808.608"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-boron-theme"; - rev = "ea5873139424d6ca013b915876daf0399432015b"; - sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb"; + rev = "87ae1a765e07429fec25d2f29b004f84b52d2e0a"; + sha256 = "1kdf71af1s67vshgwkdgi7swxx942i605awhmhrhdjbkra29v4yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/boron-theme"; @@ -5695,12 +5674,12 @@ boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; - version = "20170418.835"; + version = "20170802.417"; src = fetchFromGitHub { owner = "davep"; repo = "boxquote.el"; - rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883"; - sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm"; + rev = "7e47e0e2853bc1215739b2e28f260e9eed93b2c5"; + sha256 = "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; @@ -5923,12 +5902,12 @@ bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; - version = "20170116.1117"; + version = "20170806.1446"; src = fetchFromGitHub { owner = "plandes"; repo = "bshell"; - rev = "0abd93439895851c1ad3037b0df7443e577ed1ba"; - sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw"; + rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68"; + sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell"; @@ -6070,12 +6049,12 @@ buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "20170109.1220"; + version = "20170806.1436"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "e320ae7e05803551d8b534aaee84cae6e53155e2"; - sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf"; + rev = "df326e330ec6342648cc3c599155d7efc1eed5f9"; + sha256 = "1y7k1d18a2w8jgqkbmzgvr4ws3yyymgphsnq0dmb3bi4a5q21n4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -6884,12 +6863,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170801.117"; + version = "20170807.607"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "486d9a6aa6aac64a9c53555ec69980be5f3ad366"; - sha256 = "03rc80v44slqh4r9fdyl95mljcx4gspn1bij4kc1wzrs5anf8dig"; + rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97"; + sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -7282,12 +7261,12 @@ ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ceylon-mode"; - version = "20170626.1403"; + version = "20170806.919"; src = fetchFromGitHub { owner = "lucaswerkmeister"; repo = "ceylon-mode"; - rev = "cd027d71a6cd29b94ba46919b4e067b86f267fc6"; - sha256 = "06knyp3blini231ahlmkml3r0ypdajlz1dm41mwnzgcmg04x0s2h"; + rev = "1267447a38648502627005bfad0a3aef3572ef7d"; + sha256 = "1qj0dxfwh4yn9q01j22nq3ssg8l0s9v437l685gfly3ac5fp83ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; @@ -7307,8 +7286,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "089803189dafa145564b37b2e9340da547ff7c0c"; - sha256 = "07xd2pkz30nf09jv7vqb29n1vd3wc70p7j42f0zz22dcvx3iw2g3"; + rev = "627b6c44e5af58a0b73503dc4c9f52c077c9136e"; + sha256 = "1ai0czdrzm58gmzg9bkcp16wa05rpwxllf1dwblny77mpd9c0ain"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7342,12 +7321,54 @@ license = lib.licenses.free; }; }) {}; + cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + melpaBuild { + pname = "cfml-mode"; + version = "20170808.1635"; + src = fetchFromGitHub { + owner = "am2605"; + repo = "cfml-mode"; + rev = "5f97dd05d73d33975503d52daafb83af41b152ae"; + sha256 = "04dwxznm723arh9yrn1cvbaj6rnng5a5dk6ic9nw5ndmpqi3fnj8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode"; + sha256 = "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp"; + name = "cfml-mode"; + }; + packageRequires = [ cftag-mode emacs mmm-mode ]; + meta = { + homepage = "https://melpa.org/#/cfml-mode"; + license = lib.licenses.free; + }; + }) {}; + cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cftag-mode"; + version = "20170808.1635"; + src = fetchFromGitHub { + owner = "am2605"; + repo = "cfml-mode"; + rev = "5f97dd05d73d33975503d52daafb83af41b152ae"; + sha256 = "04dwxznm723arh9yrn1cvbaj6rnng5a5dk6ic9nw5ndmpqi3fnj8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode"; + sha256 = "0qnq8h5nwhw464ax8qpbsvflpaar44zw0mh2y7kc358v27n3qy6c"; + name = "cftag-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cftag-mode"; + license = lib.licenses.free; + }; + }) {}; cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12278"; + rev = "12293"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7431,8 +7452,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2"; - sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj"; + rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d"; + sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7490,12 +7511,12 @@ cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheat-sh"; - version = "20170707.757"; + version = "20170802.418"; src = fetchFromGitHub { owner = "davep"; repo = "cheat-sh.el"; - rev = "f61dc1ab9f0d6933dfda5366b8051217f1e9b491"; - sha256 = "028xyflii2ah6ijhq4fpmzsaj1nhps90kprpy7x7a9v4s85yvadx"; + rev = "e90445124f3f145a047779e42d070a3c5e150f70"; + sha256 = "06avap8w833syhz7pdpsm73nbsgbwzmpagd7f3khzaf6r6c90jmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; @@ -7658,12 +7679,12 @@ chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-conv"; - version = "20160218.1315"; + version = "20170807.1428"; src = fetchFromGitHub { owner = "gucong"; repo = "emacs-chinese-conv"; - rev = "2e5ba28b24c32d8d1da81cf9877c79abbf2e9bbb"; - sha256 = "1vfyb8gfrvfrvaaw0p7c6xji2kz6cqm6km2cmjixw0qjikxxlkv1"; + rev = "b56815bbb163d642e97fa73093b5a7e87cc32574"; + sha256 = "1bc3yn8y60y6a4vpqv39arn1pkcpl4s4n0sz9446f6m1lcal4c3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a798158829f8fd84dd3e5e3ec5987d98ff54e641/recipes/chinese-conv"; @@ -7725,8 +7746,8 @@ src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "88adc57d754c9aecc922fe8b29239148f2b6557c"; - sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v"; + rev = "1f40c4341a886ec952de14f642f07ccce90670b2"; + sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim"; @@ -7891,8 +7912,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "71f737d444da95c6175b513d500c56ae9711bbd0"; - sha256 = "0z2djw2y0rzpm256jqihv19hn9q8b7x2mga3h5r2gwzw803134y9"; + rev = "9c3b1863a9e80cce672762fbbfeee98842da2a49"; + sha256 = "0pn8hrwq5ahzj3gckhczs1q7nblsfhvg6vdd8c5y1ak4hhygp563"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8162,13 +8183,13 @@ pname = "clang-format"; version = "20170120.137"; src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "309673"; + url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; + rev = "310509"; sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; - sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format"; + sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7"; name = "clang-format"; }; packageRequires = [ cl-lib ]; @@ -8549,12 +8570,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170725.2307"; + version = "20170807.1610"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613"; - sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf"; + rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172"; + sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8574,8 +8595,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "5d0b53aa2446e0047b61f27b3c76e2645a423613"; - sha256 = "0wq835jxkd4f999nwjvsdn7rb282ixglln1v5lgvl0rahxyskbxf"; + rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172"; + sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8780,12 +8801,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170730.546"; + version = "20170804.430"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "7747ab37dfd678c3349d13ab8bcb9e5cff93c637"; - sha256 = "1p9vn3jnk3j0l2xm818dijfh5wm8l6y4ir2xiq6pqxf9v3qrp2lv"; + rev = "69cfce070ee9e23f45736aec7c92c7ce7c86b479"; + sha256 = "05qh9pigc37446x4ivpsi5j1q22jyjnmky5ja72dajibfrdg3zjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8805,8 +8826,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "748c192f8b8181f3df39ab4f6a07f25a45211c8f"; - sha256 = "1l4xx4lbm9xlvkq80dij7sydh0vnaj97ad42qjll9afwp6galp2b"; + rev = "92d16be9e6578600a273b338d003eb8908e5ed4e"; + sha256 = "0qrji1wc2alj5x6saj1kz96x0m50qd4b6yhb1ks7fpdy977r4paa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9155,12 +9176,12 @@ colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colonoscopy-theme"; - version = "20141115.2301"; + version = "20170808.609"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-colonoscopy-theme"; - rev = "7b873d7e7e091b71bf4fdd23ded19e261a1e3936"; - sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6"; + rev = "64bbb322b13dae91ce9f1e3581f836f94f800ead"; + sha256 = "1r0is6zjkzikm565fvmj0gx8ms5ig9l5xihnka4fig7jy6ak33z5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/colonoscopy-theme"; @@ -9322,12 +9343,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170730.241"; + version = "20170807.1724"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "51c95e37f02bc075a3d0d7a795dc7083ab57128b"; - sha256 = "16jbf9h0x0vw1mly4x0zrqvzs6wg16jplgy43kcnr8sc1xbj16xy"; + rev = "12da490d95bf2e64b62a2db27b88af6e6c823d6e"; + sha256 = "1py4y6dgd2vygwyn5zcxfw0hbg4bsd4yi6dyas30649s868s3b3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -10154,12 +10175,12 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "20170729.429"; + version = "20170804.1202"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; - rev = "1ab4b8e582450a1b1780e69c823d63c4622b8a1e"; - sha256 = "0i64qm7y0c93ca3fsydinab9l4mgr1kd4m0l06871583w3brjirf"; + rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4"; + sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math"; @@ -10374,8 +10395,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10542,8 +10563,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6"; - sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10626,8 +10647,8 @@ src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "0257cd83796c3bdc357b69c1ecaf6d7eb6e2bf53"; - sha256 = "035srwyx94fp80f6rgkvx1vxlvaznsgp7zy5gcddvyazx1a1yj0s"; + rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799"; + sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10919,8 +10940,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; - sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; + rev = "9b071a8fb130fe8391d445706711bcc4de2b3998"; + sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11418,12 +11439,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20170626.632"; + version = "20170801.1334"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "11096b95d1119847e746e4aae36c9de6163e5472"; - sha256 = "0ykm3cm6yrwp4a1b5rjjg9wzdp37w2rnjg1cyg2q33k31p49ywrf"; + rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f"; + sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11960,8 +11981,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "d7842388a1872b165489624a1a68f536de97e28d"; - sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2"; + rev = "2d421507afead407f9daae694df254b160c4ff65"; + sha256 = "0rshg8b2wvw285j4b8f68hp4ilfsk324yh4inshj19c9lkbgqp39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -12002,8 +12023,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "c95ca9f21a3524718a83c3415bb7102a508154be"; - sha256 = "1d1hrd57k23gg5sbm49y17a1ly55d0d07if2sm467sa0b12zk45m"; + rev = "878cc63ece3d9721f36f15aeca74a270d496adf0"; + sha256 = "094gss26440gikiq7d9bh7rmdy4bhnwq1bjdy7d8rr8d282x6ivm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12082,12 +12103,12 @@ dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dad-joke"; - version = "20170626.252"; + version = "20170802.420"; src = fetchFromGitHub { owner = "davep"; repo = "dad-joke.el"; - rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9"; - sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr"; + rev = "973f66781bb4ccc01434d30bbff833cbbbfe1605"; + sha256 = "0am97ls9z4awak4y78xhdyzbs93vwk5jks9c48lhjy7vq3vr21zf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; @@ -12103,12 +12124,12 @@ dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-light-theme"; - version = "20170724.1403"; + version = "20170808.1440"; src = fetchFromGitHub { owner = "dakrone"; repo = "dakrone-light-theme"; - rev = "5f1d506a8047cf8790ab50baf08b539645af6299"; - sha256 = "1kadp8h97zz26d3br0y9bakwi90c7rwgjya9z46m0mx9jjlpx5yw"; + rev = "06f198dc8b4ca7421990b30a23d89c8e0b8c5de4"; + sha256 = "01vqlsv44h2ah79c8jqv8vkqvgmhqx2w3qbq07l7fx3zkpgjfmpy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme"; @@ -12124,12 +12145,12 @@ dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-theme"; - version = "20140211.2045"; + version = "20170801.1233"; src = fetchFromGitHub { owner = "dakrone"; repo = "dakrone-theme"; - rev = "281ac9f9080a94bf9dada2f40cdba58e50f94235"; - sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy"; + rev = "232ad1be5f3572dcbdf528f1655109aa355a6937"; + sha256 = "0p51zni42hv090vv6mk9v0v88achmgxlsmlr40y8y6ng57w51r4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dcc07077b47d7c710c7f2d4919d791ed16ed5b26/recipes/dakrone-theme"; @@ -12166,12 +12187,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20170726.1140"; + version = "20170809.19"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "ac13c74b76aaf646af2bec9d01fe29f1725baac6"; - sha256 = "1k51pm10qkp2svbzlajswgsyghad8v91djir6iyfdjl54qjhk56y"; + rev = "57c66e4741505b1f1c8147d413064d05cabfa69e"; + sha256 = "07g5x1shx6l1wn12jna4qr7ikn1d0whmksvgc5g2rj7p7j021yv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12208,12 +12229,12 @@ dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dark-krystal-theme"; - version = "20141115.2301"; + version = "20170808.600"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-dark-krystal-theme"; - rev = "bcb3c4ccf17db541e319d60e2eca38a5b22d5664"; - sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx"; + rev = "79084b99665dc9ffb0ec62cc092349a5ecebebbc"; + sha256 = "1d3cdsaba71qxdqrbj1jrlq8a0iw3h50l5grcdjvxixdnf5nsa4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/dark-krystal-theme"; @@ -12917,17 +12938,19 @@ license = lib.licenses.free; }; }) {}; - deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "deft"; version = "20160610.1739"; - src = fetchgit { - url = "git://jblevins.org/git/deft.git"; + src = fetchFromGitHub { + owner = "jrblevin"; + repo = "deft"; rev = "86825cd420985112d9dd38060e0edb72b08c6dab"; sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft"; - sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; + sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp"; name = "deft"; }; packageRequires = []; @@ -13107,11 +13130,11 @@ dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; - version = "20170427.732"; + version = "20170803.354"; src = fetchsvn { url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/"; - rev = "97"; - sha256 = "077iz1fsw22rhzlsigslx5k6hsk1xny3kikr4gcwdmjd28yh7nvg"; + rev = "99"; + sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m"; @@ -13403,8 +13426,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13420,12 +13443,12 @@ dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-collapse"; - version = "20170719.346"; + version = "20170806.1203"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13589,8 +13612,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13610,8 +13633,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13736,8 +13759,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13757,8 +13780,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13818,8 +13841,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13839,8 +13862,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13856,12 +13879,12 @@ dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-single"; - version = "20151230.1758"; + version = "20170804.544"; src = fetchFromGitHub { owner = "crocket"; repo = "dired-single"; - rev = "71ffc5decd048d3c420d9cdd5ac66e72ca18e934"; - sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2"; + rev = "0dcc645de6397bf12c33229de67a503e4490c618"; + sha256 = "16073xjfx7cvv9g8dlyxwa4ca6x35vwarqq43mrl05nxcq0rfzv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single"; @@ -13939,8 +13962,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "673817ea0c6eadca205d7964b41a4f934f4ea9e1"; - sha256 = "0sb4hwfinfr2qkrg5hx83nzngcpd8ba4cv1i7qss426mid0gw6zw"; + rev = "47f955a2dee9b064ce16db9929737ef4af6c941a"; + sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14646,12 +14669,12 @@ dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dna-mode"; - version = "20130821.1105"; + version = "20170804.114"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "dna-mode-el"; - rev = "c3fed6b9d98deafbc1525d445a920b969120fe6a"; - sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n"; + rev = "471d374de22c33eaddd8e41dd8ae29753fab2f6a"; + sha256 = "05zsaypyavyn7gs0jk63chkxkm2rl4nbrqgv6zxrbqcar7gv86am"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode"; @@ -14759,16 +14782,16 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "20170730.1527"; + version = "20170808.58"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "a38b64aecd037556c91d9aef29f1d04496295f2b"; - sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds"; + rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c"; + sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode"; - sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; + sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g"; name = "docker-compose-mode"; }; packageRequires = [ dash emacs yaml-mode ]; @@ -14906,12 +14929,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170727.1321"; + version = "20170809.734"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "70e99c07e626774f52008cacb3f7fc18453d97ce"; - sha256 = "160m5f05l32372i9qj611zmkf6bj5f7vnjprrkkx29ldz7f5pc0i"; + rev = "1cc44b94bfe960de7c5fbae0bd18ef33433f4e00"; + sha256 = "1axcyfwxxq0c2kixkmzw2lfhfcq97bgfajgawikk58p0hahdhxs9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15023,6 +15046,27 @@ license = lib.licenses.free; }; }) {}; + dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dotnet"; + version = "20170808.1423"; + src = fetchFromGitHub { + owner = "julienXX"; + repo = "dotnet.el"; + rev = "514d36ec1090f78c999a7d6614176f03a0065a9d"; + sha256 = "1cg5hmkay5zj7ax8dnwipy5vsx2vg3ragvqbzizv71qasyr5vyjh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet"; + sha256 = "06k1ikwg9bis9kk4r41bm0a0d8a31wscqyr6n99d7836p1h4jfki"; + name = "dotnet"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dotnet"; + license = lib.licenses.free; + }; + }) {}; download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "download-region"; @@ -15341,7 +15385,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1803635"; + rev = "1804597"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15840,12 +15884,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170730.2031"; + version = "20170807.501"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19"; - sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md"; + rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c"; + sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15921,22 +15965,22 @@ license = lib.licenses.free; }; }) {}; - ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20170520.130"; + version = "20170802.113"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1"; - sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q"; + rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83"; + sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg"; name = "ebal"; }; - packageRequires = [ emacs f ido-completing-read-plus ]; + packageRequires = [ emacs f ]; meta = { homepage = "https://melpa.org/#/ebal"; license = lib.licenses.free; @@ -16447,12 +16491,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170725.1610"; + version = "20170802.238"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "1884ac61c2d8045bbb96465df7e29b2c740c48ed"; - sha256 = "1c8h7vndcf4dwp5zlwsdnw3mkmxmjifn7m660pnpxj52s2da3801"; + rev = "1e75aa41aaf61ac26cd833635f9d61d44065a915"; + sha256 = "11ym09hijk3dy445pn826r7ng27w2032id3h1pzk0nzfq9zxhwlk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16552,12 +16596,12 @@ edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20170729.659"; + version = "20170804.343"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "b3508bc998cebd4946b591d61b0bb4d5a56ef704"; - sha256 = "0r6g8pzf94n3h56fz933hq8jxf7chpj3kbgykj3ffabxkjxfn2rg"; + rev = "42c69a845bfe1c123d6e2a773c22931892ab85ac"; + sha256 = "0a629i2d6kjzmhrnji0x8320k93y8kwf7bb6r1acz83gh60smd3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; @@ -16602,12 +16646,12 @@ eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eg"; - version = "20170730.849"; + version = "20170801.617"; src = fetchFromGitHub { owner = "davep"; repo = "eg.el"; - rev = "4d9fb8f2f4905c25aefd0759e89fa13cb994cdeb"; - sha256 = "1d4lcf48m8ac2rmszx7l0nkmfr28fv2g3flwwpmb4zjkhz2k1gw0"; + rev = "03177033ebaecd4e9888cad35951cf4c2addfc88"; + sha256 = "0jf5fvakq6qvd351ad7lsx8j1xd70ygr582abksp3pgd88sn0r2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg"; @@ -16726,12 +16770,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20170725.1457"; + version = "20170803.629"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "4f5f29d3516d687025ad9423dc98bcd202efed56"; - sha256 = "17243a77m7y4abiwscf885wmci1mkln4axay49f44cyfcj3fk2i2"; + rev = "f47f020336f5ee32bfe7d27c53f6ca10eee2bc16"; + sha256 = "0lpmg05yfza0c4bgj9gjgz3d48pnizvsjjdk3qdw6sz748k9k415"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16932,12 +16976,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170723.19"; + version = "20170729.1712"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "cc26f37e19ebc60ca75067115d3794cda88003c5"; - sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w"; + rev = "f598a7537710f929c6f7592d8c543768361ba0de"; + sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -17119,12 +17163,12 @@ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2org"; - version = "20170502.550"; + version = "20170804.2142"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "c85837d56ed8fe1b31927755294db49ac46f443e"; - sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6"; + rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; + sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -17607,12 +17651,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20170729.338"; + version = "20170807.1924"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "e3fca6d8f5bc176de26d37fe9c1b3e129f79cab0"; - sha256 = "1p30k2bws9r3j4dmdxin1dz31d751wyikqgyqs9wzcddk0cfrm46"; + rev = "4d44a51603b4004192d62fe58beb12c029709d89"; + sha256 = "13rxgak84hqkqha86h75l1yvk9yk648sqk70pblbi0309g8sqb10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17908,12 +17952,12 @@ elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-buffer-group"; - version = "20160105.803"; + version = "20170808.1825"; src = fetchFromGitHub { owner = "jeffgran"; repo = "elscreen-buffer-group"; - rev = "06ea9384a642ff5c3a93f36aee9f5d6b5c17657e"; - sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz"; + rev = "a3cd4d7eae3cca87bede4b39a46d3c0641f8cd06"; + sha256 = "0flja2j5xqhxc0qrclnxcpyzvn7gyjynfpa3mp1hb250c313igy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6fedb7b6ef58089da4b35ad115f699b4b24ff2/recipes/elscreen-buffer-group"; @@ -18013,12 +18057,12 @@ elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elvish-mode"; - version = "20170729.1702"; + version = "20170808.1511"; src = fetchFromGitHub { owner = "ALSchwalm"; repo = "elvish-mode"; - rev = "72ac8385c0dc923ce2385f1e8c4aee3f6ef99d1c"; - sha256 = "0daw0wgd7rpdp78dsacw8kr2kcrhqg4082wdbzl14lyimpmzm4fy"; + rev = "4511171f2d8ee01d8a7b76c64f552fe5258af79f"; + sha256 = "0h4b6r3qbvcr1hgs2fiv3csq3iw11n0ilsv7dafn427gbadf0krf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode"; @@ -18055,16 +18099,16 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20170712.510"; + version = "20170805.449"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "elx"; - rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d"; - sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq"; + rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; + sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; - sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; + sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz"; name = "elx"; }; packageRequires = [ emacs ]; @@ -18160,12 +18204,12 @@ emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20170410.1218"; + version = "20170807.1901"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -18185,8 +18229,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -18206,8 +18250,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -18223,12 +18267,12 @@ emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "20170410.1218"; + version = "20170806.1551"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1b37570bf5813e160fa18a766e20dfa690910519"; - sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0"; + rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04"; + sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -18927,12 +18971,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170731.425"; + version = "20170808.1134"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "6f6978d41126803ee61f614c91e791e6b5a36e38"; - sha256 = "1acqi07n3yncv2mz2qm6c46b2381j1fjmmrrlcg3yb72inqr73y7"; + rev = "08e6b4d98d1afeb637f27432349b4833320808a4"; + sha256 = "0yr4bfp5shvm49qbr9k47ayglr7im65d0is770brjfbxcb68ry95"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19568,8 +19612,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "e25f673d520342bfe7cd479ef6b850a57f8ab1ea"; - sha256 = "11gx8rqgxxnadgb1hizv6rdj7s9ib9m7bg8rm0ncvgrmykfaq8wm"; + rev = "48e35d38d7625a10395b03edb4337668abaa4905"; + sha256 = "15cq0gzczvin8xkdxrfj37819gx7hzdrcn5hx41q39cn1qzswxm2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19731,12 +19775,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170724.1307"; + version = "20170803.1433"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "28f06589e07a22b7a1a1b19f79472c0bafb5fc32"; - sha256 = "0413706dxmql9sl2rwi7y9pqdka73lnpqwn5cvl2y4r279hdppv3"; + rev = "2e00707f42276b59fff2a32c64703e9586b22ae6"; + sha256 = "0kcrca7f33020hxhx30vqdf21j1w32lvn28ys8g7gwa20nq05zb3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -19899,12 +19943,12 @@ eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "eshell-fixed-prompt"; - version = "20170108.1301"; + version = "20170804.635"; src = fetchFromGitHub { owner = "mallt"; repo = "eshell-fixed-prompt-mode"; - rev = "0b1d7cc05a7f59e8c06c321401cea86c6cb068af"; - sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2"; + rev = "4351b214de6d4e8e45279930448e2f93b491848e"; + sha256 = "1zx3zn28m5dnvsnkpqd26szv9yzplnb6wyp9vfjfs3hnasrizbxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt"; @@ -20399,12 +20443,12 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20170731.943"; + version = "20170807.1433"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; - rev = "e2c6506a4d333ceb99dc64c34944beb0b34431c8"; - sha256 = "1knphaw3sw20wjvyqs9a1ppx0r04xif756ixxb2ymakhb8g0ifbh"; + rev = "f64c117b62a3715c438bfd85851029c1b4a45748"; + sha256 = "1fqasd25hgif1q9j6rxqqwyrqg48ykb5g12w34jsm8zgg50n43n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; @@ -20546,12 +20590,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170726.912"; + version = "20170802.1333"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f"; - sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1"; + rev = "45712ad214b0ad2257814705d6baa3f9120574cd"; + sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20903,12 +20947,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20170724.211"; + version = "20170808.404"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "879114abeaad8515937cb2a762d0438b6b7bb026"; - sha256 = "0zia2z0nvsxmplg1d6dy45dj5pkvak2wqn7dw10yb9bj0shfhjmv"; + rev = "513ba2eb3ed7f579b9babeff0d2d0e0b0a37c69f"; + sha256 = "0gq7wlix1zfvlcn901jcr10pfzphmsgmsymqq2pblc8d54nhv4wj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21008,12 +21052,12 @@ evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-lion"; - version = "20170523.450"; + version = "20170801.2232"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-lion"; - rev = "79766bfb8cbaa82af92eb9c90ea370e10ff74ea4"; - sha256 = "1799gjd1qj6hdzdy88x7lw0xwygkh70zm0y5gkhlmn4rzkdka9j1"; + rev = "6667fe9891350b00596a8a335a68261c1f5ab504"; + sha256 = "1j3xy7b0b0rf1zznqjgd9gw1369w75h7i0kgmwgngn8xg5w9jl9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion"; @@ -21281,12 +21325,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170724.752"; + version = "20170802.1428"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "fc21477b2ac12b570c8428808f334d467a617e86"; - sha256 = "0fqk11mq4l7q7c5dv8049pmsggh3cmy4fhhq7c6h36dij02fkf01"; + rev = "1725325eae0e3bf3609cb1a86effaa790afcc5de"; + sha256 = "0r9n7yqj9fdcqpz99fwjnln9w0w5lqhsgyipjvihb56plrrc2w8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21411,8 +21455,8 @@ src = fetchFromGitHub { owner = "naclander"; repo = "evil-search-highlight-persist"; - rev = "6e04a8c075f5fd62526d222447048faab8bfa187"; - sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6"; + rev = "979d2dec58d3b9c5ca5fdf4bb802a0209913794e"; + sha256 = "0ak8r7cgz5xnjyfg3w9mwxhvaw8ny3hy0i2bqn3vf5dps649iy7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist"; @@ -21449,12 +21493,12 @@ evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170702.302"; + version = "20170806.1150"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "c50372d152b123fbf7bc26b49504505a22e82635"; - sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27"; + rev = "e247d6980093633f04431967819bf10b0d23c59c"; + sha256 = "1qv8f45g864vhx7k62gcsivmalq2vaqpvp1klc773d2y0k2b2w0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21579,8 +21623,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "41847fdc4dd183b5ca23c097bed17bdf2d9d9f7f"; - sha256 = "047af7a76zi0xi8hbgr3a9c251vlnjqh78qxsxlv62czzv9nxzi1"; + rev = "45712ad214b0ad2257814705d6baa3f9120574cd"; + sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21886,6 +21930,27 @@ license = lib.licenses.free; }; }) {}; + exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "exotica-theme"; + version = "20170809.558"; + src = fetchFromGitHub { + owner = "jbharat"; + repo = "exotica-theme"; + rev = "fbb34138ec48d505ac64e8141590f87777d82c2b"; + sha256 = "03k6vj4ckgccfrl906v0fpwxvp5gzkcsd3iy8k7h11jdbyhlbb3m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; + sha256 = "1fzf1zpllkddkq02hvabbi2bh6rnanlyinb6fjwsyh39wvzhsfhs"; + name = "exotica-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/exotica-theme"; + license = lib.licenses.free; + }; + }) {}; expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-line"; @@ -22015,12 +22080,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170708.1735"; + version = "20170809.413"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5"; - sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds"; + rev = "6adaee93a4f84806cf197dae872f00039a3ca87e"; + sha256 = "04h8qjlvcnafs6771k4k2fsrg36j7b30dfmb9whrggs0lmsb5agq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -22742,8 +22807,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; - rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27"; - sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79"; + rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a"; + sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize"; @@ -22986,12 +23051,12 @@ firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firecode-theme"; - version = "20141115.2302"; + version = "20170808.611"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-firecode-theme"; - rev = "73573192e5e9d14d94dfc5131dd2b7a780b89626"; - sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm"; + rev = "8b7b03ecdd41e70dab145b98906017e1392eaef4"; + sha256 = "1vrpnv7555mbsksflgdkg7hc65fjcyzvzv2261y043rlh2qrn0sy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/firecode-theme"; @@ -23114,8 +23179,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3"; - sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z"; + rev = "a0fd233bba6206854c5d7365d7182aaae842f210"; + sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -23156,8 +23221,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338"; - sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412"; + rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77"; + sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -23243,12 +23308,12 @@ flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flatland-black-theme"; - version = "20141115.2230"; + version = "20170808.612"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-flatland-black-theme"; - rev = "75fc4f1815feb23563a60477c02d70326b45c59e"; - sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1"; + rev = "348c5d5fe615e6ea13cadc17f046e506e789ce07"; + sha256 = "1g5jqxdk35ahx8qk4vi7whhcpi1qp7rbbjgiih974fs59cg5iki0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/flatland-black-theme"; @@ -23429,12 +23494,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "20170725.127"; + version = "20170802.1500"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0"; - sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b"; + rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f"; + sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -23555,12 +23620,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170730.1740"; + version = "20170802.22"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "c451140ef785dd7853445121866f9ea45889255b"; - sha256 = "0vnpnv7kcbgdrpnqw9mb3qn5lzi4493k8b5jwwl6rz5hrl84yrx3"; + rev = "ed08ce36e5cc97cfabb84ccaba84a00db917f082"; + sha256 = "1r6lrxc8wv73fh4ybq83awci92ajrbgila8b86vxgvhvhl8jcj6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24231,8 +24296,8 @@ src = fetchFromGitHub { owner = "stardiviner"; repo = "flycheck-inline"; - rev = "d24e3772b0ac6e40306ff25cebd7c6add696d54c"; - sha256 = "0hgcgyjrbdqsgf54wa3j6mkq41nq28n2hyysdgfgnn4kd2jmri40"; + rev = "624957ec04164f03656bf2d0a5ccd6d2b013f545"; + sha256 = "1qrwci7d5g3c3s2z888hydsa22hhiwlarq3im8w2crlzx5lhnbz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline"; @@ -24602,6 +24667,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: + melpaBuild { + pname = "flycheck-popup-tip"; + version = "20170730.651"; + src = fetchFromGitHub { + owner = "flycheck"; + repo = "flycheck-popup-tip"; + rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c"; + sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip"; + sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx"; + name = "flycheck-popup-tip"; + }; + packageRequires = [ emacs flycheck popup ]; + meta = { + homepage = "https://melpa.org/#/flycheck-popup-tip"; + license = lib.licenses.free; + }; + }) {}; flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; @@ -24714,8 +24800,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24924,8 +25010,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6"; - sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25487,12 +25573,12 @@ flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-solidity"; - version = "20160424.720"; + version = "20170804.2344"; src = fetchFromGitHub { owner = "kootenpv"; repo = "flymake-solidity"; - rev = "b9a9aa78b84b2358c24a73a84fcd3d133a0423f1"; - sha256 = "06ndpccsqrnfgxpgsywgq81ykkxchm2dp0q2617klbihwngfr8w4"; + rev = "48bfe9525f764d8a68cc0270905dbf45bfd00bb8"; + sha256 = "0v8sf5m0mygqahjyadxgffdf7p59wb0qnghyxajhc69sbg58hnnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity"; @@ -26359,22 +26445,22 @@ license = lib.licenses.free; }; }) {}; - frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; - version = "20170129.120"; + version = "20170802.455"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28"; - sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v"; + rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661"; + sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h"; name = "frames-only-mode"; }; - packageRequires = [ emacs seq ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/frames-only-mode"; license = lib.licenses.free; @@ -26517,12 +26603,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170730.1659"; + version = "20170809.146"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "f521a27332898aecf5b2ee710d67e1bcca380641"; - sha256 = "07lbjdiqyazvylk4ddb9789kyrnlllhnf67c770lsaagxn69scks"; + rev = "6e21d45c29dd03e6e6ec5d43f95b7a81832c3ca9"; + sha256 = "0fzc9b87qlp5phr9gxylnfsi2749zgcs5aqabqdc3fpqqhb7hhy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -26543,18 +26629,19 @@ license = lib.licenses.free; }; }) {}; - fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: + fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170709.139"; - src = fetchgit { - url = "git://factorcode.org/git/factor.git"; - rev = "bfd830f6b4b4c01a64a287395ea62d8e671b0891"; - sha256 = "1xnh1qp8gmn6g9sm0l1sh8k9j9x3y0vns8h5wh1i22bs420rl1w3"; + version = "20170805.2030"; + src = fetchFromGitHub { + owner = "factor"; + repo = "factor"; + rev = "3faad21b3d02fe81a2c0fae13ed14ad6652accc1"; + sha256 = "14h2mwg0ny3mn7hjqgb9r5661ar2jwamz90v69bx0kz0lmr9drmz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; - sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; + sha256 = "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z"; name = "fuel"; }; packageRequires = [ cl-lib emacs ]; @@ -26629,12 +26716,12 @@ function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "function-args"; - version = "20170303.515"; + version = "20170809.1011"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "a559041e5fed851c889bcfed7553a4dcd855ffae"; - sha256 = "0cc9djbsr3i5w9zsiblk1f9y45czkiwjmn32kzf3fni4rxwvc8xk"; + rev = "00a73c8ca4e6fd1eb5ea84e6fc9b277694713ba5"; + sha256 = "1higgnmrpp307vl9zb4qd40dcch9mwqmln1wv6v0a2kvzhd8nd21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; @@ -26675,8 +26762,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "68037c3af786aad0a605847278393babd0095203"; - sha256 = "180hxfh1igkhfnwd5613gvnqk1rmsncfyi28yd0plqryi3495822"; + rev = "0a1ca0538cc8a72f6065140b893001d5ec9d04b3"; + sha256 = "0i4rm8zkfa0d3arfwvhwbzxkbflhccj5202rqmgmjvkg18skl5l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26938,12 +27025,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20170620.2012"; + version = "20170801.551"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc"; - sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg"; + rev = "ec3f5e9376cf1ea5615990bd8c212543d57f033b"; + sha256 = "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -27005,8 +27092,8 @@ src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd"; - sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77"; + rev = "dd08e3d83d070eb8d041d66217b4591a55729024"; + sha256 = "1mchrrrygwxy2ivnh7zfv0bqqvwinh61b5204yvivw303rfyc2iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27316,12 +27403,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170728.849"; + version = "20170803.601"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "e85479bf048e06740331234a67c07bcdb3e294c4"; - sha256 = "1sh8cwaaxlg0ja59lg70hl1lyhl9i7bfkamq3qz7kl2913axnzw2"; + rev = "887ba91d724c656c35fed3eecd2e7d826553ff91"; + sha256 = "1ngin66i3rn0j9wz1lhc8nh1saka924ilnw4r91pkr7gsyd3c20s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -27337,12 +27424,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20170517.1445"; + version = "20170806.1323"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "07bd117a77d2f2de88facfa18b839c5c8bd5a423"; - sha256 = "04k3xvs33vv3g01ah16bc4l6f3ym4w16i9bk5q2s4f1xh4lad3jn"; + rev = "153c194718abc74a49078b056c87959a39b35627"; + sha256 = "08svh16jdiz3rirk2wba6gwf8m3hhrhazlyb7idn4y22zc0am254"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27358,12 +27445,12 @@ gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gift-mode"; - version = "20170603.906"; + version = "20170809.130"; src = fetchFromGitHub { owner = "csrhodes"; repo = "gift-mode"; - rev = "0d6adae976ee0831877d4bf237090ff67fb76e1d"; - sha256 = "1ld367qvyn7700mry24j4ywmanaknpwgfmq18h72sn408z9vsalc"; + rev = "573e4a8001e9585d347a99323a1649c2055ae5ff"; + sha256 = "0qhhgwhj5nghlq5nrz7ycy2y5s1q10xzsahlh41fm5givm0rb650"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode"; @@ -27530,8 +27617,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; - sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; + rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d"; + sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -29124,8 +29211,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "6c8669edb20249cd5534c78cfb48e7cf0978dda3"; - sha256 = "096jmch5wqzal8qd6f72bsh0wi1fwlmjsis4n888942mq84vk8jw"; + rev = "77f7f28d314862754877bf19a8b032158522f7aa"; + sha256 = "0354zk5j5fgin66vc9m63ca272bfq3vlqj5v34xqz26lqs3fpdb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29391,12 +29478,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170629.1129"; + version = "20170801.942"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "fb0cb14954e799dfa69d1aaf56e863db48c2c296"; - sha256 = "076bdkswajjzxb1jhwq71rwz8pn9klxk68r2ldab3pk9wlih4adn"; + rev = "2cad15190b417804d82edb4981e7b3e62907c4ee"; + sha256 = "12zssdd23hm5l27lja8q8b78wzq8zwzx8sxpqaqsm53bq6w23jmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29412,12 +29499,12 @@ govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "govet"; - version = "20150428.1159"; + version = "20170808.1024"; src = fetchFromGitHub { owner = "meshelton"; repo = "govet"; - rev = "736f11850f2d1d62bd417fb57d4f8bb55a176b70"; - sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb"; + rev = "1c05817cf8b96589076c7ac4e52ee58a860a0cbf"; + sha256 = "1n223i87xmk8p8h8dswnhhvazy0z53dzl36gmk9y7ck8bd9vz706"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e4a5f5031c76056d8f1b64b27a39a512c7c59cd/recipes/govet"; @@ -29521,8 +29608,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "785067783c93278de73cf4abe7fbf29b59b1f686"; - sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv"; + rev = "5a80ee1f6d026d6bf89320fcbe2b47f253c905a7"; + sha256 = "1312sfr0nyl8bd2rjjm27l7x2hx9mby70bay0zyhyqznj12hlwpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29881,12 +29968,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170731.150"; + version = "20170808.1211"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "785067783c93278de73cf4abe7fbf29b59b1f686"; - sha256 = "0wdy7n8f447ngkqnkz5khybps92pavy6d8nmlv0pf7kai899hczv"; + rev = "5a80ee1f6d026d6bf89320fcbe2b47f253c905a7"; + sha256 = "1312sfr0nyl8bd2rjjm27l7x2hx9mby70bay0zyhyqznj12hlwpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29944,12 +30031,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170730.1820"; + version = "20170809.719"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "813a2165b993014d6a3d02abfd077d711f7372fe"; - sha256 = "1hwv7jqmigwnwdq50dlbi1i8ddq33qi40jhfynh8855kz0c2gqh9"; + rev = "061bad7cbb939540a559b412b1cf2df25b45cbff"; + sha256 = "0wrqjmdipg515idi385d2yk0vxsq5dkdd0qg743ia90kndcfbwda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -30091,12 +30178,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170702.724"; + version = "20170803.703"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f"; - sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi"; + rev = "f85e1bc2666a9d668c808984757862c9aa93d269"; + sha256 = "00iggj2vnjf3sy276mq79ia86ll83p9g426miy3n6ig8pr333sz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30661,8 +30748,8 @@ src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "5a57a6401f6625640f46d8f8d540ecddf52bb12d"; - sha256 = "1262kddcn3jr758s6wv15q3bh8j160q4m8nz2pbv2prabg0csz5n"; + rev = "f0c6a4d07bd18b39010a4bc28340aff4ceebf785"; + sha256 = "15926zw2sj180svn53fmb1x8x8aw7754anbaxb8xbcpg2zrkspbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -30864,12 +30951,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170731.1225"; + version = "20170809.345"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de"; - sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw"; + rev = "35149d27981f0d617ee84d05f7e91ced22b43302"; + sha256 = "0kcdfh9hwkyirfb77hls8xyg1xx5vxxiid921zlxyd42mq2bq0rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31032,12 +31119,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "20170625.328"; + version = "20170807.1239"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; - sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; + rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb"; + sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -31074,12 +31161,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170801.157"; + version = "20170808.1124"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b"; - sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl"; + rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; + sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31473,12 +31560,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170727.1245"; + version = "20170806.2108"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b91b5fc3664a1f8309b1610a660898f45f0fb7de"; - sha256 = "0jlhnc236agfvvjg4mnrb12ikxky4v6a2gnw49yc2rjh7hplpwhw"; + rev = "35149d27981f0d617ee84d05f7e91ced22b43302"; + sha256 = "0kcdfh9hwkyirfb77hls8xyg1xx5vxxiid921zlxyd42mq2bq0rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32583,6 +32670,27 @@ license = lib.licenses.free; }; }) {}; + helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + melpaBuild { + pname = "helm-lastpass"; + version = "20170808.511"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "helm-lastpass"; + rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2"; + sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; + sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57"; + name = "helm-lastpass"; + }; + packageRequires = [ csv emacs helm-core ]; + meta = { + homepage = "https://melpa.org/#/helm-lastpass"; + license = lib.licenses.free; + }; + }) {}; helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lobsters"; @@ -32858,12 +32966,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20170726.1718"; + version = "20170807.611"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "58690a15a06f7dc645175f1b34c9e099ac68f018"; - sha256 = "14z0ivi69ja9zd0qjpf98jp1x8skdp3a7w9yy2h9ffjhm2c7pgaf"; + rev = "0bba7cdced06a93eefc9b04d05fdbddf08ad377f"; + sha256 = "0r9l4q7h5zk8i5f5hac54pvlb0y0nyzqy996lv6r8y2a734angay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -33366,8 +33474,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34516,12 +34624,12 @@ highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-parentheses"; - version = "20151107.2316"; + version = "20170809.1151"; src = fetchFromGitHub { owner = "tsdh"; repo = "highlight-parentheses.el"; - rev = "a821a314942f409cd69660d816cd9a0aebd1ae8f"; - sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r"; + rev = "c38885bba4f174c0a2cad3a60fe12b7cf8699aa1"; + sha256 = "0j3rv7cpvckbsdl7lppgdyxbbznqzds5hvjl1qfwip1plbc8vcb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses"; @@ -34700,6 +34808,27 @@ license = lib.licenses.free; }; }) {}; + himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: + melpaBuild { + pname = "himp"; + version = "20170808.1022"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "himp"; + rev = "dcc116b2509a74a3fab41be1c095e1f6fffc7923"; + sha256 = "00s4bb19jq48bldlcharym4757mbj0z5rag086p7mfhxa3wazmrm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp"; + sha256 = "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla"; + name = "himp"; + }; + packageRequires = [ emacs vimish-fold ]; + meta = { + homepage = "https://melpa.org/#/himp"; + license = lib.licenses.free; + }; + }) {}; hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; @@ -34707,8 +34836,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "0721221ede01d6a3468e562fd7ea0df114de34e2"; - sha256 = "09cyzvk1ixbmnd6wl8idxn0263mgsvcnh1742flvxa5wsbqm9f08"; + rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b"; + sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -35054,12 +35183,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170729.742"; + version = "20170807.1130"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "ace6725f72efd50556f52c359f7b1836b956fa2b"; - sha256 = "1r7vww10dvv843zgmg62wwv2b6fw8nx73lsqzj5j01pi3zxz74vm"; + rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e"; + sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -35703,12 +35832,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20170722.818"; + version = "20170803.1319"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "943636fe4a35298d9d234222bc4520dec9ef2305"; - sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg"; + rev = "ab67b29835ed550427b75e94784b63d98a00c0e0"; + sha256 = "0mlzgql5xrjgbk9f269jnf3kxvymlcwnlvak4dfk2gwvi56phjzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -36093,22 +36222,22 @@ license = lib.licenses.free; }; }) {}; - ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170719.119"; + version = "20170807.1445"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9"; - sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3"; + repo = "ido-completing-read-plus"; + rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533"; + sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; - sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; + sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z"; name = "ido-completing-read-plus"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/ido-completing-read+"; license = lib.licenses.free; @@ -36411,16 +36540,16 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170718.1033"; + version = "20170807.1445"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = "999dd0cc2d88dc82bc4511c6c2b09caf838825b9"; - sha256 = "0s8r7hm6mz5g4w4qdjichz20nbim2a5rg1njpl11v27pdg2x13p3"; + repo = "ido-completing-read-plus"; + rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533"; + sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; - sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; + sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; packageRequires = [ cl-lib emacs ido-completing-read-plus ]; @@ -36764,12 +36893,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "20160831.356"; + version = "20170805.1155"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "94bab9136e1264e98a10d9325ad53d735307f8f3"; - sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j"; + rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3"; + sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -36996,8 +37125,8 @@ src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c"; - sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4"; + rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5"; + sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -37034,12 +37163,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20170728.546"; + version = "20170803.418"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "565c0b984d19c62b7a85efd69ae195b592d62f7f"; - sha256 = "0rqc1n4z2w5i48ma29mrbb90350kxfgzk0vf8wdnksa78ja87yyn"; + rev = "8ea9f4bbe95a118801f8b6a1f5950e331b43876a"; + sha256 = "0sb1c7gdm4ni1jcpb0rz3xgfgs45a8pi4nhks7cm2mly7rb7wvl0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -37076,12 +37205,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }: melpaBuild { pname = "indium"; - version = "20170728.1109"; + version = "20170808.1327"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "a64f1ffc81539d40df9e89802bbebf14a0d19f83"; - sha256 = "0cmh6mv319m4i2y89rl63z2k3634d4ldg18yy3aal44ljxrbdslq"; + rev = "ee843f08cf6f862b298728103c142ce56824dfc4"; + sha256 = "070yw07fcimblzy94pg1mvf7n5dv91wwq7kwyys4zkm92ypl874l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -37126,12 +37255,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170730.119"; + version = "20170809.114"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "aaaeef6a4b1f41ebc3ab11ff28d6fa5938f762d4"; - sha256 = "19qjamjpm96wwv4ni2lbzwrb73d5xwfkrq6lvy32k6rav5r7lx1d"; + rev = "21d3e978652bcbb995954bf95e80c0ee4669701a"; + sha256 = "0g0qs0znys123yr50ykhgiz505spar3q2cgsyn61ky44df2pl4ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37272,10 +37401,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20170730.2148"; + version = "20170807.2112"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0xg4cw8s5ildc7iyyvy6xxri3cy00g06b10022izlhbxy7crdgai"; + sha256 = "13l62fjq7g79s0ycj506fsvi16mmf1kqiqhbrj6f5n2j962k1qaf"; name = "info+.el"; }; recipeFile = fetchurl { @@ -37648,12 +37777,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170728.814"; + version = "20170807.2147"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "28271d50ca65c460cd0983cea13a2c4509b95583"; - sha256 = "0b73cwr68sdi5vc486952x0iv95hwyw79gymp91kyi558wxdssp3"; + rev = "453d6d64c88df8ada4d6b9e4004c392d219e3799"; + sha256 = "13wm0kz4ijl2smpw5ws5v97j19df5m9yw2iv4xgpcg4if9aby67y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -38272,12 +38401,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170728.1036"; + version = "20170806.1231"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; - sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; + rev = "9b071a8fb130fe8391d445706711bcc4de2b3998"; + sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38293,12 +38422,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170801.157"; + version = "20170808.1124"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "e30bfc86e7205a19c757fd0e5659c79b815a119b"; - sha256 = "0di786z1a3jqjx1hwgl2z4qlj547adnbgv1xd5b68ah1bsdnv7xl"; + rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; + sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38402,8 +38531,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; - sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; + rev = "9b071a8fb130fe8391d445706711bcc4de2b3998"; + sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38507,8 +38636,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39236,12 +39365,12 @@ jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jg-quicknav"; - version = "20160216.2035"; + version = "20170808.1830"; src = fetchFromGitHub { owner = "jeffgran"; repo = "jg-quicknav"; - rev = "1b598ee3d691b68dc64f1727a959eab538893d07"; - sha256 = "164wm83av3p2c9dkhpmqrb7plq9ngmnsa5aly3a1xam1cds22hp4"; + rev = "c8d53e774d63e68a944092c08a026b57da741038"; + sha256 = "0rdrryfppgj5smrds5gyyhc4z8x36aq3gxdpckq80rbl4s729chy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/jg-quicknav"; @@ -39465,12 +39594,12 @@ js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20170627.1952"; + version = "20170808.527"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "2c19fafed953ea0972ff086614f86614f4d5dc13"; - sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp"; + rev = "eb4744122724b24e492c2171fff438e3ee2045a8"; + sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -39591,12 +39720,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170721.602"; + version = "20170804.335"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc"; - sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy"; + rev = "91c745ad062d454834f646dcd16be6856a1db8b3"; + sha256 = "0qr2pd2zhhwl6jw8mqy25wnig9v9nicc7plan0ni4dlbhljrx3rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -40027,6 +40156,27 @@ license = lib.licenses.free; }; }) {}; + jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jump-tree"; + version = "20170809.708"; + src = fetchFromGitHub { + owner = "yangwen0228"; + repo = "jump-tree"; + rev = "ff010ee6acfa9bee2486dd7b3384c12a802b0191"; + sha256 = "1w7sncr5gdlyqk3bvm7zjif5yxp9sa6v82kk5zx04qdbsn9dn308"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree"; + sha256 = "1gknpwd1vjpd1jqpi2axhyi6sg4clarr32rfrfz6hi6kmzr848mj"; + name = "jump-tree"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/jump-tree"; + license = lib.licenses.free; + }; + }) {}; jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jumplist"; @@ -40153,6 +40303,48 @@ license = lib.licenses.free; }; }) {}; + kaleidoscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "kaleidoscope"; + version = "20170808.117"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "kaleidoscope.el"; + rev = "e932103e043bd1503bf5d98dd117ff6737b852bc"; + sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope"; + sha256 = "0nfz207rzpnni7jyzvdvz5lr0zcpzy278a86821cmw8d5l81a3yp"; + name = "kaleidoscope"; + }; + packageRequires = [ s ]; + meta = { + homepage = "https://melpa.org/#/kaleidoscope"; + license = lib.licenses.free; + }; + }) {}; + kaleidoscope-evil-state-flash = callPackage ({ evil, fetchFromGitHub, fetchurl, kaleidoscope, lib, melpaBuild, s }: + melpaBuild { + pname = "kaleidoscope-evil-state-flash"; + version = "20170728.320"; + src = fetchFromGitHub { + owner = "algernon"; + repo = "kaleidoscope.el"; + rev = "e932103e043bd1503bf5d98dd117ff6737b852bc"; + sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope-evil-state-flash"; + sha256 = "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq"; + name = "kaleidoscope-evil-state-flash"; + }; + packageRequires = [ evil kaleidoscope s ]; + meta = { + homepage = "https://melpa.org/#/kaleidoscope-evil-state-flash"; + license = lib.licenses.free; + }; + }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; version = "20170418.110"; @@ -40196,12 +40388,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170725.514"; + version = "20170802.1135"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "96619e8c330dcb5a0b45bde1fb2a6697729d3541"; - sha256 = "1i8jk2l703ikmkqb1lf6mvrldb05kfp6gnak26lpc9s7pb4m8mhn"; + rev = "37b5b837051834cf7f8eb5b486d8b04b021433f3"; + sha256 = "0bmzfc337pv3scs717yhyw0vsrp864s6l255afli0bd2hicncnaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -40599,8 +40791,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041"; - sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq"; + rev = "415de48695efd30163a015063873b03f4ca5b743"; + sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -40704,8 +40896,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "22aa73f55b5943fb464c3335978bf9b38daa39e1"; - sha256 = "1imb37jmnybimyjl1j3fqja2yxjl8h7cn0pzkmchl6gv3yyw3w01"; + rev = "4b77edeaf193c1e7dd2078b9516ce2cd20fe99f9"; + sha256 = "0s1g1fkq0m68l7ly0i1jhf1jk7abpx0kiwgcv734gb4b2ddc625n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41015,12 +41207,12 @@ kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; - version = "20161016.1827"; + version = "20170808.602"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "kurecolor"; - rev = "2b2c6778d75ef90f42fdffbe3ba7e58fa661946a"; - sha256 = "0zcqjphz2vad6jccw9z7fds8xmvv0vmgp7fi0d8i0i5fbhpwpfz7"; + rev = "3e8b63e89e294179e42a14a4a357c29a72669a22"; + sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor"; @@ -41202,12 +41394,12 @@ lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lastpass"; - version = "20170418.1102"; + version = "20170801.1214"; src = fetchFromGitHub { owner = "storvik"; repo = "emacs-lastpass"; - rev = "ff05ae82b1073759989616caf362c85575fdfc58"; - sha256 = "1wsnb1w3q2b0lj6087njy0r5nnlyddrnqyxkbv6p6mbqin1zkahs"; + rev = "a2c94ff358db43a977d02032ba84ee1008579522"; + sha256 = "1nc21pf7cmbfidnilk6012h7124yxhkhzwim7yg95sqcmr8ws9js"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; @@ -41390,12 +41582,12 @@ lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lavender-theme"; - version = "20141115.2302"; + version = "20170808.613"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-lavender-theme"; - rev = "d9e4d7838167a0e07fb5d04877a7b34c4b4cc1ee"; - sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k"; + rev = "ef5e959b95d7fb8152137bc186c4c24e986c1e3c"; + sha256 = "0pbpns387fmalkakbdl2q7d2y720m7ai7mnydsinjwlkdrshvj4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/lavender-theme"; @@ -42401,12 +42593,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170716.827"; + version = "20170805.1249"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "cee63ee3591eb0f498ace801f1543a4bc6b58514"; - sha256 = "1h6m8qixvl9mnj6lmkqwljvyv65c6yb683krxrrbs4nrsy41z6s3"; + rev = "c1a2903fbe4c7212960c886143105caceb3faff2"; + sha256 = "1xv5yid7hzja97lvsfycpw9ss2yd69dzvjp9a54xp79ydvxwcc0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42508,13 +42700,13 @@ pname = "llvm-mode"; version = "20150910.644"; src = fetchgit { - url = "http://llvm.org/git/llvm"; - rev = "ca05253041c3e241f3987b430771f5db8aa35806"; - sha256 = "03w7w70hj7nrhr0hsrxfbi8hrmxrbbhi2rzmzzk6pv1r9l7krjbd"; + url = "https://llvm.org/git/llvm"; + rev = "c85760a9a3e892fb31ee1fab1e16393c5bb1ff1e"; + sha256 = "0p7kja62xph1nmmpa4mbi3n8ipp5pjb8xvwbn6rfw3s2m8vmwjqg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; - sha256 = "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; + sha256 = "0jxwa7gaxv9kkgjp87ggzlfqbf6xs19z0s9ycnv2h5hlxpnzrlnb"; name = "llvm-mode"; }; packageRequires = []; @@ -42526,11 +42718,11 @@ lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lms"; - version = "20170731.1219"; + version = "20170804.922"; src = fetchhg { url = "https://bitbucket.com/inigoserna/lms.el"; - rev = "5f20620f62a1"; - sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9"; + rev = "f07ac3678e27"; + sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms"; @@ -43199,13 +43391,13 @@ version = "20170728.1240"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; + repo = "mac-pseudo-daemon"; rev = "d235680a72677f11925b912428ad1a57b664e3e8"; sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon"; - sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon"; + sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0"; name = "mac-pseudo-daemon"; }; packageRequires = [ cl-lib ]; @@ -43362,12 +43554,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170731.914"; + version = "20170803.828"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; - sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; + rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d"; + sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -43516,12 +43708,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "20170725.1850"; + version = "20170805.819"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "ea578e8adf1ba2f98934660bd9db01cfc074b334"; - sha256 = "06w281ir0iwlmcad26b2zkk08ympw190znsll9pdlcdvzyrsl5nl"; + rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; + sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -43583,8 +43775,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "0ffd49d48b14e7acd107ccff3efc2d8704ea26a4"; - sha256 = "0zzxs5jpd6inh6bapyq1vq87yangf988lw24ywm783rawzdbcj4b"; + rev = "f7c8924ca85fa0671c3c4c54d5e1cbe6106f3e8d"; + sha256 = "02sayw24f2qc8lg8dm119zprrfn17pc0msq15vj9m9gxwilwnxrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43705,12 +43897,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20170730.723"; + version = "20170809.657"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "4ebcc6890ed53d789869da85a0bcb33c2b210801"; - sha256 = "153pcx585hhinj10bsfa5hlzx6lr768dyrwsv3wm16wfli53p18v"; + rev = "5c3eed698fcbae53399e8c9d7d728943a516adb7"; + sha256 = "1jgc0w5mwy2pg51yhca4hdhrdqkv7k33pbj1151wgway2zil00yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43772,8 +43964,8 @@ src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mainline"; - rev = "0e88f91e49ef27cb77d74f6a8d8140063549d67f"; - sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5"; + rev = "2ef3175854f5b6c85f2e1bed26507cdca2f6ad16"; + sha256 = "1zkm51gp1lkaz6n8ixf31rwjqms49mi8qdq10a7nibdzivpj8mg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/main-line"; @@ -44259,12 +44451,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170731.1713"; + version = "20170803.1101"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "884a72d9b69db4974e06d4a9c265b8fd607f7e31"; - sha256 = "06hxl0bdc2pa3gzznczhxhrwzdk7p0abhsmg11yh1s6csw678qsm"; + rev = "40dbc48c0db151b687d3a549df29c60383261089"; + sha256 = "1jpc4yhiq6m8lyz0s26akbkd0ggnhky6i1c8711f1ci8rqm5ckha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44725,12 +44917,12 @@ mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbo70s-theme"; - version = "20141122.642"; + version = "20170808.615"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mbo70s-theme"; - rev = "d50414697760896dbe6b06d2a00c271c16e0e4a2"; - sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z"; + rev = "bed3db8965708ed4e9482b224a9b084765c052f2"; + sha256 = "19hha9xwfqvdgsws69x0mcm93yfllp44hdl1xw9zlhj8f4ihizh5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8d0c1050b3319e136fe75903ae3612a52790189/recipes/mbo70s-theme"; @@ -44872,12 +45064,12 @@ mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mellow-theme"; - version = "20141115.2302"; + version = "20170808.617"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mellow-theme"; - rev = "ab72898824af6452d0cefea16e49491e42b660d1"; - sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld"; + rev = "2bdf18f05f5212b6f269d9a94afe2cf201766891"; + sha256 = "0cj9lkqgiaq1s2k9ky93jgv5pfbmjznsd54r3iqkiy1zshpkir68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mellow-theme"; @@ -45021,8 +45213,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537"; - sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb"; + rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; + sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -45267,12 +45459,12 @@ midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "midje-mode"; - version = "20150921.1750"; + version = "20170808.2103"; src = fetchFromGitHub { owner = "dnaumov"; repo = "midje-mode"; - rev = "07fc6cee4f5d6aa4187636266b9681a3e455ab6b"; - sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg"; + rev = "10ad5b6084cd03d5cd268b486a7c3c246d85535f"; + sha256 = "0nag9ks7qbg40h9z954v42x8zi65wbgfhviwvxvb2bmbzv4m4pbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode"; @@ -45742,12 +45934,12 @@ mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmm-mode"; - version = "20170220.1548"; + version = "20170808.1814"; src = fetchFromGitHub { owner = "purcell"; repo = "mmm-mode"; - rev = "631e7f12d1641cb40e650134f35f2680a1a310a1"; - sha256 = "0lwvh7f6hmjfdgidshqz25pihyd5bg87y23mbhkjb7qkdjas07wb"; + rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f"; + sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; @@ -45767,8 +45959,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "1d89502ea4b0f6a7da327a95f104f5c11e662493"; - sha256 = "1pqarm9gpzc5qyiqr2713q1xn1p20kl5shrmm77m150z4qfhxzhx"; + rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392"; + sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -45914,8 +46106,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "70db2088c14884e9d93a1f987ee9bc2753ca5772"; - sha256 = "07zqv6rm97kaxh0ii6n88yva7h3r3n8k6sssiy8hw6mf8817x44p"; + rev = "7ee76939b9269c652f93065a8fcc7da24434a167"; + sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -46679,12 +46871,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170722.823"; + version = "20170808.1745"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "a598b60c0f9a6a718ec712d6df5591d3cd7f23f3"; - sha256 = "1pf6d2idq8sljkp7haxxqknvja4cj44i88difzs5wvkmdd2pvlh0"; + rev = "316bd3a5916114e545d9ee26208cc82771cb7002"; + sha256 = "1ff249bvppw9dnjqawc48yhf1vyvq8a54xm8808pak2crpn44zix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -47054,12 +47246,12 @@ mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustard-theme"; - version = "20141115.2302"; + version = "20170808.619"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mustard-theme"; - rev = "33bc6e3a0e2abc5668afdb349bca7e8b5730582c"; - sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf"; + rev = "3b15d992c79590d7ea2503004e2a863b57e274b5"; + sha256 = "01ak4ayk46jqawlbb9cqliiqhnn68cq27kryamibdpds8sq0ch83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mustard-theme"; @@ -48138,12 +48330,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20170729.1816"; + version = "20170805.1240"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "91fc75e8ceebf850bd2ec07522e744eef0b89098"; - sha256 = "0margf3d0zg6nk5lf7s7dgf7qhx664jhk27wlsjnysm79d6d98f7"; + rev = "26a20424a087b0de16004b1e0186060d08d6baac"; + sha256 = "1m6kxhy6cvcwcv9j9l8wgkgqy56yqmnqdlwr3hp22vbancvqfl16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -48201,12 +48393,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20170520.553"; + version = "20170809.1128"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "749f48b510d0fd47dac67850f4089119fbff142a"; - sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25"; + rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f"; + sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -48226,8 +48418,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a2778988f2b70a5f000202afa7213b553350c72e"; - sha256 = "1iiy8sfdqqd2jz8lcccf0lpwxqaa5ppa47maic2gy2m7qxgw7418"; + rev = "af765a8eab288eb638100e027b97a1d15e4e3026"; + sha256 = "1mnzaa2c87pg12hgn5lfz1nxnyd8a9lfbar7imwr4jxih54ibdna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -48369,16 +48561,16 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170728.952"; + version = "20170805.450"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "no-littering"; - rev = "c1b3aa13f5311e1a7778f9cccd25680bbbf04c5f"; - sha256 = "0rd3cr63vgy1xbbszdi87p7g55ypnq59gjqkmzfc69z0fv05d2fv"; + rev = "d556a4cd3bfd3827c3d395ff6cd1e6086658589d"; + sha256 = "0ybkiwidrmrnmf7sgd8vdfh5nhdi02yfw330rqr7xw5vf0k9fsap"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; - sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; + sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh"; name = "no-littering"; }; packageRequires = [ cl-lib ]; @@ -48394,8 +48586,8 @@ src = fetchFromGitHub { owner = "thomp"; repo = "noaa"; - rev = "1198eed7cf2960a5b91f8750a08c906c716b53ff"; - sha256 = "1dvck23akkn6jffc86ddf951ksvq1w2nygji6qk5vkidcx5f4rnd"; + rev = "a4ec583275450d718334238d2813579420229f65"; + sha256 = "0ah6b31x9f4lc6q984nilj4g0aqzam5rhb3s61jgx9k4x7jmdks1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa"; @@ -48579,8 +48771,8 @@ version = "20170720.301"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "4a101ec7aabef163ffbdafe1b0a732bb23b3b0bc"; - sha256 = "172027wirk7gc4siy3f9zccm01iqjlfx0nk3s8pq7qg20cx0aa39"; + rev = "0967e46475be71d39daf928c9370af20b416f102"; + sha256 = "045xazhax0svalzr4hiv7yd0373q1dfdgq9mdk6avx6xdpk2fqcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48825,12 +49017,12 @@ numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "numbers"; - version = "20170712.238"; + version = "20170802.434"; src = fetchFromGitHub { owner = "davep"; repo = "numbers.el"; - rev = "74be68b94143f042ce461b2a69202f515acaf20c"; - sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x"; + rev = "dd02508b788a13b7d4dbcc4923fa23134b783ab3"; + sha256 = "0bgha85j5f9lpk1h3siiw28v5sy6z52n7d7xi3m301r9hdlccc39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers"; @@ -49391,12 +49583,12 @@ ob-nim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-nim"; - version = "20160830.220"; + version = "20170809.1130"; src = fetchFromGitHub { owner = "lompik"; repo = "ob-nim"; - rev = "050b165817e62067b0d686d96e25bc12fb9c7d84"; - sha256 = "18v4f23rxbl76ldzxmga1dlkammdy87aslk2p6x9l5gjr9w1xz3a"; + rev = "bf1642cb93f0a898804dc13fd9408d2964403bd2"; + sha256 = "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim"; @@ -49580,12 +49772,12 @@ ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: melpaBuild { pname = "ob-spice"; - version = "20160815.2249"; + version = "20170801.2222"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-spice"; - rev = "0ea589f852de4b1eb239c985be9f960367aa5c1a"; - sha256 = "10cyqjqbv87n3d1m3v6vxlyk3xzazms6876ay30nhkd4dbsw8kak"; + rev = "b296232e28f61366265084fafb2f47876d987069"; + sha256 = "1s2jyx75xkqbkm9g4i3h1f0rz9ms5dbs7zqavdiswq9mr8qx1kwq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice"; @@ -49727,12 +49919,12 @@ obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "obfusurl"; - version = "20170325.802"; + version = "20170809.824"; src = fetchFromGitHub { owner = "davep"; repo = "obfusurl.el"; - rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb"; - sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na"; + rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5"; + sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; @@ -49895,12 +50087,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "20170412.12"; + version = "20170803.222"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "cae4e8c9d0ff0c29e5fc32c8ac0cea539f8f6a13"; - sha256 = "1wni1xrv6kr001spdz66lza4xajx1w0v3mfbf28x17l4is2108rn"; + rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c"; + sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -50021,12 +50213,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20160912.1758"; + version = "20170806.2121"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; - sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; + rev = "21f8356ce025a66125954ed372c8ace83bd279c4"; + sha256 = "0a3d5rsg4vmjzj8lwgj8i205ns526g66895ppx4az6x542yamr5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -50189,12 +50381,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20170721.946"; + version = "20170804.158"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "ad147956b936fd528d26ca88158a8af96ff5827a"; - sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm"; + rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e"; + sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -50721,12 +50913,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170706.447"; + version = "20170809.633"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "497c18f517074629394c4c30de03d985e0c5ca8c"; - sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8"; + rev = "7a35d6043a1ffb5d2fff14bface51a57d4f7ab2b"; + sha256 = "0mcrlh3y3jqffn6d92gyi3c1nh4vn4b1xclmhh2dmbl4haypk40b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50809,8 +51001,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; - sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184"; + sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -51166,8 +51358,8 @@ src = fetchFromGitHub { owner = "et2010"; repo = "org-edit-latex"; - rev = "323d0b39d0284cef730b706dce7c0e58ed35530f"; - sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"; + rev = "2f645cf910b21d0ea63da58ad32f02cf8a6fb178"; + sha256 = "0qkdyfkk6xflhsb127208623qbhxcxcvagw0v8yksw2ypdaypd4x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; @@ -51434,12 +51626,12 @@ org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-link-minor-mode"; - version = "20170616.516"; + version = "20170805.1152"; src = fetchFromGitHub { owner = "seanohalpin"; repo = "org-link-minor-mode"; - rev = "f7d986b4c63673e0e81ad87e9109237abc667893"; - sha256 = "0i7xj6hp0mxc42y2yjv8cwgsflfyx47d63b9v4dmkjbs9fda06mj"; + rev = "7b92df60f3fee7f609d649d80ef243b45771ebea"; + sha256 = "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode"; @@ -51500,8 +51692,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4"; - sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08"; + rev = "8ab9a82be2a6178063e395a6ab3d2b9e083059c3"; + sha256 = "0314hjdlvwgc2zp7vicg8afnmd3dggj22h26dwmq5ngd3vwih4yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -51520,8 +51712,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "fbf31df38a20e03127a3d415f4391b6a72fc73a4"; - sha256 = "0hdnl8bc3zyn50vb557f2739fvr66wvgabvmd2gcy5m9ins2vi08"; + rev = "8ab9a82be2a6178063e395a6ab3d2b9e083059c3"; + sha256 = "0314hjdlvwgc2zp7vicg8afnmd3dggj22h26dwmq5ngd3vwih4yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -51537,12 +51729,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20170506.2244"; + version = "20170807.549"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "c0e99cfdfa645300a0c114fa6825efdf797da7c0"; - sha256 = "1rk7w0qsa824sfm1f3djg7vr6kxnvz3znn6vrzb9kcsmrf1y3k2z"; + rev = "8067e76eb1fb6a9c15229cc93015aba923120a19"; + sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -51684,12 +51876,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20170607.442"; + version = "20170806.1924"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "fa4e86621a63033148f8fe295a11b4721ba17462"; - sha256 = "123b0cf47c5gnj3yakhjr2q7kc8nmhim9c2ngdls6g944ig07l0d"; + rev = "50430ababf73a2d090881a952e9770badaf7478b"; + sha256 = "1xph0pdcbzlxfnbhhad2jgkznrl2vs76yl3jd29ny4xsl0n3gglw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -51737,8 +51929,8 @@ version = "20170701.919"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2"; - sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy"; + rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20"; + sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; @@ -51838,12 +52030,12 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "20170731.2333"; + version = "20170803.634"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; - sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184"; + sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -51863,8 +52055,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f"; - sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7"; + rev = "c39d28d925916ee7e08a879d5d9dd2287b3b9184"; + sha256 = "1l1nvii2kdb2kz4h8k4vb38rnp7gqfh8cx5ip2nw71hg885359lv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -51949,12 +52141,12 @@ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170727.1633"; + version = "20170807.1014"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "1b14f7f833f158f03461fb12d41a8c9f6ad4bd6a"; - sha256 = "09jp7kfjkcaqlnnls80pzxgsga7fids7w495sd319sml36fa46m8"; + rev = "a9f3fdf1cb3deb34103ea9f6f604bdf0edac1968"; + sha256 = "1kbba9x1x2jn1081zy8ync0vfsnj2cjflnlyycpb7lprsjbdq3zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -51991,12 +52183,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20170727.1217"; + version = "20170808.625"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "30be4111d465b6d8fbdc9785e8c49dc0ce16bab0"; - sha256 = "0zcv0np6hnq5jcblxxrvh99rd9zi7savpyhad29krqw7rhii1z71"; + rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8"; + sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -52146,22 +52338,22 @@ license = lib.licenses.free; }; }) {}; - org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: + org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }: melpaBuild { pname = "org-super-agenda"; - version = "20170801.156"; + version = "20170805.1106"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-super-agenda"; - rev = "591ea418588a2ad0cd34146831d369b030cea188"; - sha256 = "06jk5xp5x01123lwxv4srhcirjg8cwffz35x0kfndl0lq43g3mzi"; + rev = "fd3b18dd2a4b0aa77d60e4b3af4288b62cae9517"; + sha256 = "0cr6jv58lj7483vwm75yc4nncjkw4723dizdysd6qypq5px65zr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda"; sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra"; name = "org-super-agenda"; }; - packageRequires = [ dash emacs org s ]; + packageRequires = [ dash emacs ht org s ]; meta = { homepage = "https://melpa.org/#/org-super-agenda"; license = lib.licenses.free; @@ -52445,14 +52637,14 @@ pname = "org-wc"; version = "20170727.1911"; src = fetchFromGitHub { - owner = "dato"; + owner = "tesujimath"; repo = "org-wc"; rev = "d294ad7117c150445e6166fc0d88c14a8386f34e"; sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2f0d29fb0c046d9f7c32215ea58897147f3b291/recipes/org-wc"; - sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; + sha256 = "1yk2py4bzm2yr8vw6rbgl2hfpd21hf4fga0d5q6y779631klp6wl"; name = "org-wc"; }; packageRequires = []; @@ -52464,16 +52656,16 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20170730.50"; + version = "20170809.638"; src = fetchFromGitHub { owner = "tumashu"; - repo = "org-webpage"; - rev = "e9bb72c7bf75243553f786193e7c9535777559f0"; - sha256 = "0ak2210d9qx4zfgqzilxzla1rswwjgjnc15kh6drn6dfmj1krfnz"; + repo = "org2web"; + rev = "89a67c0e32e172613e6c46bffcd9537f9198067a"; + sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; - sha256 = "0ndvv5kw65p5shgg0gn3rpxz3zbxgcpa6an4m4yxms0ma72xw124"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org-webpage"; + sha256 = "11zv1vbwd03dyk2ac8k8lh0x5f2b6vpxdib74qs8wdvvqi7pippm"; name = "org-webpage"; }; packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ]; @@ -52506,12 +52698,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20170627.1750"; + version = "20170804.2043"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "026629da7517dad6ffd9e005299874cf2163958e"; - sha256 = "0dlrlm83i61zk6mvmfspcpakfjv5d7kfazk05f694ijfmqvmvfiw"; + rev = "bc398e6bb529b6b0022c24d570f4d65bbfd70d5b"; + sha256 = "0fkms3hci43rb4dv74rfglwjgqiw23ggxr2pc1zcr29q0fra7hdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -52587,6 +52779,36 @@ license = lib.licenses.free; }; }) {}; + org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: + melpaBuild { + pname = "org2web"; + version = "20170809.411"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "org2web"; + rev = "89a67c0e32e172613e6c46bffcd9537f9198067a"; + sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; + sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf"; + name = "org2web"; + }; + packageRequires = [ + cl-lib + dash + el2org + ht + htmlize + mustache + org + simple-httpd + ]; + meta = { + homepage = "https://melpa.org/#/org2web"; + license = lib.licenses.free; + }; + }) {}; organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; @@ -52971,13 +53193,13 @@ version = "20170721.2307"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; - repo = "osx-pseudo-daemon"; + repo = "mac-pseudo-daemon"; rev = "d235680a72677f11925b912428ad1a57b664e3e8"; sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon"; - sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon"; + sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z"; name = "osx-pseudo-daemon"; }; packageRequires = []; @@ -53049,6 +53271,27 @@ license = lib.licenses.free; }; }) {}; + outline-toc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "outline-toc"; + version = "20170730.430"; + src = fetchFromGitHub { + owner = "abingham"; + repo = "outline-toc.el"; + rev = "31f04bea19cfcfb01a94d1fd2b72391cb02b7463"; + sha256 = "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/64b07ee55e87c4a1125ce18a8ae0a44661380ffe/recipes/outline-toc"; + sha256 = "13hy9ahla68qcbfbm7b5d0yy774qfc3byb6pn9c66k2wg4xh6pxb"; + name = "outline-toc"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/outline-toc"; + license = lib.licenses.free; + }; + }) {}; outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outlined-elisp-mode"; @@ -53220,16 +53463,16 @@ ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: melpaBuild { pname = "ox-clip"; - version = "20170108.1348"; + version = "20170805.505"; src = fetchFromGitHub { owner = "jkitchin"; - repo = "scimax"; - rev = "4470f452f4219a53947da4c3d4ade188f978ad73"; - sha256 = "1nz02plf1p73690z2czn95fpiy5hissq6xnhfj5gf3ykmyzn5wbc"; + repo = "ox-clip"; + rev = "649aa719c6cb3fab46d1ff20d8090b85503a771e"; + sha256 = "0n2s59668l9n9vz8qs4kmbmlf6cybd0zijkb65qvba5iz4lxsj08"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; - sha256 = "0vkw8r34wnax08kkdgwzm62srp9avvza1jaj582l8nn0a75284yg"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip"; + sha256 = "1sm0ivd8rypnl0z901anjsnbfjwhxqcaagqav82ybdb1z6x1qicv"; name = "ox-clip"; }; packageRequires = [ htmlize org ]; @@ -53581,8 +53824,8 @@ src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; - rev = "57538ada07d1c631cfd07410cd8f47523be54c9a"; - sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl"; + rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f"; + sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly"; @@ -53661,12 +53904,12 @@ ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-twiki"; - version = "20160306.915"; + version = "20170803.1339"; src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; - rev = "57538ada07d1c631cfd07410cd8f47523be54c9a"; - sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl"; + rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f"; + sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-twiki"; @@ -53766,12 +54009,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170709.120"; + version = "20170807.1657"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "4e4b34fc4f12ef2f7965fa959c5809aacdb6af63"; - sha256 = "036gvgh97ng8l8srq4jgjil6na15fy4h7w7aljxx6wkmaik7nvg7"; + rev = "421e03d4faabea31b9135f7e2d1fd3a8cb3649f8"; + sha256 = "1md21a3clabc1xcs94gqy671wpxsbjr009c5dv2sxrq6xrdg1isz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -53787,12 +54030,12 @@ package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-plus"; - version = "20150319.1455"; + version = "20170802.2039"; src = fetchFromGitHub { owner = "zenspider"; repo = "package"; - rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b"; - sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97"; + rev = "09338e859168b45f1eb7386da184c48d31473068"; + sha256 = "0wc21d33xlgnw8j5qiv4r1rp2wglk3qcqlr1xcs0rmb4i5cjwnrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+"; @@ -53850,16 +54093,16 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20170314.1340"; + version = "20170805.449"; src = fetchFromGitHub { - owner = "tarsius"; + owner = "emacscollective"; repo = "packed"; - rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; - sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; + rev = "e8b20e287222dbf08ebc46e405412c3213102a7e"; + sha256 = "1a02s0ssci6fywk4k8kq5prwz5j4y1270v05qw9wwxa0fx083rn5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; - sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed"; + sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd"; name = "packed"; }; packageRequires = [ dash emacs ]; @@ -54037,12 +54280,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20170725.1345"; + version = "20170808.1219"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "017df884700a9db27dc486f7047da4bc7639ee6e"; - sha256 = "1b5gkmgqwibbavw3qfkgyaj1y3shr0nm3ksrl3ahhabylg3fj5as"; + rev = "33efb42525da0094a5338f6cae4013fddf550118"; + sha256 = "0r8c3njp24g1jsmypdvd7ax0hylk3igp0yfblszsz1ypafl4x2jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54392,12 +54635,12 @@ pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pasp-mode"; - version = "20170711.516"; + version = "20170803.1301"; src = fetchFromGitHub { owner = "santifa"; repo = "pasp-mode"; - rev = "2d7307b7483eaf6030497c83dea39207cf843638"; - sha256 = "1nxrad0mg1ywcjhh7npbnz69bxf44ih51f74m040mnvmmd15jw3q"; + rev = "6511193677d6113fec1171f476c0db3be242ee15"; + sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode"; @@ -54413,12 +54656,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20170728.26"; + version = "20170802.253"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "4dc3397caaa2fb3672cf7fbb2189927538c4642c"; - sha256 = "1gxkx73avmv2j19qaszjwy6kasggh40ahnmayfxsvgjxxzd5c46s"; + rev = "2bc78649614356eff88f8c826d08782f5f804378"; + sha256 = "19awdplirf1s4ajmcvw6b2wlkmrvx5v8i8m4b8glp4wchx27czgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -54999,12 +55242,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170721.718"; + version = "20170809.1007"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "804d9929ce354c60d91ab756735ffff8a6f30688"; - sha256 = "1qfv9zmqw3s3j94kprr4g73cq0b9cqw0bihbm1pbw6pybivdry09"; + rev = "a5dfc038e989af2a4b48265a07d26222c9d1212b"; + sha256 = "1zjws8yafh3zwnfm1jw92w6f5f1vdcbyj1h7v3i19ixf19h2af76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -55020,12 +55263,12 @@ peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "peacock-theme"; - version = "20141115.2302"; + version = "20170808.620"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-peacock-theme"; - rev = "268a2a7eb48ac750fc939657169ec65f2ac0f4f7"; - sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3"; + rev = "9e46fbfb562b6e26c6e3d6d618b044b3694da4c8"; + sha256 = "0w4dzdsv2cdldss5jwmdbjb5a62k5j1szwdim4gv8ldifhj7fy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/peacock-theme"; @@ -55101,6 +55344,26 @@ license = lib.licenses.free; }; }) {}; + pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pelican-mode"; + version = "20170808.252"; + src = fetchgit { + url = "https://git.korewanetadesu.com/pelican-mode.git"; + rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c"; + sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; + sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi"; + name = "pelican-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pelican-mode"; + license = lib.licenses.free; + }; + }) {}; per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "per-buffer-theme"; @@ -56672,12 +56935,12 @@ point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-stack"; - version = "20141225.2110"; + version = "20170808.958"; src = fetchFromGitHub { owner = "dgutov"; repo = "point-stack"; - rev = "86b37666882398f4db93f3aba0ebb7b7965032cd"; - sha256 = "0nqv63yy0qpxhblzmkyvla90p9a7729fqxvhkfld9jxfqpgv1xyp"; + rev = "76e17311e3a810314c7d31ac46dc55450ff30fa2"; + sha256 = "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3c9e6b3c583f098f75462b4d48cd137a1bcb76/recipes/point-stack"; @@ -56754,12 +57017,12 @@ poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: melpaBuild { pname = "poly-ruby"; - version = "20170710.220"; + version = "20170802.648"; src = fetchFromGitHub { owner = "knu"; repo = "poly-ruby.el"; - rev = "acc0c3cc8d0607edc769b35e19fcd39e8f57d903"; - sha256 = "1gq7rz9s44cf4m9bdapr7rnvincxsp16yci7g3ljq0mpiyl1l2b0"; + rev = "e6f50a92d29a5ff567d70cafa6621c4f89056d11"; + sha256 = "1pdimvcrjq0k6a9kijcl6zmsmmvssdqsdkgcz14qs4444qly4l9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby"; @@ -56838,12 +57101,12 @@ pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pony-mode"; - version = "20151028.302"; + version = "20170807.822"; src = fetchFromGitHub { owner = "davidmiller"; repo = "pony-mode"; - rev = "d319b0317bfbdac12d28cfd83abe31cc35f3cdd7"; - sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr"; + rev = "760684d30b6c234d1b88c9a4673a808f36f7f341"; + sha256 = "1y4gxn25i2nszdhqq8jxf9h65mqfgcwbypx5p4wkan5i1v2i3yr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1fd64317610fb6ef5b14e8bf15e727680d5ff09/recipes/pony-mode"; @@ -57359,12 +57622,12 @@ preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "preseed-generic-mode"; - version = "20150119.1241"; + version = "20170802.1753"; src = fetchFromGitHub { owner = "suntong"; repo = "preseed-generic-mode"; - rev = "19bce980d41607bef8af4b1901343abfca0f0855"; - sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0"; + rev = "341d85f8ecdc8834956a0352ece542f45def88db"; + sha256 = "1p486absi0mlcangpbh6hs36wvlmm9s6f4ag0lzmw7w3ikhp88kn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode"; @@ -58241,8 +58504,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "072431452a365450c607e9503f51786be44ecf7f"; - sha256 = "0yl003jbxd7k70a8ajs19256pq4g71fkx1nqg207mzvagmnp3iqp"; + rev = "35db2675b418ea105ef89f88fd1bf0257eb8a3ff"; + sha256 = "0xfrbz1xal8xkg1s9z5mlzqc6qvrjdy9i98g4crmwhvjvv58wff0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -58258,12 +58521,12 @@ protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protocols"; - version = "20170327.758"; + version = "20170802.432"; src = fetchFromGitHub { owner = "davep"; repo = "protocols.el"; - rev = "1c93a48d4173635a7b742248797f424e7ce851e3"; - sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr"; + rev = "d0f7c4acb05465f1a0d4be54363bbd2802647e77"; + sha256 = "1xg3pwsnzn795bz299x273ral2jrz2v3p9r6gjm4dcx5pm3348mj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; @@ -58838,8 +59101,8 @@ src = fetchFromGitHub { owner = "statmobile"; repo = "pydoc"; - rev = "84133eefce0e52a861894815f0c414f1f276f6e1"; - sha256 = "1j5cjfak8rak8rp1cijjfyndpxjkr2vqw22av3386pbwdm6fzamg"; + rev = "916153516382e5546b59b46342c58ed76cf27faf"; + sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc"; @@ -58875,12 +59138,12 @@ pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }: melpaBuild { pname = "pyenv-mode"; - version = "20160221.1123"; + version = "20170801.1648"; src = fetchFromGitHub { owner = "proofit404"; repo = "pyenv-mode"; - rev = "560614d47e3b0331f5c0e136763be69ef052048d"; - sha256 = "049wgwygdaa0p8p4pl37wkc06nam9ph17i9gzcg7w0hfwghjrc5j"; + rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820"; + sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode"; @@ -58959,12 +59222,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20170730.1512"; + version = "20170809.413"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "88adc57d754c9aecc922fe8b29239148f2b6557c"; - sha256 = "11hd2k64j5wm75hmnbf0ywcak0lc733jhkivmbvkx1qkb4cwll6v"; + rev = "1f40c4341a886ec952de14f642f07ccce90670b2"; + sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -59064,12 +59327,12 @@ pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "pyimport"; - version = "20170303.732"; + version = "20170808.346"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "2482c8efee8edab9f26ea278848d786323fcff9d"; - sha256 = "091ilax7vs34mh907rxfi2hm140ipa39nwrs27w8nllx2qsrbljv"; + rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76"; + sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -59110,8 +59373,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "7d6114fe71f1e6ab4a7c19546f380a7cb216eac9"; - sha256 = "1dq3ihmqdh6nb1ybz29qrkgz1ka2jhv76izh5a1q0l19qgni8wqi"; + rev = "62dc3d2f5eb57a70088a9b9959b6eb139cca227c"; + sha256 = "1cjdn499i5cn6lindzgnmhp9370pg9fqjpvngkyry16xs57fmz4a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -59253,12 +59516,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170731.105"; + version = "20170803.405"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "1d4cdc44c4fa1a15b0b1c4bb1774d0fc20d48616"; - sha256 = "1xp4lzwc95qkam8b86pmz8y0zg3w579rvygh22y47g0dlblyxgsn"; + rev = "85978be547434adc9c673cb3cfb7e7cf8729d514"; + sha256 = "0diczpxf8ax6ci8j18ac92nslj7l6spl9a8fazdy1w9j9dmgc7s6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -60282,12 +60545,12 @@ react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "react-snippets"; - version = "20160712.1521"; + version = "20170803.1550"; src = fetchFromGitHub { owner = "johnmastro"; repo = "react-snippets.el"; - rev = "3216134ee98b0ac39454d11d19b1508d3e7ca709"; - sha256 = "1j89pzx5karfh37gp0s9mnsq72h9628fihjqhra5h4qpj1irmkld"; + rev = "bfc4b68b81374a6a080240592641091a7e8a6d61"; + sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; @@ -60387,12 +60650,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170712.334"; + version = "20170803.632"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "ad333ac5e95f7e0c98cb4bc4c924ca9fff97cc88"; - sha256 = "1yng0fj9zr57jwmaxk71vxlwpxahyc4iadyyj5v8c09a4ljvlfs6"; + rev = "3f1b98f7a92e68e087a9a2174e61ac723eb161d3"; + sha256 = "1xiw6aw31zmvqwa3vpbq1xnla8539rjdy5gfxlhrw1qah5fqxni8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60725,12 +60988,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20170719.754"; + version = "20170808.515"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "f5a1ad20cacba47193be6d40230519c28e3578fd"; - sha256 = "07i5xa87wdyv9v0ib2j3bk9gv2dc8ah7jgi2agicfn4lxygf710b"; + rev = "0b881a3f73cd6fafddfbd602a1abda5f8fc7ab98"; + sha256 = "0s4iakcpjiwvxjdcmn22yfsr0ya0h4xvpr713d0h9yjdbblx1m20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -61142,10 +61405,10 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20170731.2148"; + version = "20170801.1947"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "0fj2kkvilgrz0ih08issdrq8wbswcxs8af1jv50zx7lfyjpix2s3"; + sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj"; name = "replace+.el"; }; recipeFile = fetchurl { @@ -61496,12 +61759,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20170105.2156"; + version = "20170804.545"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "fc7a2f152be63874da4211ec0b49ff1fadb6465e"; - sha256 = "1fg18kb5y8rsxnh166r0yj5wb0927rsdhpwmfwq3i9kgycgpznix"; + rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea"; + sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -61557,12 +61820,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170622.1135"; + version = "20170809.1107"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; - sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; + rev = "081685a8c624220ece68d6dca8d60016585b04ff"; + sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -61725,12 +61988,12 @@ riscv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "riscv-mode"; - version = "20161001.1838"; + version = "20170804.821"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "riscv-mode"; - rev = "e8425b71443a2decbe70cc5892e72ce2ceb17570"; - sha256 = "035hv8dpc6rk4b22mw4ch9yzf4wq14h8bba765fxg87grpi0mwg4"; + rev = "99febf97d1fa9441e8dada94fe30c2aa439c9749"; + sha256 = "119p926ypz525xdh82m2d1saky1qh5va224fxyqisfbwfrc17arh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode"; @@ -61746,12 +62009,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20170710.711"; + version = "20170808.634"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "a0a9cfd532f05f9ccb42919b9105d8e902d971fd"; - sha256 = "1gbgm00arfkgvp8gihpn1zf69lp4a5glhvrawnma6kraf5ldx0fs"; + rev = "4a24c86a1873289538134fe431e544fa3e12e788"; + sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -61981,8 +62244,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db1244c1c14514324474f362c857112e89bbf0c6"; - sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma"; + rev = "2f287dc3240acf3b6b17abd26b98d471e2f66638"; + sha256 = "0n29iqnxfm3pnj4w8ihwh3wpfwznspvcmv3vr7kaxfgyc7pimp7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -62043,8 +62306,8 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59459"; - sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; + rev = "59553"; + sha256 = "00lwwhwq1bzmkr97q22frmzwm4g1kddgiyzlmfwv16k0g3ihwydg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional"; @@ -62121,12 +62384,12 @@ ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-electric"; - version = "20150713.752"; + version = "20170808.2046"; src = fetchFromGitHub { owner = "knu"; repo = "ruby-electric.el"; - rev = "35d04e90ef243c7090edf9aaad0142a5a77f0ebd"; - sha256 = "0ksbm6cbqz7dx6qyq8nlpbx41b153jaww4fwnfwbx9rz993wjjkg"; + rev = "d04313dbee42c0d1009558a7c9424e4ae8611908"; + sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric"; @@ -62394,12 +62657,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170728.1006"; + version = "20170805.952"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "09efc45dee786cb220c233426ddd82b26ad950eb"; - sha256 = "0rga8whnzhnz6a0n13bimrdjardzmn5h38d71gmvrs40kbs0350h"; + rev = "b10ad4177786a139623984c4855eb9de3864c697"; + sha256 = "1dxsw71yxqzpnsr2cy7ba3mmzsnjp8kw0la6d7wc67m704fxymz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -62541,12 +62804,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20170218.1829"; + version = "20170806.2110"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "db99da9189002f3a95e9dc24038f73fc3a3f0499"; - sha256 = "1bbkfwnqlr68qkzdcjs3gjm3lfvbcw7vwx9bvrfx6rhl8k9a2i15"; + rev = "15d32495acb7df9aeb1def6845332a1a72fd2a36"; + sha256 = "068x0dzknpxcjnvbp5wkg3i3bvr67dg7mns7r859mpr59q9gyh9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -62797,8 +63060,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "a6e98831985be670148c527747b0e91330d0307b"; - sha256 = "0yyacg09p74r4q56kqw3km6sqwnk2hpzxqi9jvbw10x2q2c618bk"; + rev = "9b0378836bd7af24fa67f93fa456c57cc3fdbbcb"; + sha256 = "19js3vyi52xz83419x1n1nrwqvqsa5p8rf33z99bdmy1rj4xrfgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -62835,12 +63098,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20170611.806"; + version = "20170802.432"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf"; - sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw"; + rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379"; + sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -63252,12 +63515,12 @@ sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: melpaBuild { pname = "sdcv"; - version = "20170501.2155"; + version = "20170801.2216"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "cf7aa835360a1cb93b2b5fedaf5b816ff7410f0f"; - sha256 = "05bcgfzl23v8hkj395pp0gwl088smyx36i82sx5yjgygpg2i5dif"; + rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219"; + sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; @@ -63438,12 +63701,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20170722.434"; + version = "20170803.547"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "17884d02d8aaf2478590ea13542f2954d1dc203b"; - sha256 = "04wqrkpihrgrw244baama1aaj1ih80w0001hw3xnbl6xnxsyvm4z"; + rev = "9197838617211c71a965aa4b009249d231249902"; + sha256 = "1zk0rf2iq14vssrj9p3ixcricm2lp8kwfxxj1x8vixk1kw118q3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -63731,12 +63994,12 @@ services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "services"; - version = "20170327.835"; + version = "20170802.430"; src = fetchFromGitHub { owner = "davep"; repo = "services.el"; - rev = "87d65bf9fd8b02101f751846c650fc518355d1ea"; - sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3"; + rev = "04c7986041a33dfa0b0ae57c7d6fbd600548c596"; + sha256 = "0ycfkskkdlmc0l75z5a8f66wq5mvb24c4kz19a6kqs8rwm2ygz35"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; @@ -64378,12 +64641,12 @@ shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }: melpaBuild { pname = "shr-tag-pre-highlight"; - version = "20170525.902"; + version = "20170801.2201"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "shr-tag-pre-highlight.el"; - rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889"; - sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6"; + rev = "8b102c4c42180b5e9fa9dbc776fb28f12afb38a0"; + sha256 = "0z00k3rxz26dmn55mhrbv0p39xk3lwd66vmw0dm8m1lrkjxpsq8v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight"; @@ -64441,12 +64704,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170714.1041"; + version = "20170805.1619"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2"; - sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd"; + rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; + sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -64755,12 +65018,12 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "20170603.1542"; + version = "20170803.540"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; - rev = "7deff873b79910496b4baf647cdb8dd5de63465a"; - sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz"; + rev = "d461c462c237cd896553adb468cd77499d0d26ad"; + sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip"; @@ -64965,12 +65228,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170731.25"; + version = "20170807.711"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "5858bd60b4adadf2a52825aef9a49021eba89477"; - sha256 = "1difrbzz0cfw48nabaglcqlpvsrd2zn24f6spfx0qh22rfhcz4qy"; + rev = "e9cdebc689bb7780d0c278bf63577103fffc4aeb"; + sha256 = "1yys57pn7bym8galpf1k88xc5gs70xsv5fd1bdpq5k93is135js1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -65028,12 +65291,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170705.643"; + version = "20170804.1113"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6"; - sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v"; + rev = "84e5a99f5e8caf4d42076681b9befb1bf80493bb"; + sha256 = "1fw4biar85xy8as1smry8kzyfw0lbnbipzinbmpaliz2fljfnkqm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -65133,12 +65396,12 @@ slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slime-theme"; - version = "20141115.2302"; + version = "20170808.622"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-slime-theme"; - rev = "441288a5791d24e79ada2698888653ef3cf2ac6f"; - sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx"; + rev = "8e5880ac69e0b6a079103001cc3a90bdb688998f"; + sha256 = "0g90ypwyvpdzilvhj0rgfrp78a5gflply3rix2wx8rncw569qb6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/slime-theme"; @@ -65217,12 +65480,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "20170629.235"; + version = "20170802.413"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; - sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; + rev = "ebadbf5e3ffddee788f5ec09f759ed7eef6e1dae"; + sha256 = "1dn81r7dkj5pbl4adps7gcwn2yrxmap0ds6ninjzyr18m4lca7zb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -65951,13 +66214,13 @@ pname = "sml-modeline"; version = "20120110.1240"; src = fetchbzr { - url = "lp:~nxhtml/nxhtml/main"; + url = "https://code.launchpad.net/~nxhtml/nxhtml/main"; rev = "835"; sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3438977c0bf907b7a3480e6b88b277109c663385/recipes/sml-modeline"; - sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/sml-modeline"; + sha256 = "0fvdaby49q34sa83i3mgwyzaf1rflcary9pqi2gvbiibcwmkg82b"; name = "sml-modeline"; }; packageRequires = []; @@ -66284,12 +66547,12 @@ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solaire-mode"; - version = "20170718.1048"; + version = "20170809.1220"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "4058f17c7ccd4eb192598ce493d2e2d2361ee2e0"; - sha256 = "0vk5d3l2s0dxdv6yjdnwbhs0cdq71kd3l949a8w0qaypad8hg11i"; + rev = "8794f4d8fb63758d19e5a5f23e1d1118f0a1d10f"; + sha256 = "0vq01w4krj7l3qgqck2a1cz2d5xzkbx2giimkxqxzyb00820z41s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -67420,12 +67683,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20170711.1433"; + version = "20170803.1039"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "8ce61a22d07cdcb96aa31fa9e5493875f00ad516"; - sha256 = "03lpfj2gq0wl8zsjwdkwk5i6ih2cwcmya55cyw8fs8i19y3zhcyb"; + rev = "c6dc66b6678605f0df8eb61778b10ae21eb7caf5"; + sha256 = "05pdz6117m78zfvxi9mskw8svx4bs5k3bpv9nk9mzg9n0zw8algy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; @@ -67441,12 +67704,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170725.429"; + version = "20170801.2303"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "dbd8608551bc9e05280415b7b3937b1a151c7718"; - sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr"; + rev = "a7246531ab3d3c2d7cb3bd515353dfecbe5902c1"; + sha256 = "1ac10acyz0d3z5gmm79flxz7mmbww0xbr278qbwyzyr8h0hv2d5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -67716,8 +67979,8 @@ version = "20140213.348"; src = fetchgit { url = "git://repo.or.cz/stgit.git"; - rev = "90d50ad4a78c06f99fbf185aeb3322d1502a016e"; - sha256 = "0gh15q04dl0cgnabxjr3sgzkm31m9ls3r0d9ha7vs710wiffpbqx"; + rev = "f248e80ec7ed418d23d47c8a6c147a8a42855d29"; + sha256 = "1icm94ri23m66p0lmg0sdqi04m3vfwd2jcngym9gcg8p5gqq8j2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit"; @@ -68187,12 +68450,12 @@ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20170605.1710"; + version = "20170803.2052"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "57d49eafd53868d3c86b20fa51e1889e621872c0"; - sha256 = "1gxyy1z8qq610g2x0zzlccqq33gd54wwl1akhnw5xg4mvwhjvidf"; + rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b"; + sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -68250,12 +68513,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170730.306"; + version = "20170806.1414"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "1c8a6ca6e135e7228d45247adee75f721f20ef64"; - sha256 = "0ld6ivnkrhj3rdlr54sg90i4pdkgvyma9mhpr52ni6ab4053mpyj"; + rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2"; + sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68624,12 +68887,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170609.938"; + version = "20170804.1038"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "fc275339b57690d4157160ed22b7672d5382cbe7"; - sha256 = "1l5y83mx2qh8bz3f9fbbcpc474jis8aikqyilvkvnn932wkxlw8l"; + rev = "9b071a8fb130fe8391d445706711bcc4de2b3998"; + sha256 = "1yvnw0cf45wgly9ywryv0j93qrfch8adnjprnhf3yg140pavbzpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -69565,12 +69828,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20170611.1115"; + version = "20170804.1057"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "743614f372598597282efd29a18e624d5ef80bc1"; - sha256 = "0jl4kdmid2jy5gys9q1r58x41q4srh7hinhzr3q1f6f47lpcpvkf"; + rev = "01a2be2798850519873fe7abc59d715a978e6f20"; + sha256 = "06g4vd4air0rflzi1yz9qh1zxnwh7x13ffcib5fk7b0h8ypl72wd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -69817,12 +70080,12 @@ terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "terminal-here"; - version = "20170426.48"; + version = "20170805.251"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "26e7c8d180dcc62d8802762ba738eb2ee02fd16c"; - sha256 = "06hqqjj8fl32mxiws6jqnii6cnbds2686y2hfv7v83rj6fy31vgc"; + rev = "5e440c33a1d24762477863af5c9b7a896df4be1b"; + sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -70293,12 +70556,12 @@ thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thinks"; - version = "20170607.144"; + version = "20170802.428"; src = fetchFromGitHub { owner = "davep"; repo = "thinks.el"; - rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d"; - sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65"; + rev = "15e0437f5b635bdcf738ca092e26aa6d8ecdba36"; + sha256 = "1i2i8c53z8n48407jaz641adszv13yjg8cvq4k3hijddp651k555"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; @@ -70360,8 +70623,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "ec2a252136cb864a9edb22ef895bd62ff29c53e1"; - sha256 = "1avsnlxmr12zbjfv82mg69031s64c1rff7yfbk12hzba93rndnlp"; + rev = "0a8c34ceedf0f9272fb6d3519596ddf90cffcac2"; + sha256 = "1bhcn79l52m5ad4z8sv9165vsib2rvmqcf1sdaisrk7nfqwvy8sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -70415,22 +70678,22 @@ license = lib.licenses.free; }; }) {}; - tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: + tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170729.2113"; + version = "20170806.2049"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "6ad865937b7615652004ceca2e59c8ecfd737a9b"; - sha256 = "1krl4h20sr2yk2napqap1b5lm88vzzdy5162i5rf7l53scjdc8vr"; + rev = "77e4fe848dd664ead1f6980a9a99d82e2bee75d7"; + sha256 = "18n0w02h6wvp5gxnsm7lcwdg68sxcqz9sx6xpkxlidyhixk2iap9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1"; name = "tide"; }; - packageRequires = [ cl-lib dash flycheck typescript-mode ]; + packageRequires = [ cl-lib dash flycheck s typescript-mode ]; meta = { homepage = "https://melpa.org/#/tide"; license = lib.licenses.free; @@ -71287,12 +71550,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170730.2052"; + version = "20170804.559"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "7a1af3d62e0b27e032b9c9219b97289c11b332ab"; - sha256 = "0sfq643pfdmfcidm8ji52fn987vf3zwk2v6drmw8p3qzjx2k1m7q"; + rev = "c9de81914e2688dc1c6a3b2bf70013a2a5ed0b63"; + sha256 = "1vlla25lk75s84ns2svxdnvwfwhwp6jigmsq5v4s7k9xq5py0df7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71392,12 +71655,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170729.834"; + version = "20170809.1104"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93"; - sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw"; + rev = "0b413fc58d9bffd30132ee33dc4c98f9717e53df"; + sha256 = "0lwy721n9f18mxs5xz9cgfc2rpqrz44yiw6vvy9bxmdfhq51rlaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -71417,8 +71680,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "a28abd17d1f29b91892e67e6396a5bf88fd11b93"; - sha256 = "1nwm0dgk4fhxpsa2z6kqjagx8rw3l82z3lwcsv68wbmg1knbzvqw"; + rev = "0b413fc58d9bffd30132ee33dc4c98f9717e53df"; + sha256 = "0lwy721n9f18mxs5xz9cgfc2rpqrz44yiw6vvy9bxmdfhq51rlaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71642,12 +71905,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170531.557"; + version = "20170803.331"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "1af437337abe17afc95de7070fd242165529f556"; - sha256 = "0jjlb4i1vp5390v9w0dg4cc0l46jrxqphvw6b3wn1zy511r9q1jm"; + rev = "3dd1684db5d085f1b668d19646a4051a3261f34e"; + sha256 = "1d7yc0iqmxxqlcsbbci4wcz49sbfj6pdvbr7d98dsjxrg6pgjzjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -71980,8 +72243,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35"; - sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w"; + rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5"; + sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -72654,12 +72917,12 @@ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uptimes"; - version = "20170425.331"; + version = "20170802.426"; src = fetchFromGitHub { owner = "davep"; repo = "uptimes.el"; - rev = "07bcd6517243c9c9f61172202d33718bd9b2a850"; - sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n"; + rev = "c1e45ea728e5eaedea3e7974256fcfbcd20970f5"; + sha256 = "15qcii1cs7kyzn44b6np7lxflrszbf3n1wr7vhid6l71cnfgbz86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; @@ -72675,12 +72938,12 @@ url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "url-shortener"; - version = "20160404.1959"; + version = "20170804.1942"; src = fetchFromGitHub { owner = "yuyang0"; repo = "url-shortener"; - rev = "817ac58f6fd2190f688619a91cdc28654b211df9"; - sha256 = "1nah3vjg7966ssh2iwz8fingmcni867ksj2bjrvkgzmqbxqdxz9r"; + rev = "06db8270213b9e352d6c335b0663059a1353d05e"; + sha256 = "1ndcajgvfl46zw2iwgghvcldsy9p778pifkhlanivc6azajhpjhh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener"; @@ -72782,8 +73045,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d"; - sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47"; + rev = "5ca193128c10f6af877c174ec0a9029782f0ef50"; + sha256 = "1m8ccx4hnncwd5hhi46ghprk9cdljw0qlyy4ya05fgvxl7yz8b4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -73069,6 +73332,27 @@ license = lib.licenses.free; }; }) {}; + vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + melpaBuild { + pname = "vc-msg"; + version = "20170725.7"; + src = fetchFromGitHub { + owner = "redguardtoo"; + repo = "vc-msg"; + rev = "6f1b788a58d2b64ac0c4648039ecd40b3989a489"; + sha256 = "1xay9h16vr9pm1csfaqy71m9rsphh77r2rmk1sxpdasr5aa00vq1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg"; + sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9"; + name = "vc-msg"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://melpa.org/#/vc-msg"; + license = lib.licenses.free; + }; + }) {}; vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-osc"; @@ -73454,8 +73738,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "e631352fbf910f692807afe38a2b6a7882a403a8"; - sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq"; + rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42"; + sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -73784,12 +74068,12 @@ vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vue-html-mode"; - version = "20170225.2301"; + version = "20170804.1723"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "e9708b80a319af14266562d8bf920747e94f1cf8"; - sha256 = "073vygm04x4gf150ibarz2qxbl37k6jzd907ydbq8nyq6hm1z1wj"; + rev = "cd76195b2bda28d247a79124334ffcc5124676cb"; + sha256 = "1flnn6gz5ihkdw6p3pkllqcd1v7j89hc225izv8x5v2i5biyndsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; @@ -73809,8 +74093,8 @@ src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "e256f432b9cec9a0294fe3edf1c4965e1de28570"; - sha256 = "11nrzdqwzd7ib8gv52vplcafiwmv5nm6ql3ahw512zkkb2w3bkza"; + rev = "3a3eab579361351b78a87bb5710d3bbfe351b993"; + sha256 = "1b72vpg53whq3h85ck3c9if8km2rlzf8bvxkkv0j6zm66rvph0j3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -74074,12 +74358,12 @@ wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wavefront-obj-mode"; - version = "20150501.1116"; + version = "20170808.1016"; src = fetchFromGitHub { owner = "abend"; repo = "wavefront-obj-mode"; - rev = "75eedad052848e82cdd94064764956b906e6d6b2"; - sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy"; + rev = "34027915de6496460d8e68b5991dd24d47d54859"; + sha256 = "0yj4wb5sdsbh3gp0sh2ajrrn6s8vg492809g4gxkxp30jhr6xc9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d48e4fdc6c7079a1ca70c1e879473a98c11bbe6c/recipes/wavefront-obj-mode"; @@ -74242,12 +74526,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170709.922"; + version = "20170807.903"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "e4304bcfa0c5121522ba2a5db75af8a2e4e81246"; - sha256 = "1pyhipazvhqflpxxdaqjyp7l5vpcp3cbc4qqb5fy1zxnlb5yj62l"; + rev = "448c197fd78178bcf3e744c90b85a08f07bae3a0"; + sha256 = "0vmh9cqhcw32qliqrlmkb9jwhi3m4iy5x5a96sk3f75zx14ryjr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -74811,8 +75095,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "e9e61170f98bfde12b49b750966a826c0c72f848"; - sha256 = "1s9jysl6gql0fnngm4mwqclbw99502dkrvakz3wxh37c7mf5g9r2"; + rev = "38d2aca88b4afd2ade7f38df7275a3d31324df3b"; + sha256 = "1bahwsx1cpima658bg62w63a4s24vp0qpw0gmxb245cyzpi8ng2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -75115,6 +75399,27 @@ license = lib.licenses.free; }; }) {}; + windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "windwow"; + version = "20170803.1748"; + src = fetchFromGitHub { + owner = "vijumathew"; + repo = "windwow"; + rev = "717190e22aeb28130ce2a52470b7fb26b180e8dd"; + sha256 = "0n2b2jaaqwc8z8rmfc7rqnk2sf875gp3xyjfgayvq7ya9c9bnv7g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow"; + sha256 = "0cbkp98pwzj484akdbidvdz4kqxv6ix6paimpxnag6fffciq245h"; + name = "windwow"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/windwow"; + license = lib.licenses.free; + }; + }) {}; winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winpoint"; @@ -75219,22 +75524,22 @@ license = lib.licenses.free; }; }) {}; - with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170730.314"; + version = "20170803.917"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "5cddefaff6aa0fa8ce2a0fa23900687c07d87481"; - sha256 = "11fsaam88xj8aambiacsmcgn1mjfkx3mm7y74lnnwcslbrmj977a"; + rev = "4d3d50b09dee3305a365d7eb005313d42dddd6ea"; + sha256 = "11416ic4nf04fgd7947lxfc4c8g6lb4r2ickr5mydqw4wqzanqi9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb"; name = "with-editor"; }; - packageRequires = [ async dash emacs ]; + packageRequires = [ async emacs ]; meta = { homepage = "https://melpa.org/#/with-editor"; license = lib.licenses.free; @@ -75264,12 +75569,12 @@ with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "with-simulated-input"; - version = "20170729.1252"; + version = "20170807.1512"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "with-simulated-input"; - rev = "7f37451dcfbb1873f605e2a412d0585f5c3bed49"; - sha256 = "0s40mpy10fbdr2b241qa239zdh54gmqk4j9pigqm1zlzi9d5msan"; + rev = "9efeb236c8f6887a8591d6241962c37266d8e726"; + sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; @@ -75369,12 +75674,12 @@ wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordgen"; - version = "20161104.944"; + version = "20170803.1120"; src = fetchFromGitHub { owner = "Fanael"; repo = "wordgen.el"; - rev = "c46d8da6dae8c82d3a5d8b903a12dd5f2ae94939"; - sha256 = "0gcbj64dkzwa2xfp6y9lwb5m678g7lf9jrkr9whdrm9mgpifmdmi"; + rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d"; + sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; @@ -75768,12 +76073,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170713.629"; + version = "20170804.2244"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "df1906547f51f50c7e61ffa6c518a6ffb23d4770"; - sha256 = "0q93nz5z4awasllnnqs6pzi83mrx8nl7d3mi13ppqhd50sjm0166"; + rev = "a91d934e15343738393cb2dc7a75d712581d09eb"; + sha256 = "14b1aw1iffhk7gk0fwyrjb40173cli968hy6x72mmgq3ry664h44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -75789,12 +76094,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170725.420"; + version = "20170804.2206"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "4557ee44475b50061219653f0178efd9d832a79f"; - sha256 = "06fx2mnyd7qs867m1hjzzj47wj06hhqz74bwif6rzhy5v4j7wdcr"; + rev = "174fdd95edb77820a03eb161e3ab6b867936f9fe"; + sha256 = "1l3a6hkhv26ixkmjc1zfl43zx8s0c3czk8zgahydpjx111q5381d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -75810,12 +76115,12 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20170729.1407"; + version = "20170804.2234"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "5eaa02e28c4496bbf898271401005a694176a2d3"; - sha256 = "0wdlc3d4ciyhc2nnnvfp0bdvar4486rcqfkj9czjb6v6jax3farx"; + rev = "6b70b8122643402aedcc1cf88406330628d92286"; + sha256 = "0gd7nsx205s33dxjx52cc4k8frdxrnwsvl7qkx8mckqvc1y2wxa1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -75831,12 +76136,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170729.1310"; + version = "20170804.2154"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "636d4be0adf234ace22ee236b66b7b9ce81cff54"; - sha256 = "1kqy10y7bqza4y7fj5n0vg536hksjzjbd2r3n36dij27k8n996dm"; + rev = "4a7da476edf9eed9ad7725fe31113b87f97696bd"; + sha256 = "140gxnnxqk649j60d3aibs42si95vakmy6m937gb25b2bmvhkwwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -75852,12 +76157,12 @@ xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-get-thing"; - version = "20170713.628"; + version = "20170804.2211"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-get-thing-or-selection"; - rev = "29a82b1a291ad6625b0da152ff1de10455d1831a"; - sha256 = "1si443vicgq7swr79lc9jv7fxm8x273xajrm6xqahkxzyly2751q"; + rev = "00aa90c74f6e23eb9dae3082a16454264f9d1ed8"; + sha256 = "0xp8w9myhdwiw7m2zj9bd2kc93djx35s3iss5yrz92kcw6m3n53m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing"; @@ -75873,12 +76178,12 @@ xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20170713.615"; + version = "20170804.2259"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "91645ba91772bf4a1a20765722b72f7e374feacc"; - sha256 = "0hrs77qllpa77964bwjdmq4bzr47bgc0n57jsaagcdbs7wc6bmc0"; + rev = "7f4e9252d5f84438c83912720bcd313092f8f44f"; + sha256 = "17fq0b2rc9wjjii17mnybp8v3nvp297azkd2bwz952r0x9g2s92b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -75894,12 +76199,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20170707.2324"; + version = "20170803.722"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "b944092474e5c9194860dbb6d007a8f2ce98c94c"; - sha256 = "04ffknah3gmnjkk4wzhbzwj40mxzgwzxqq7cxrg4k86l9wq50pjb"; + rev = "8c988bc469209e7f393fa5a1ac4663bfb713c7a7"; + sha256 = "1ndczz69v70c13jdb651yiqnk1avy78i11ydbvr0qf78gd859i5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; @@ -75936,12 +76241,12 @@ xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20170713.628"; + version = "20170804.2216"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "62ac5be31f6b2e2ce10f695122e9cb7a9411e1ba"; - sha256 = "1j3qq54v68nal60zxnc89a7cy5bbsnn1bp97n3giwdk03rla4yk6"; + rev = "1249d62fe1d962e38ab8d9e48813c1ad5d21ae51"; + sha256 = "0i8r7kv2kai1r1fs509j3lx4kzv8bv6qsb3882qh6hjcnlpf0pyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -76486,8 +76791,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "69c4e154f9335750ab8658a00577952930138a79"; - sha256 = "166zhipzsv2v2qlxglmxr8a0syi5aq2rrh8sxs6n4wmnpgcfglhg"; + rev = "fdff36994bc59bb02c1968684862ded9003c6c7d"; + sha256 = "0w38s7xl77ch8h65x2njn9nwvwdxjw7rz15gw2qmp69sjv4nvnna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76736,8 +77041,8 @@ src = fetchFromGitHub { owner = "anachronic"; repo = "yarn-mode"; - rev = "99891000efe31214b065fa9446cd5e68c5c42ed8"; - sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy"; + rev = "998b408d6be05fd1c3a9fd8db6ffaab3bf86d06b"; + sha256 = "09mrcv30n6zmgnwgl5pb2cyk6122a0ng1xg20grpmlwbq3qlr424"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; @@ -76774,12 +77079,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170723.1530"; + version = "20170808.940"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5"; - sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1"; + rev = "e371c119ecc9044c8ca2d6b93215121eb714d6b1"; + sha256 = "02md6332891fwwiqqf9x3sjd7568lg2lmjcx79cdjcl5hjik7qdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -76881,8 +77186,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5c3e07b46e4c25bbd0a2068a5091c8f27b344da6"; - sha256 = "04nb5cjlghkk47a0girnlxlcrclylhg1zx41q5lcvnzb1is06skh"; + rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; + sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -77036,13 +77341,13 @@ pname = "zeitgeist"; version = "20131228.1009"; src = fetchgit { - url = "git://anongit.freedesktop.org/zeitgeist/zeitgeist-datasources"; + url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git"; rev = "cdd1c219ed3afa9500403c3c499f49583d599034"; sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fb5f96d92b33fe97573334038f2fe4f984f37cca/recipes/zeitgeist"; - sha256 = "0m6drp3c6hp70ypbva3ji2dndl9an1jm2zlhnpwmjxsmw47cd732"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist"; + sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz"; name = "zeitgeist"; }; packageRequires = []; @@ -77134,6 +77439,27 @@ license = lib.licenses.free; }; }) {}; + zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "zephir-mode"; + version = "20170808.1302"; + src = fetchFromGitHub { + owner = "sergeyklay"; + repo = "zephir-mode"; + rev = "9295bb18b273502dfcc75c34c04ce9f48fe4e53a"; + sha256 = "17wsl7c9fcr6qybr7qhlvkikb11n809cxi6ghgskh131a8mxb4fn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; + sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j"; + name = "zephir-mode"; + }; + packageRequires = [ cl-lib emacs pkg-info ]; + meta = { + homepage = "https://melpa.org/#/zephir-mode"; + license = lib.licenses.free; + }; + }) {}; zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; @@ -77346,10 +77672,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20170605.1046"; + version = "20170802.1406"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zones.el?revision=30"; - sha256 = "05my99nn7pj5alswfhd11kkyibivqh65bhjfalbfv7flfmvg6pcz"; + url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32"; + sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk"; name = "zones.el"; }; recipeFile = fetchurl { @@ -77620,8 +77946,8 @@ src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "b62414b155fe2e09d91b70059a909d1403d89acf"; - sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj"; + rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0"; + sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; From b32b18631e94ebbb0e6f201db24b6b541b901f89 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 9 Aug 2017 22:35:20 +0000 Subject: [PATCH 035/213] nixos/tinc: do not tell systemd where is pidfile ```Tinc```'s pid file has more info than just a pid ``` # cat /run/tinc.dmz.pid 12209 7BD4A657B4A04364D268D188A0F4AA972A05247D802149246BBE1F1E689CABA1 127.0.0.1 port 656 ``` so ```systemd``` fails to parse it. It results in long (re)start times when ```systemd``` waits for a correct pid file to appear. --- nixos/modules/services/networking/tinc.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 7410908b735..7a786b54ccb 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -166,7 +166,6 @@ in path = [ data.package ]; serviceConfig = { Type = "simple"; - PIDFile = "/run/tinc.${network}.pid"; Restart = "always"; RestartSec = "3"; }; From 3bfce2f55ff530d6e78f67cedb13e12711f5baa5 Mon Sep 17 00:00:00 2001 From: Ben Zhang Date: Wed, 9 Aug 2017 19:26:27 -0400 Subject: [PATCH 036/213] nodePackages.lerna: init at 2.0.0 --- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 1159 ++++++++++++++--- 2 files changed, 987 insertions(+), 173 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 1da53d8e773..7e49f7fedae 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -39,6 +39,7 @@ , "js-yaml" , "karma" , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } +, "lerna" , "lcov-result-merger" , "meat" , "mocha" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 229c5743a4d..4add1fccb53 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -14553,6 +14553,627 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; + "command-join-2.0.0" = { + name = "command-join"; + packageName = "command-join"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/command-join/-/command-join-2.0.0.tgz"; + sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf"; + }; + }; + "conventional-changelog-cli-1.3.2" = { + name = "conventional-changelog-cli"; + packageName = "conventional-changelog-cli"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz"; + sha1 = "33abf2b5720a9b094df38e81741ccb502e1a4125"; + }; + }; + "conventional-recommended-bump-1.0.1" = { + name = "conventional-recommended-bump"; + packageName = "conventional-recommended-bump"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz"; + sha1 = "56b8ae553a8a1152fa069e767599e1f6948bd36c"; + }; + }; + "dedent-0.7.0" = { + name = "dedent"; + packageName = "dedent"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; + sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; + }; + }; + "fs-extra-3.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + }; + "get-port-3.1.0" = { + name = "get-port"; + packageName = "get-port"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-3.1.0.tgz"; + sha1 = "ef01b18a84ca6486970ff99e54446141a73ffd3e"; + }; + }; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; + "is-ci-1.0.10" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; + sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "read-cmd-shim-1.0.1" = { + name = "read-cmd-shim"; + packageName = "read-cmd-shim"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; + sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "strong-log-transformer-1.0.6" = { + name = "strong-log-transformer"; + packageName = "strong-log-transformer"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz"; + sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; + }; + }; + "temp-write-3.3.0" = { + name = "temp-write"; + packageName = "temp-write"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-write/-/temp-write-3.3.0.tgz"; + sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9"; + }; + }; + "write-file-atomic-2.1.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; + sha1 = "1769f4b551eedce419f0505deae2e26763542d37"; + }; + }; + "write-json-file-2.2.0" = { + name = "write-json-file"; + packageName = "write-json-file"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.2.0.tgz"; + sha1 = "51862506bbb3b619eefab7859f1fd6c6d0530876"; + }; + }; + "write-pkg-3.1.0" = { + name = "write-pkg"; + packageName = "write-pkg"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; + sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; + }; + }; + "yargs-8.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + }; + "add-stream-1.0.0" = { + name = "add-stream"; + packageName = "add-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; + sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; + }; + }; + "conventional-changelog-1.1.4" = { + name = "conventional-changelog"; + packageName = "conventional-changelog"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.4.tgz"; + sha1 = "108bc750c2a317e200e2f9b413caaa1f8c7efa3b"; + }; + }; + "tempfile-1.1.1" = { + name = "tempfile"; + packageName = "tempfile"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; + sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; + }; + }; + "conventional-changelog-angular-1.4.0" = { + name = "conventional-changelog-angular"; + packageName = "conventional-changelog-angular"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz"; + sha1 = "118b9f7d41a3d99500bfb6bea1f3525e055e8b9b"; + }; + }; + "conventional-changelog-atom-0.1.1" = { + name = "conventional-changelog-atom"; + packageName = "conventional-changelog-atom"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz"; + sha1 = "d40a9b297961b53c745e5d1718fd1a3379f6a92f"; + }; + }; + "conventional-changelog-codemirror-0.1.0" = { + name = "conventional-changelog-codemirror"; + packageName = "conventional-changelog-codemirror"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz"; + sha1 = "7577a591dbf9b538e7a150a7ee62f65a2872b334"; + }; + }; + "conventional-changelog-core-1.9.0" = { + name = "conventional-changelog-core"; + packageName = "conventional-changelog-core"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz"; + sha1 = "de5dfbc091847656508d4a389e35c9a1bc49e7f4"; + }; + }; + "conventional-changelog-ember-0.2.6" = { + name = "conventional-changelog-ember"; + packageName = "conventional-changelog-ember"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz"; + sha1 = "8b7355419f5127493c4c562473ab2fc792f1c2b6"; + }; + }; + "conventional-changelog-eslint-0.1.0" = { + name = "conventional-changelog-eslint"; + packageName = "conventional-changelog-eslint"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz"; + sha1 = "a52411e999e0501ce500b856b0a643d0330907e2"; + }; + }; + "conventional-changelog-express-0.1.0" = { + name = "conventional-changelog-express"; + packageName = "conventional-changelog-express"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz"; + sha1 = "55c6c841c811962036c037bdbd964a54ae310fce"; + }; + }; + "conventional-changelog-jquery-0.1.0" = { + name = "conventional-changelog-jquery"; + packageName = "conventional-changelog-jquery"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz"; + sha1 = "0208397162e3846986e71273b6c79c5b5f80f510"; + }; + }; + "conventional-changelog-jscs-0.1.0" = { + name = "conventional-changelog-jscs"; + packageName = "conventional-changelog-jscs"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz"; + sha1 = "0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"; + }; + }; + "conventional-changelog-jshint-0.1.0" = { + name = "conventional-changelog-jshint"; + packageName = "conventional-changelog-jshint"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz"; + sha1 = "00cab8e9a3317487abd94c4d84671342918d2a07"; + }; + }; + "compare-func-1.3.2" = { + name = "compare-func"; + packageName = "compare-func"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; + sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; + }; + }; + "github-url-from-git-1.5.0" = { + name = "github-url-from-git"; + packageName = "github-url-from-git"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz"; + sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "array-ify-1.0.0" = { + name = "array-ify"; + packageName = "array-ify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; + sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; + }; + }; + "conventional-changelog-writer-1.4.1" = { + name = "conventional-changelog-writer"; + packageName = "conventional-changelog-writer"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz"; + sha1 = "3f4cb4d003ebb56989d30d345893b52a43639c8e"; + }; + }; + "conventional-commits-parser-1.3.0" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz"; + sha1 = "e327b53194e1a7ad5dc63479ee9099a52b024865"; + }; + }; + "dateformat-1.0.12" = { + name = "dateformat"; + packageName = "dateformat"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; + sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + }; + }; + "get-pkg-repo-1.4.0" = { + name = "get-pkg-repo"; + packageName = "get-pkg-repo"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz"; + sha1 = "c73b489c06d80cc5536c2c853f9e05232056972d"; + }; + }; + "git-raw-commits-1.2.0" = { + name = "git-raw-commits"; + packageName = "git-raw-commits"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz"; + sha1 = "0f3a8bfd99ae0f2d8b9224d58892975e9a52d03c"; + }; + }; + "git-remote-origin-url-2.0.0" = { + name = "git-remote-origin-url"; + packageName = "git-remote-origin-url"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz"; + sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; + }; + }; + "git-semver-tags-1.2.1" = { + name = "git-semver-tags"; + packageName = "git-semver-tags"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.1.tgz"; + sha1 = "6ccd2a52e735b736748dc762444fcd9588e27490"; + }; + }; + "conventional-commits-filter-1.0.0" = { + name = "conventional-commits-filter"; + packageName = "conventional-commits-filter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz"; + sha1 = "6fc2a659372bc3f2339cf9ffff7e1b0344b93039"; + }; + }; + "split-1.0.1" = { + name = "split"; + packageName = "split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; + sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9"; + }; + }; + "is-subset-0.1.1" = { + name = "is-subset"; + packageName = "is-subset"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz"; + sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; + }; + }; + "modify-values-1.0.0" = { + name = "modify-values"; + packageName = "modify-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz"; + sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"; + }; + }; + "is-text-path-1.0.1" = { + name = "is-text-path"; + packageName = "is-text-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"; + sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; + }; + }; + "trim-off-newlines-1.0.1" = { + name = "trim-off-newlines"; + packageName = "trim-off-newlines"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; + sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; + }; + }; + "text-extensions-1.5.0" = { + name = "text-extensions"; + packageName = "text-extensions"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.5.0.tgz"; + sha1 = "d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc"; + }; + }; + "parse-github-repo-url-1.4.0" = { + name = "parse-github-repo-url"; + packageName = "parse-github-repo-url"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz"; + sha1 = "286c53e2c9962e0641649ee3ac9508fca4dd959c"; + }; + }; + "dargs-4.1.0" = { + name = "dargs"; + packageName = "dargs"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"; + sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; + }; + }; + "lodash.template-4.4.0" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz"; + sha1 = "e73a0385c8355591746e020b99679c690e68fba0"; + }; + }; + "lodash.templatesettings-4.1.0" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"; + sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316"; + }; + }; + "gitconfiglocal-1.0.0" = { + name = "gitconfiglocal"; + packageName = "gitconfiglocal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz"; + sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; + }; + }; + "conventional-commits-parser-2.0.0" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz"; + sha1 = "71d01910cb0a99aeb20c144e50f81f4df3178447"; + }; + }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; + "universalify-0.1.1" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz"; + sha1 = "fa71badd4437af4c148841e3b3b165f9e9e590b7"; + }; + }; + "ci-info-1.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz"; + sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "byline-5.0.0" = { + name = "byline"; + packageName = "byline"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + }; + "minimist-0.1.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; + }; + }; + "temp-dir-1.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; + sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; + }; + }; + "detect-indent-5.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + }; + "sort-keys-2.0.0" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "os-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "yargs-parser-7.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; "vinyl-1.2.0" = { name = "vinyl"; packageName = "vinyl"; @@ -16857,15 +17478,6 @@ let sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; }; }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; - }; - }; "fstream-npm-1.2.1" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -17010,15 +17622,6 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; - "read-cmd-shim-1.0.1" = { - name = "read-cmd-shim"; - packageName = "read-cmd-shim"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; - sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; - }; - }; "read-package-tree-5.1.6" = { name = "read-package-tree"; packageName = "read-package-tree"; @@ -17073,15 +17676,6 @@ let sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8"; }; }; - "write-file-atomic-2.1.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; - sha1 = "1769f4b551eedce419f0505deae2e26763542d37"; - }; - }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -17118,105 +17712,6 @@ let sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; }; }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; - }; - }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - }; - "os-locale-2.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; - sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; - }; - }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; - "yargs-parser-7.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; - }; - }; - "execa-0.7.0" = { - name = "execa"; - packageName = "execa"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; - }; - }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - }; "lodash._createset-4.0.3" = { name = "lodash._createset"; packageName = "lodash._createset"; @@ -18081,15 +18576,6 @@ let sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; }; }; - "tempfile-1.1.1" = { - name = "tempfile"; - packageName = "tempfile"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; - sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; - }; - }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -20867,15 +21353,6 @@ let sha1 = "39c72ed89d1b49ba708e18776500488902a52027"; }; }; - "is-ci-1.0.10" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; - sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; - }; - }; "leven-2.1.0" = { name = "leven"; packageName = "leven"; @@ -20957,15 +21434,6 @@ let sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; }; }; - "ci-info-1.0.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz"; - sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; - }; - }; "lodash.toarray-4.4.0" = { name = "lodash.toarray"; packageName = "lodash.toarray"; @@ -21092,13 +21560,13 @@ let sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236"; }; }; - "yeoman-environment-2.0.1" = { + "yeoman-environment-2.0.2" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.1.tgz"; - sha1 = "2b89415abd47775878bf4f77dbca97158f77de88"; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.2.tgz"; + sha1 = "504ece28e11b5ac487e90b97d8189afa38db4331"; }; }; "yosay-2.0.1" = { @@ -21362,15 +21830,6 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "globby-6.1.0" = { - name = "globby"; - packageName = "globby"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; - }; - }; "grouped-queue-0.3.3" = { name = "grouped-queue"; packageName = "grouped-queue"; @@ -25530,10 +25989,10 @@ in jayschema = nodeEnv.buildNodePackage { name = "jayschema"; packageName = "jayschema"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz"; - sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58"; + url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.2.tgz"; + sha1 = "7630ef74577274e95ad6d386ddfa091fcee8df4b"; }; dependencies = [ sources."when-3.4.6" @@ -26539,6 +26998,360 @@ in }; production = true; }; + lerna = nodeEnv.buildNodePackage { + name = "lerna"; + packageName = "lerna"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lerna/-/lerna-2.0.0.tgz"; + sha1 = "49a72fe70e06aebfd7ea23efb2ab41abe60ebeea"; + }; + dependencies = [ + sources."async-1.5.2" + sources."chalk-1.1.3" + sources."cmd-shim-2.0.2" + sources."columnify-1.5.4" + sources."command-join-2.0.0" + sources."conventional-changelog-cli-1.3.2" + (sources."conventional-recommended-bump-1.0.1" // { + dependencies = [ + sources."conventional-commits-parser-2.0.0" + ]; + }) + sources."dedent-0.7.0" + sources."execa-0.6.3" + sources."find-up-2.1.0" + sources."fs-extra-3.0.1" + sources."get-port-3.1.0" + sources."glob-7.1.2" + sources."globby-6.1.0" + sources."graceful-fs-4.1.11" + (sources."inquirer-3.2.1" // { + dependencies = [ + sources."chalk-2.1.0" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.2.0" + sources."supports-color-4.2.1" + sources."ansi-regex-3.0.0" + ]; + }) + sources."is-ci-1.0.10" + (sources."load-json-file-2.0.0" // { + dependencies = [ + sources."strip-bom-3.0.0" + ]; + }) + sources."lodash-4.17.4" + sources."minimatch-3.0.4" + sources."npmlog-4.1.2" + sources."p-finally-1.0.0" + sources."path-exists-3.0.0" + sources."read-cmd-shim-1.0.1" + (sources."read-pkg-2.0.0" // { + dependencies = [ + sources."path-type-2.0.0" + ]; + }) + sources."rimraf-2.6.1" + sources."safe-buffer-5.1.1" + sources."semver-5.4.1" + sources."signal-exit-3.0.2" + (sources."strong-log-transformer-1.0.6" // { + dependencies = [ + sources."minimist-0.1.0" + ]; + }) + (sources."temp-write-3.3.0" // { + dependencies = [ + sources."uuid-3.1.0" + ]; + }) + sources."write-file-atomic-2.1.0" + sources."write-json-file-2.2.0" + (sources."write-pkg-3.1.0" // { + dependencies = [ + sources."sort-keys-2.0.0" + ]; + }) + (sources."yargs-8.0.2" // { + dependencies = [ + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."mkdirp-0.5.1" + sources."minimist-0.0.8" + sources."wcwidth-1.0.1" + sources."defaults-1.0.3" + sources."clone-1.0.2" + sources."add-stream-1.0.0" + sources."conventional-changelog-1.1.4" + (sources."meow-3.7.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."read-pkg-up-1.0.1" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + ]; + }) + sources."tempfile-1.1.1" + sources."conventional-changelog-angular-1.4.0" + sources."conventional-changelog-atom-0.1.1" + sources."conventional-changelog-codemirror-0.1.0" + (sources."conventional-changelog-core-1.9.0" // { + dependencies = [ + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."load-json-file-1.1.0" + sources."find-up-1.1.2" + sources."path-exists-2.1.0" + ]; + }) + sources."conventional-changelog-ember-0.2.6" + sources."conventional-changelog-eslint-0.1.0" + sources."conventional-changelog-express-0.1.0" + sources."conventional-changelog-jquery-0.1.0" + sources."conventional-changelog-jscs-0.1.0" + sources."conventional-changelog-jshint-0.1.0" + sources."compare-func-1.3.2" + sources."github-url-from-git-1.5.0" + sources."q-1.5.0" + sources."read-pkg-up-2.0.0" + sources."array-ify-1.0.0" + sources."dot-prop-3.0.0" + sources."is-obj-1.0.1" + sources."conventional-changelog-writer-1.4.1" + sources."conventional-commits-parser-1.3.0" + sources."dateformat-1.0.12" + sources."get-pkg-repo-1.4.0" + sources."git-raw-commits-1.2.0" + sources."git-remote-origin-url-2.0.0" + sources."git-semver-tags-1.2.1" + sources."normalize-package-data-2.4.0" + sources."through2-2.0.3" + sources."conventional-commits-filter-1.0.0" + sources."handlebars-4.0.10" + sources."json-stringify-safe-5.0.1" + sources."split-1.0.1" + sources."is-subset-0.1.1" + sources."modify-values-1.0.0" + sources."optimist-0.6.1" + sources."source-map-0.4.4" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.6" + sources."yargs-3.10.0" + ]; + }) + sources."wordwrap-0.0.3" + sources."amdefine-1.0.1" + sources."uglify-to-browserify-1.0.2" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.2.2" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" + sources."through-2.3.8" + sources."JSONStream-1.3.1" + sources."is-text-path-1.0.1" + sources."split2-2.1.1" + sources."trim-off-newlines-1.0.1" + sources."jsonparse-1.3.1" + sources."text-extensions-1.5.0" + sources."get-stdin-4.0.1" + sources."parse-github-repo-url-1.4.0" + sources."hosted-git-info-2.5.0" + sources."dargs-4.1.0" + sources."lodash.template-4.4.0" + sources."number-is-nan-1.0.1" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.templatesettings-4.1.0" + sources."gitconfiglocal-1.0.0" + sources."pify-2.3.0" + sources."ini-1.3.4" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."path-type-1.1.0" + sources."parse-json-2.2.0" + sources."pinkie-promise-2.0.1" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" + sources."pinkie-2.0.4" + sources."is-utf8-0.2.1" + sources."readable-stream-2.3.3" + sources."xtend-4.0.1" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."object-assign-4.1.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."currently-unhandled-0.4.1" + sources."array-find-index-1.0.2" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."os-tmpdir-1.0.2" + sources."uuid-2.0.3" + sources."concat-stream-1.6.0" + sources."typedarray-0.0.6" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."strip-eof-1.0.0" + sources."lru-cache-4.1.1" + sources."shebang-command-1.2.0" + sources."which-1.3.0" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."shebang-regex-1.0.0" + sources."isexe-2.0.0" + sources."path-key-2.0.1" + sources."locate-path-2.0.0" + sources."p-locate-2.0.0" + sources."p-limit-1.1.0" + sources."jsonfile-3.0.1" + sources."universalify-0.1.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.1.0" + sources."external-editor-2.0.4" + sources."figures-2.0.0" + sources."mute-stream-0.0.7" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + sources."color-convert-1.9.0" + sources."color-name-1.1.3" + sources."has-flag-2.0.0" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."mimic-fn-1.1.0" + sources."iconv-lite-0.4.18" + sources."jschardet-1.5.1" + sources."tmp-0.0.31" + sources."is-promise-2.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."ci-info-1.0.0" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" + sources."are-we-there-yet-1.1.4" + sources."console-control-strings-1.1.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."aproba-1.1.2" + sources."has-unicode-2.0.1" + (sources."wide-align-1.1.2" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."byline-5.0.0" + sources."duplexer-0.1.1" + sources."moment-2.18.1" + sources."make-dir-1.0.0" + sources."temp-dir-1.0.0" + sources."imurmurhash-0.1.4" + sources."slide-1.1.6" + sources."detect-indent-5.0.0" + sources."sort-keys-1.1.2" + sources."is-plain-obj-1.1.0" + sources."get-caller-file-1.0.2" + (sources."os-locale-2.1.0" // { + dependencies = [ + sources."execa-0.7.0" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."which-module-2.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-7.0.0" // { + dependencies = [ + sources."camelcase-4.1.0" + ]; + }) + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + ]; + }) + sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."invert-kv-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Tool for managing JavaScript projects with multiple packages"; + homepage = https://lernajs.io/; + license = "MIT"; + }; + production = true; + }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; @@ -32436,10 +33249,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-3.5.1.tgz"; - sha1 = "b749ee3d2b5a118dad53e8e41585b3f71e75499a"; + url = "https://registry.npmjs.org/webpack/-/webpack-3.5.2.tgz"; + sha1 = "a9601066e23af3c80f3bf9758fd794ca9778f251"; }; dependencies = [ sources."acorn-5.1.1" @@ -33215,7 +34028,7 @@ in ]; }) sources."yeoman-doctor-2.1.0" - sources."yeoman-environment-2.0.1" + sources."yeoman-environment-2.0.2" (sources."yosay-2.0.1" // { dependencies = [ sources."ansi-styles-3.2.0" From 149df7769af216aca95eb07a992387f7d578068b Mon Sep 17 00:00:00 2001 From: Grant Wu Date: Wed, 9 Aug 2017 02:54:22 -0400 Subject: [PATCH 037/213] libtorrentRasterbar 1.1.1 -> 1.1.4 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index b6aace0de2d..ed52902938d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.1.1"; - sha256 = "1185ixlhhwpkqvwhnhrzgply03zq8mycj25m1am9aad8nshiaw3j"; + version = "1.1.4"; + sha256 = "1rrp4b7zfz0fnjvax2r9r5rrh6z1s4xqb9dx20gzr4gs8x5v5jws"; }) From e77068d0825e19ad6d2b624d25dcc6aeceab3076 Mon Sep 17 00:00:00 2001 From: Grant Wu Date: Wed, 9 Aug 2017 02:57:29 -0400 Subject: [PATCH 038/213] Add note to libtorrent to prevent conflation with libtorrentRasterbar --- pkgs/tools/networking/p2p/libtorrent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 3ff02834247..d1827a6045d 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,3 +1,5 @@ +# NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent +# This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others { stdenv, fetchFromGitHub, pkgconfig , libtool, autoconf, automake, cppunit , openssl, libsigcxx, zlib }: From 7c669d6f7bb99850417ece83e2f41737dced9889 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Thu, 10 Aug 2017 08:02:20 +0200 Subject: [PATCH 039/213] nodejs: 8.2.1 -> 8.3.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 593e9d1e562..a891e637d26 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.2.1"; + version = "8.3.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "12wcmm2g1zlihja41my5r06sla0s6ygvycxds1ryl3jl2j4nvi02"; + sha256 = "0lbfp7j73ig0xa3gh8wnl4g3lji7lm34l0ybfys4swl187c3da63"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; From 75078b9116f65a681786871316b3cdab2999e623 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Thu, 10 Aug 2017 08:38:52 +0200 Subject: [PATCH 040/213] networkmanager_dmenu: unstable-2017-05-28 -> 1.1 --- pkgs/tools/networking/networkmanager_dmenu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix index 79fad953a2c..82810e714d5 100644 --- a/pkgs/tools/networking/networkmanager_dmenu/default.nix +++ b/pkgs/tools/networking/networkmanager_dmenu/default.nix @@ -3,14 +3,14 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { - name = "networkmanager_dmenu-unstable-${version}"; - version = "2017-05-28"; + name = "networkmanager_dmenu-${version}"; + version = "1.1"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "eeb8e6922dee887890884f129b51bb21b0047d30"; - sha256 = "00n82sjjqk76sfxi92f5vnzpngk66cqwyzqdanbszpl019ajr5h6"; + rev = "v${version}"; + sha256 = "1z6151z7c4jv5k2i50zr7ld4k3m07dgpmss9f3hsav95cv55dcnb"; }; buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ]; From 031eb79a0b99b75577b375a503368a680f7389c1 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 10 Aug 2017 10:13:17 +0000 Subject: [PATCH 041/213] ccacheWrapper: extraConfig does not handle special characters An independent part of https://github.com/NixOS/nixpkgs/pull/28022 --- pkgs/development/tools/misc/ccache/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 765fdfb2ea4..65c7e633f8e 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, zlib }: +{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; @@ -32,18 +32,16 @@ let ccache = stdenv.mkDerivation rec { isGNU = unwrappedCC.isGNU or false; }; inherit (unwrappedCC) lib; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin wrap() { local cname="$1" if [ -x "${unwrappedCC}/bin/$cname" ]; then - cat > $out/bin/$cname << EOF - #!/bin/sh - ${extraConfig} - exec ${ccache}/bin/ccache ${unwrappedCC}/bin/$cname "\$@" - EOF - chmod +x $out/bin/$cname + makeWrapper ${ccache}/bin/ccache $out/bin/$cname \ + --run ${stdenv.lib.escapeShellArg extraConfig} \ + --add-flags ${unwrappedCC}/bin/$cname fi } From 15351c478046935ae4a5504d492c7db1ad0fa31e Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 10 Aug 2017 11:34:32 +0000 Subject: [PATCH 042/213] apply 'restartIfChanged = false' to all libvirtd services Although it is quite safe to restart ```libvirtd``` when there are only ```qemu``` machines, in case if there are ```libvirt_lxc``` containers, a restart may result in putting the whole system into an odd state: the containers go on running but the new ```libvirtd``` daemons do not see them. --- nixos/modules/virtualisation/libvirtd.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 57178e05e5c..ade0ba531cf 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -168,8 +168,9 @@ in { serviceConfig = { Type = "notify"; KillMode = "process"; # when stopping, leave the VMs alone - Restart = "on-failure"; + Restart = "no"; }; + restartIfChanged = false; }; systemd.services.libvirt-guests = { @@ -187,6 +188,7 @@ in { systemd.services.virtlogd = { description = "Virtual machine log manager"; serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlogd virtlogd"; + restartIfChanged = false; }; systemd.sockets.virtlockd = { @@ -198,6 +200,7 @@ in { systemd.services.virtlockd = { description = "Virtual machine lock manager"; serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd"; + restartIfChanged = false; }; }; } From b5ea89f50c66d23ad3119aa03186fda858b6c943 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Mon, 24 Jul 2017 17:25:38 +0700 Subject: [PATCH 043/213] neofetch: 3.0.1 -> 3.2.0 --- pkgs/tools/misc/neofetch/default.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 2ecaae6a33f..ea2b863cd77 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,26 +1,33 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.0.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0ccdgyn9m7vbrmjlsxdwv7cagsdg8hy8x4n1mx334pkqvl820jjn"; + sha256 = "1skkclvkqayqsbywja2fhv18l4rn9kg2da6bkip82zrwd713akl3"; }; - patchPhase = '' - substituteInPlace ./neofetch \ - --replace "/usr/share" "$out/share" - ''; + # This patch is only needed so that Neofetch 3.2.0 can look for + # configuration file, w3m directory (for fetching images) and ASCII + # directory properly. It won't be needed in subsequent releases. + patches = [ + (fetchpatch { + name = "nixos.patch"; + url = "https://github.com/konimex/neofetch/releases/download/3.2.0/nixos.patch"; + sha256 = "0c6vsa74bxq6qlgbv3rrkhzkpvnq4304s6y2r1bl0sachyakaljy"; + }) + ]; + dontBuild = true; makeFlags = [ - "DESTDIR=$(out)" - "PREFIX=" + "PREFIX=$(out)" + "SYSCONFDIR=$(out)/etc" ]; meta = with stdenv.lib; { @@ -28,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/dylanaraps/neofetch; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ alibabzo ]; + maintainers = with maintainers; [ alibabzo konimex ]; }; } From 6bcbf585ec480e57405a2ce0440e0ff382c0dff2 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Thu, 10 Aug 2017 16:02:03 +0200 Subject: [PATCH 044/213] Typora: 0.9.29 -> 0.9.31 --- pkgs/applications/editors/typora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index a40c22e8886..f9756ad1ab7 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.29"; + version = "0.9.31"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "1d7a02ee603be871d6f8c25b5c11069267ec11644a4f513635c0769ce46a44a7"; + sha256 = "8a68c4fb01316bda7c8291da22f539c70d09ca7af89190ad8705296b21f10758"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "79834b0ccd2257c030aec850ebc81fe115f46891b482f1ffa41fcc19c5f29659"; + sha256 = "16a1d1c9503f6fc2c62d0bad4ef4db68e0e70cbd430f05f923b83f869e3b3486"; } ; From e204bef48775e8618f4497c80b79aa8730c97b2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 10 Aug 2017 16:45:33 +0200 Subject: [PATCH 045/213] libsoup: update to version 2.59.90.1 to fix CVE-2017-2885 --- pkgs/development/libraries/libsoup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 030d800f4a5..d1b476d94d2 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,15 +4,15 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.56"; - version = "${majorVersion}.0"; + majorVersion = "2.59"; + version = "${majorVersion}.90.1"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5"; + sha256 = "0bh8wa0szkm9bx2anfq655zshwf6jhxvrqwx8jyh8rqgi6z9dhz0"; }; prePatch = '' From 151fab911ed81c0db355bc371c4b4c32924dc3ec Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Thu, 10 Aug 2017 23:57:46 +1000 Subject: [PATCH 046/213] mbpfan: 1.9.1 -> 2.0.1 removed patch for lsmod/grep as they are no longer used (dgraziotin/mbpfan@5f2da79) --- pkgs/os-specific/linux/mbpfan/default.nix | 15 ++---------- pkgs/os-specific/linux/mbpfan/fixes.patch | 29 ----------------------- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 pkgs/os-specific/linux/mbpfan/fixes.patch diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 4866c3d8132..0c4ee907bef 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -2,24 +2,13 @@ stdenv.mkDerivation rec { name = "mbpfan-${version}"; - version = "1.9.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "dgraziotin"; repo = "mbpfan"; rev = "v${version}"; - sha256 = "0issn5233h2nclrmh2jzyy5y0dyyd57f1ia7gvs3bys95glcm2s5"; + sha256 = "1iri1py9ym0zz7fcacbf0d9y3i3ay77jmajckchagamkfha16zyp"; }; - patches = [ - ./fixes.patch - (fetchpatch { # buffer overflow fix https://github.com/dgraziotin/mbpfan/issues/72 - url = https://github.com/dgraziotin/mbpfan/commit/f2736c8ab93cafffc25b86bcc6c33e6cbd537243.patch; - sha256 = "10sldc69c91qk3hq0f6r3gxay38l2iw93nl85qh94mwpb8hy92yj"; }) - ]; - postPatch = '' - substituteInPlace src/main.c \ - --replace '@GREP@' '${gnugrep}/bin/grep' \ - --replace '@LSMOD@' '${kmod}/bin/lsmod' - ''; installPhase = '' mkdir -p $out/bin $out/etc cp bin/mbpfan $out/bin diff --git a/pkgs/os-specific/linux/mbpfan/fixes.patch b/pkgs/os-specific/linux/mbpfan/fixes.patch deleted file mode 100644 index 548cce05c35..00000000000 --- a/pkgs/os-specific/linux/mbpfan/fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/main.c b/src/main.c -index e8af708..6cfee17 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -71,7 +71,7 @@ void check_requirements() - * Check for coretemp and applesmc modules - * Credits: -http://stackoverflow.com/questions/12978794 - */ -- FILE *fd = popen("lsmod | grep coretemp", "r"); -+ FILE *fd = popen("@LSMOD@ | @GREP@ coretemp", "r"); - char buf[16]; - - if (!(fread (buf, 1, sizeof (buf), fd) > 0)) { -@@ -87,7 +87,7 @@ void check_requirements() - - pclose(fd); - -- fd = popen("lsmod | grep applesmc", "r"); -+ fd = popen("@LSMOD@ | @GREP@ applesmc", "r"); - - if (!(fread (buf, 1, sizeof (buf), fd) > 0)) { - DIR* dir = opendir(APPLESMC_PATH); -@@ -145,4 +145,4 @@ int main(int argc, char *argv[]) - void (*fan_control)() = mbpfan; - go_daemon(fan_control); - exit(EXIT_SUCCESS); --} -\ No newline at end of file -+} From 8d70d4066fb45267b6846aaa7961c470b9741a8e Mon Sep 17 00:00:00 2001 From: AbnerLee Date: Fri, 11 Aug 2017 00:47:08 +0800 Subject: [PATCH 047/213] correct the sha265 of typora after package update The deb is updated just now without increase the version number.. --- pkgs/applications/editors/typora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index f9756ad1ab7..0733bd79665 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "8a68c4fb01316bda7c8291da22f539c70d09ca7af89190ad8705296b21f10758"; + sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "16a1d1c9503f6fc2c62d0bad4ef4db68e0e70cbd430f05f923b83f869e3b3486"; + sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1"; } ; From 700f7614cde2673bc1ececf1f2008b64a1b56158 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 10 Aug 2017 12:55:46 +0200 Subject: [PATCH 048/213] Partly revert "python.buildEnv: only wrap executables" This partly reverts commit 4495bfe1382ea779f02996d0e18d25d892678e8c. The xen changes should not have been commited. (cherry picked from commit 206a4c9aba6772f01d175e72636d1283dc038cc0) --- pkgs/applications/virtualization/xen/packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index f4bde18f3df..8f5262acb02 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -10,6 +10,8 @@ rec { xen_4_5-vanilla = callPackage ./4.5.nix { # At the very least included seabios and etherboot need gcc49, # so we have to build all of it with gcc49. + stdenv = overrideCC stdenv gcc49; + meta = { description = "vanilla"; longDescription = '' @@ -58,6 +60,8 @@ rec { xen_4_8-vanilla = callPackage ./4.8.nix { # At the very least included seabios and etherboot need gcc49, # so we have to build all of it with gcc49. + stdenv = overrideCC stdenv gcc49; + meta = { description = "vanilla"; longDescription = '' From 0f5cbe43da12ce2660a6ea6bcbc848dccce4a34c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Aug 2017 20:48:31 +0200 Subject: [PATCH 049/213] subversion18: 1.8.17 -> 1.8.18 for CVE-2017-9800 See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 17ff3e4b19f..45080e25d59 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -104,8 +104,8 @@ let in { subversion18 = common { - version = "1.8.17"; - sha256 = "1450fkj1jmxyphqn6cd95z1ykwsabajm9jw4i412qpwss8w9a4fy"; + version = "1.8.18"; + sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5"; }; subversion19 = common { From abd837fe3d5fc31f310eb2afe67a58dadcb002f8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Aug 2017 20:52:45 +0200 Subject: [PATCH 050/213] subversion19: 1.9.5 -> 1.9.6 for CVE-2017-9800 See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 45080e25d59..586f4c52792 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -109,7 +109,7 @@ in { }; subversion19 = common { - version = "1.9.5"; - sha256 = "1ramwly6p74jhb2rdm5ygxjri7jds940cilyvnsdq60xzy5cckwa"; + version = "1.9.6"; + sha256 = "06dfram53lyfyyqgz1r7c5323qqc6mjcpwi1j402y21lnqgwbjyv"; }; } From 11861b7c97af2c64761e68763dd3d13a1508fd4e Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Tue, 8 Aug 2017 22:43:54 +0200 Subject: [PATCH 051/213] pcmanfm: build with gtk3 --- pkgs/applications/misc/pcmanfm/default.nix | 12 ++++++++++-- pkgs/development/libraries/libfm/default.nix | 13 +++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 137d68d8171..8251c07206d 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: +{ stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig +, withGtk3 ? true, gtk2, gtk3 }: +let + libfm' = libfm.override { inherit withGtk3; }; + gtk = if withGtk3 then gtk3 else gtk2; + inherit (stdenv.lib) optional; +in stdenv.mkDerivation rec { name = "pcmanfm-1.2.5"; src = fetchurl { @@ -7,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"; }; - buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; + buildInputs = [ glib gtk intltool libfm' libX11 pango pkgconfig ]; + + configureFlags = optional withGtk3 "--with-gtk=3"; meta = with stdenv.lib; { homepage = http://blog.lxde.org/?cat=28/; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index c32866a0d26..d42425c8e18 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34 -, extraOnly ? false }: +{ stdenv, fetchurl, glib, intltool, menu-cache, pango, pkgconfig, vala_0_34 +, extraOnly ? false +, withGtk3 ? false, gtk2, gtk3 }: let + gtk = if withGtk3 then gtk3 else gtk2; inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { @@ -14,10 +16,13 @@ stdenv.mkDerivation rec { sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; }; - buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ] + buildInputs = [ glib gtk intltool pango pkgconfig vala_0_34 ] ++ optional (!extraOnly) menu-cache; - configureFlags = optional extraOnly "--with-extra-only"; + configureFlags = [ (optional extraOnly "--with-extra-only") + (optional withGtk3 "--with-gtk=3") ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://blog.lxde.org/?cat=28/; From ecd4c58d0ac6d3d10916c01fc8e1cc6f27acc66f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Aug 2017 16:21:24 -0400 Subject: [PATCH 052/213] plymouth: 0.9.2 -> 0.9.3 --- pkgs/os-specific/linux/plymouth/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index b1b1a4649ba..4d70533fac7 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "plymouth-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2"; - sha256 = "0zympsgy5bbfl2ag5nc1jxlshpx8r1s1yyjisanpx76g88hfh31g"; + url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; + sha256 = "0x2a9s5jdvfcrdnwbdhm5x4ck3zimmcpghnqvhl65byfj25d13cz"; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { --libdir=$out/lib --libexecdir=$out/lib --sysconfdir=/etc + --with-systemdunitdir=$out/etc/systemd/system --localstatedir=/var --with-logo=/etc/plymouth/logo.png --with-background-color=0x000000 From b1ce017d44c5a79477b7c1d10a728f5907c62d9a Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 10 Aug 2017 20:26:24 +0000 Subject: [PATCH 053/213] babelstone-han: 9.0.2 -> 10.0.0 (#28108) * babelstone-han: 9.0.2 -> 10.0.0 * simplification (two hashes -> one hash) * simplification (fetchurl -> fetchzip) --- pkgs/data/fonts/babelstone-han/default.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 16534d4d6cb..97333f7d953 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,22 +1,16 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +let + version = "10.0.0"; +in fetchzip { name = "babelstone-han-${version}"; - version = "9.0.2"; - src = fetchurl { - url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip"; - sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha"; - }; - - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' + url = http://www.babelstone.co.uk/Fonts/0816/BabelStoneHan.zip; + postFetch = '' mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype ''; + sha256 = "0648hv5c1hq3bq7mlk7bnmflzzqj4wh137bjqyrwj5hy3nqzvl5r"; meta = with stdenv.lib; { description = "Unicode CJK font with over 32600 Han characters"; From f3f8c584a41a21b69ac7e7c1d8f19e1a8ba997be Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 10 Aug 2017 21:40:21 +0000 Subject: [PATCH 054/213] amazon-image: Add disk format option to image builder module --- nixos/maintainers/scripts/ec2/amazon-image.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index cdfac71634d..7541fbc8691 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -22,15 +22,20 @@ in { generated image. Glob patterns work. ''; }; + + format = mkOption { + type = types.enum [ "raw" "qcow2" ]; + default = "qcow2"; + description = "The image format to output"; + }; }; config.system.build.amazonImage = import ../../../lib/make-disk-image.nix { inherit lib config; - inherit (cfg) contents; + inherit (cfg) contents format; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitioned = config.ec2.hvm; diskSize = if config.ec2.hvm then 2048 else 8192; - format = "qcow2"; configFile = pkgs.writeText "configuration.nix" '' { From 5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 10 Aug 2017 22:57:26 +0000 Subject: [PATCH 055/213] amazon-image: support VPC/VHD as an output format for the builder --- nixos/lib/make-disk-image.nix | 10 ++++++++-- nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 56766ec9047..9c91bf39225 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -39,6 +39,12 @@ with lib; let + extensions = { + qcow2 = "qcow2"; + vpc = "vhd"; + raw = "img"; + }; + # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix # TODO: factor out more cleanly @@ -142,8 +148,8 @@ in pkgs.vmTools.runInLinuxVM ( mv $diskImage $out/nixos.img diskImage=$out/nixos.img '' else '' - ${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2 - diskImage=$out/nixos.qcow2 + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/nixos.${extensions.${format}} + diskImage=$out/nixos.${extensions.${format}} ''} ${postVM} ''; diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 7541fbc8691..955fdff7953 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -24,7 +24,7 @@ in { }; format = mkOption { - type = types.enum [ "raw" "qcow2" ]; + type = types.enum [ "raw" "qcow2" "vpc" ]; default = "qcow2"; description = "The image format to output"; }; From 4a0efc9c4f12ba2c69fe76a4b979c7daf0ea4aa6 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 11 Aug 2017 02:17:35 +0200 Subject: [PATCH 056/213] git: 2.14.0 -> 2.14.1 The new version contains a security fix for CVE-2017-1000117 More information regarding this update can be found here: http://marc.info/?l=git&m=150238802328673&w=2 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0b93ae1f203..7cc2c8b778a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -12,7 +12,7 @@ }: let - version = "2.14.0"; + version = "2.14.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0xarcp0m7jbncic0g3ahz8l2d6b27h0g9ndgrhy9abkx61m6wgpr"; + sha256 = "1iic3wiihxp3l3k6d4z886v3869c3dzgddjxnd5124wy1rnlqwkg"; }; hardeningDisable = [ "format" ]; From f0719b5a0b289a011cdcc5c6da3d2fc6ed677917 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Aug 2017 20:54:28 -0400 Subject: [PATCH 057/213] mercurial: 4.1.1 -> 4.3.1 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 01d1a21f3a7..39d44ab145d 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.1.1"; + version = "4.3.1"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "17imsf4haqgw364p1z9i416jinmfxfia537b84hcg0rg43hinmv3"; + sha256 = "18hq6vvjsrjsnbs15bvyyfrss35bgc0hgw4wxksdyaj578pg04ib"; }; inherit python; # pass it so that the same version can be used in hg2git From d21572c289f8f03ff393dd75759964b678eccc6e Mon Sep 17 00:00:00 2001 From: romildo Date: Wed, 9 Aug 2017 23:23:25 -0300 Subject: [PATCH 058/213] adapta-gtk-theme: 3.91.1.47 -> 3.91.2.10 --- pkgs/misc/themes/adapta/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index acce5ccac21..a86cfd48d54 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.91.1.47"; + version = "3.91.2.10"; src = fetchFromGitHub { owner = "tista500"; repo = "Adapta"; rev = version; - sha256 = "1w41xwhb93p999g0835cmlax55a5fyz9j4m5nn6nss2d6g6nrxap"; + sha256 = "0bp5fnxgrrrs0ajqw2lbhbarbpvzvajnvcjip6fkl9aa76gz9czy"; }; preferLocalBuild = true; @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { "--disable-gtk_legacy" "--disable-gtk_next" "--disable-unity" - "--disable-parallel" # parallel build is not finishing ]; meta = with stdenv.lib; { From edd4a0efe3daf137c043275062581a9ae8ac8a1e Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 10 Aug 2017 20:40:59 -0400 Subject: [PATCH 059/213] postfix: fix typo in transport_maps path --- nixos/modules/services/mail/postfix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 845c6acc7fe..47ce2c4c5e3 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -76,7 +76,7 @@ let // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; } // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; } // optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; } - // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfx/transport"; } + // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; } // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; } // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; } From 01fbf30041d1ee0c3ad819fe59389eadc92d9ac4 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 10 Aug 2017 21:10:00 -0400 Subject: [PATCH 060/213] postfix: warn about deprecated extraMasterConf option --- nixos/modules/services/mail/postfix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 47ce2c4c5e3..a3e60cfecad 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -839,5 +839,8 @@ in (mkIf (cfg.extraConfig != "") { warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ]; }) + (mkIf (cfg.extraMasterConf != "") { + warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ]; + }) ]); } From 9186dda4a9a519aeb73b68358ff9e4af911647c3 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 10 Aug 2017 21:22:28 -0400 Subject: [PATCH 061/213] postfix: wakeup value should be used even if wakeupUnusedComponent is not defined --- nixos/modules/services/mail/postfix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index a3e60cfecad..cc17db103a0 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -213,8 +213,8 @@ let wakeupDefined = options.wakeup.isDefined; wakeupUCDefined = options.wakeupUnusedComponent.isDefined; finalValue = toString config.wakeup - + optionalString (!config.wakeupUnusedComponent) "?"; - in if wakeupDefined && wakeupUCDefined then finalValue else "-"; + + optionalString (wakeupUCDefined && !config.wakeupUnusedComponent) "?"; + in if wakeupDefined then finalValue else "-"; in [ config.name From 719aa35c0cbd0cfaa4856b428f1d0717cff024dc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 11 Aug 2017 09:47:27 +0800 Subject: [PATCH 062/213] collectd-data: init at 5.7.0 - contains just data files from collectd --- pkgs/tools/system/collectd/data.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/tools/system/collectd/data.nix diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix new file mode 100644 index 00000000000..cb8c4cc7d02 --- /dev/null +++ b/pkgs/tools/system/collectd/data.nix @@ -0,0 +1,14 @@ +{ stdenv, collectd }: + +stdenv.mkDerivation rec { + inherit (collectd) meta version; + + name = "collectd-data-${version}"; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/collectd + cp ${collectd}/share/collectd/*.{db,conf} $out/share/collectd/ + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c26ba7c826..7396fc18015 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1362,6 +1362,8 @@ with pkgs; libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; + collectd-data = callPackage ../tools/system/collectd/data.nix { }; + colormake = callPackage ../development/tools/build-managers/colormake { }; cpuminer = callPackage ../tools/misc/cpuminer { }; From 5def5bab3c948944c75eba224a76a32559d5c6fc Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 11 Aug 2017 01:57:38 +0000 Subject: [PATCH 063/213] amazon-image: make image size configurable --- nixos/maintainers/scripts/ec2/amazon-image.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 955fdff7953..9756aebe7f2 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -23,6 +23,12 @@ in { ''; }; + sizeMB = mkOption { + type = types.int; + default = if config.ec2.hvm then 2048 else 8192; + description = "The size in MB of the image"; + }; + format = mkOption { type = types.enum [ "raw" "qcow2" "vpc" ]; default = "qcow2"; @@ -35,7 +41,7 @@ in { inherit (cfg) contents format; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitioned = config.ec2.hvm; - diskSize = if config.ec2.hvm then 2048 else 8192; + diskSize = sizeMB; configFile = pkgs.writeText "configuration.nix" '' { @@ -46,5 +52,4 @@ in { } ''; }; - } From ca99ec3f58a9cee35ae8317bf3a64aab5ebb526e Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 11 Aug 2017 02:12:39 +0000 Subject: [PATCH 064/213] amazon-image: fix typo in last commit --- nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 9756aebe7f2..d76fb644d02 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -41,7 +41,7 @@ in { inherit (cfg) contents format; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitioned = config.ec2.hvm; - diskSize = sizeMB; + diskSize = cfg.sizeMB; configFile = pkgs.writeText "configuration.nix" '' { From 3d8f85797ae633ced8841b522b5d77b6c5734e4f Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 11 Aug 2017 11:11:46 +0900 Subject: [PATCH 065/213] asciidoctor: use ruby 2.3 --- pkgs/tools/typesetting/asciidoctor/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 495a5fcf882..f494f191159 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,8 +1,10 @@ -{ stdenv, lib, bundlerEnv, ruby_2_2, curl }: +{ stdenv, lib, bundlerEnv, ruby, curl }: -bundlerEnv rec { +bundlerEnv { pname = "asciidoctor"; - ruby = ruby_2_2; + + inherit ruby; + gemdir = ./.; meta = with lib; { From 48ffb8284f72d1bb8bc8a3c71eea85570e51f54b Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 11 Aug 2017 00:14:26 -0300 Subject: [PATCH 066/213] eom: init at 1.18.2 --- pkgs/desktops/mate/default.nix | 1 + pkgs/desktops/mate/eom/default.nix | 42 ++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/desktops/mate/eom/default.nix diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 528f792a600..fc4849a5ec5 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -2,6 +2,7 @@ rec { atril = callPackage ./atril { }; caja = callPackage ./caja { }; + eom = callPackage ./eom { }; mate-common = callPackage ./mate-common { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { }; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix new file mode 100644 index 00000000000..1c27958b0c9 --- /dev/null +++ b/pkgs/desktops/mate/eom/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "eom-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "00ns7g7qykakc89lijrw2vwy9x9ijqiyvmnd4sw0j6py90zs8m87"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + dbus_glib + exempi + lcms2 + libexif + libjpeg + librsvg + libxml2 + shared_mime_info + gnome3.gtk + gnome3.libpeas + mate.mate-desktop + ]; + + meta = { + description = "An image viewing and cataloging program for the MATE desktop"; + homepage = http://mate-desktop.org; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} From 486391d191f9f7ec1185060f749b2065e3941b5f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 11 Aug 2017 14:22:10 +0800 Subject: [PATCH 067/213] check-uptime: init at 20161112 --- pkgs/servers/monitoring/plugins/uptime.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/monitoring/plugins/uptime.nix diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix new file mode 100644 index 00000000000..2f26bc26ba4 --- /dev/null +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "check-uptime-${version}"; + version = "20161112"; + + src = fetchFromGitHub { + owner = "madrisan"; + repo = "nagios-plugins-uptime"; + rev = "51822dacd1d404b3eabf3b4984c64b2475ed6f3b"; + sha256 = "18q9ibzqn97dsyr9xs3w9mqk80nmmfw3kcjidrdsj542amlsycyk"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + postInstall = "ln -sr $out/libexec $out/bin"; + + meta = with stdenv.lib; { + description = "Uptime check plugin for Sensu/Nagios/others"; + homepage = https://github.com/madrisan/nagios-plugins-uptime; + license = licenses.gpl3; + maintainer = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31aefbab69..556bb695dc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19231,6 +19231,8 @@ with pkgs; hy = callPackage ../development/interpreters/hy {}; + check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { }; + ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; From 18112eea52755a72095cc53f87a1fe5f783db50b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 11 Aug 2017 16:00:06 +0800 Subject: [PATCH 068/213] dropbox: 31.4.25 -> 32.4.23 --- .../networking/dropbox/default.nix | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index af4ec08ff00..088fda046a4 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,30 +24,27 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "31.4.25"; - sha256 = - { - "x86_64-linux" = "02qla89gf7zawfk0kxd3xzr7vb91khj3p83bvh456ap51h0z5wzv"; - "i686-linux" = "0sfh24qyc91q6ssn8lrzfdsv4jjy0hvgizcq3y3fk46zaa7jjxr2"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + version = "32.4.23"; + sha256 = { + "x86_64-linux" = "11jh3cyax652crhvjshi8gnvb8mpp7hfbgwqjx5n1q3j1rswm3d1"; + "i686-linux" = "0xf0in3ywgd53v19h0v2sg69b6y2lbvr5y6jz10x3cighzr31qfp"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - arch = - { - "x86_64-linux" = "x86_64"; - "i686-linux" = "x86"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + arch = { + "x86_64-linux" = "x86_64"; + "i686-linux" = "x86"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; - libs = - [ - dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM - libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt - ncurses zlib + libs = [ + dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM + libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt + ncurses zlib - qtbase qtdeclarative qtwebkit - ]; + qtbase qtdeclarative qtwebkit + ]; ldpath = stdenv.lib.makeLibraryPath libs; desktopItem = makeDesktopItem { @@ -141,11 +138,11 @@ in mkDerivation { paxmark m $out/${appdir}/dropbox ''; - meta = { - homepage = http://www.dropbox.com; + meta = with lib; { description = "Online stored folders (daemon version)"; - maintainers = with lib.maintainers; [ ttuegel ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - license = lib.licenses.unfree; + homepage = http://www.dropbox.com; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 8dc869e3400cb30bd8685128c038593a0e793b54 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 31 Jul 2017 09:52:45 +0200 Subject: [PATCH 069/213] chromium: 59.0.3071.115 -> 60.0.3112.78 get rid of outdated version branches and patches take a patch from gentoo, to fix gn bootstrapping --- .../networking/browsers/chromium/common.nix | 11 ++-- ...romium-59.0.3071.115-system_ffmpeg-1.patch | 63 ------------------- .../patches/chromium-gn-bootstrap-r8.patch | 13 ++++ .../chromium/patches/glibc-2.24.patch | 14 ----- .../browsers/chromium/upstream-info.nix | 18 +++--- 5 files changed, 27 insertions(+), 92 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 11177f3ee48..b930ab79658 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -104,23 +104,22 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 dbus_glib + glib gtk2 gtk3 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optional (versionAtLeast version "56.0.0.0") gtk3; + ++ optional pulseSupport libpulseaudio; patches = [ ./patches/nix_plugin_paths_52.patch + ./patches/chromium-gn-bootstrap-r8.patch # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 ./patches/fix_network_api_crash.patch - ./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch - ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch - ++ optional enableWideVine ./patches/widevine.patch; + + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch deleted file mode 100644 index 2ffdcc0ad6a..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch +++ /dev/null @@ -1,63 +0,0 @@ -Submitted By: DJ Lucas -Date: 2017-06-25 -Initial Package Version: 57.0.2987.110 -Upstream Status: Not submitted -Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch -Description: Allows building with system provided ffmpeg. Rediffed - for chromium-59.0.3071.109. - -diff -Naurp chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h ---- chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h 2017-06-20 17:03:19.000000000 -0500 -+++ chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h 2017-06-23 00:21:10.551912699 -0500 -@@ -23,10 +23,6 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of FFmpeg's --// BUILD.gn file or the headers below will generate different structures! --#define FF_API_CONVERGENCE_DURATION 0 - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -40,7 +36,6 @@ extern "C" { - MSVC_PUSH_DISABLE_WARNING(4244); - #include - #include --#include - #include - #include - #include -diff -Naurp chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc ---- chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc 2017-06-20 17:03:19.000000000 -0500 -+++ chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc 2017-06-23 00:22:56.289311692 -0500 -@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone - // If no estimate is found, the stream entry will be kInfiniteDuration. - std::vector start_time_estimates(format_context->nb_streams, - kInfiniteDuration); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- // We ignore kNoTimestamp here since -int64_t::min() is possible; see -- // https://crbug.com/700501. Technically this is a valid value, but in -- // practice shouldn't occur, so just ignore it when estimating. -- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration && -- packet_pts < start_time_estimates[stream->index]) { -- start_time_estimates[stream->index] = packet_pts; -- } -- } -- packet_buffer = packet_buffer->next; -- } -- } - - std::unique_ptr media_tracks(new MediaTracks()); - diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch new file mode 100644 index 00000000000..d9f389aaf58 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/sys_info.cc', + 'base/task_runner.cc', + 'base/task_scheduler/delayed_task_manager.cc', ++ 'base/task_scheduler/environment_config.cc', + 'base/task_scheduler/post_task.cc', + 'base/task_scheduler/priority_queue.cc', + 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch deleted file mode 100644 index 10a04b7ec8d..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200 -+++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200 -@@ -41,6 +41,11 @@ - #include - #include - -+#if OS(LINUX) && defined(MADV_FREE) -+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime -+#undef MADV_FREE -+#endif -+ - #ifndef MADV_FREE - #define MADV_FREE MADV_DONTNEED - #endif diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 708320e92a2..ba3995f129a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2"; - sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n"; - version = "60.0.3112.66"; + sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; + sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m"; + version = "60.0.3112.78"; }; dev = { - sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g"; - sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv"; - version = "61.0.3153.4"; + sha256 = "0b8bzxnnzfl17vw0gwds89zjc4z4zi6fdz8f97w3x8a5ad0c2h5i"; + sha256bin64 = "1n1q6g7avw4yrzdhpzq0pfd12k1fb18hc01jqnq2ak0aisdaga72"; + version = "61.0.3163.13"; }; stable = { - sha256 = "0w1i4q7w5lcajc18jrchrhhm00x0jzm846l5x7a5rcp3baawkjrp"; - sha256bin64 = "1naq20508qjm9hlwlpj686a0lawca58rnr35ws2gh2gsyxrxnmx1"; - version = "59.0.3071.115"; + sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; + sha256bin64 = "0wbqbbq9zxizfbjxj241nhk1qgjq91db0lzzbkm5hjvjhx6war4s"; + version = "60.0.3112.78"; }; } From bb397093b53b8f9f839adb9c0190ab5bd23ba677 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 31 Jul 2017 10:01:15 +0200 Subject: [PATCH 070/213] chromium: add build flags and system libs This is lifted from the Arch build recipe: https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/chromium using system libjpeg still doesn't work for some reason, otherwise the build runs fine --- .../networking/browsers/chromium/common.nix | 14 +++++++++++--- .../networking/browsers/chromium/default.nix | 9 +++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b930ab79658..7802e1bf1b5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -60,7 +60,10 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "ffmpeg" "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "snappy" # "libpng" "libjpeg" + "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" + # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* + # "re2" # fails with linker errors + # "ffmpeg" # https://crbug.com/731766 ]; opusWithCustomModes = libopus.override { @@ -73,7 +76,7 @@ let libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib - ffmpeg harfbuzz libxslt harfbuzz-icu libxml2 + ffmpeg harfbuzz-icu libxslt libxml2 ]; # build paths and release info @@ -182,9 +185,14 @@ let enable_hotwording = enableHotwording; enable_widevine = enableWideVine; use_cups = cupsSupport; - } // { + treat_warnings_as_errors = false; is_clang = false; + clang_use_chrome_plugins = false; + remove_webcore_debug_symbols = true; + use_gtk3 = true; + enable_swiftshader = false; + fieldtrial_testing_like_official_build = true; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 30a16d824d0..7aa02e2c574 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed -, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas +, glib, gtk3, gnome3, gsettings_desktop_schemas # package customization , channel ? "stable" @@ -67,9 +67,6 @@ let inherit (stdenv.lib) versionAtLeast; - gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; - gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; - in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -78,10 +75,10 @@ in stdenv.mkDerivation { makeWrapper ed # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk + gsettings_desktop_schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome.defaultIconTheme + gnome3.defaultIconTheme ]; outputs = ["out" "sandbox"]; From e8f1ddcbd1d9bd0f523670cc9e7c0f69ba75c243 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 3 Aug 2017 14:44:37 +0200 Subject: [PATCH 071/213] chromium: 60.0.3112.78 -> 60.0.3112.90 --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index ba3995f129a..e80cfdbc904 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -6,13 +6,13 @@ version = "60.0.3112.78"; }; dev = { - sha256 = "0b8bzxnnzfl17vw0gwds89zjc4z4zi6fdz8f97w3x8a5ad0c2h5i"; - sha256bin64 = "1n1q6g7avw4yrzdhpzq0pfd12k1fb18hc01jqnq2ak0aisdaga72"; - version = "61.0.3163.13"; + sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq"; + sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1"; + version = "61.0.3163.25"; }; stable = { - sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8"; - sha256bin64 = "0wbqbbq9zxizfbjxj241nhk1qgjq91db0lzzbkm5hjvjhx6war4s"; - version = "60.0.3112.78"; + sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl"; + sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk"; + version = "60.0.3112.90"; }; } From d5294f7359beb3a149cf55d9021e69ce118dff4e Mon Sep 17 00:00:00 2001 From: wisut hantanong Date: Mon, 7 Aug 2017 15:52:35 +0700 Subject: [PATCH 072/213] nodePackages.jsonlint init : at 1.6.2 --- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 1da53d8e773..1941d9821b4 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -33,6 +33,7 @@ , "jshint" , "json" , "js-beautify" +, "jsonlint" , "jsontool" , "json-refs" , "json-server" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 229c5743a4d..f4f225ec585 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -25643,6 +25643,30 @@ in }; production = true; }; + jsonlint = nodeEnv.buildNodePackage { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; + sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + }; + dependencies = [ + sources."nomnom-1.8.1" + sources."JSV-4.0.2" + sources."underscore-1.6.0" + sources."chalk-0.4.0" + sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Validate JSON"; + homepage = http://zaach.github.com/jsonlint/; + }; + production = true; + }; jsontool = nodeEnv.buildNodePackage { name = "jsontool"; packageName = "jsontool"; From 400abb88773baa286eec3451267e7397f2be39b3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 29 Jul 2017 23:33:58 +0200 Subject: [PATCH 073/213] gdal: 2.1.3 -> 2.2.1 --- pkgs/development/libraries/gdal/default.nix | 39 +++++++++++++-------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index eb8f17980c2..0bb91951a28 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; -composableDerivation.composableDerivation {} (fixed: rec { - version = "2.1.3"; +stdenv.mkDerivation rec { + version = "2.2.1"; name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "0jh7filpf5dk5iz5acj7y3y49ihnzqypxckdlj0sjigbqq6hlsmf"; + url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite @@ -22,16 +22,6 @@ composableDerivation.composableDerivation {} (fixed: rec { ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; - hardeningDisable = [ "format" ]; - - # - Unset CC and CXX as they confuse libtool. - # - teach gdal that libdf is the legacy name for libhdf - preConfigure = '' - unset CC CXX - substituteInPlace configure \ - --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" - ''; - configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff.dev}" # optional (without largetiff support) @@ -50,6 +40,25 @@ composableDerivation.composableDerivation {} (fixed: rec { (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; + hardeningDisable = [ "format" ]; + + CXXFLAGS = "-fpermissive"; + + postPatch = '' + sed -i '/ifdef bool/i\ + #ifdef swap\ + #undef swap\ + #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + ''; + + # - Unset CC and CXX as they confuse libtool. + # - teach gdal that libdf is the legacy name for libhdf + preConfigure = '' + unset CC CXX + substituteInPlace configure \ + --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" + ''; + preBuild = '' substituteInPlace swig/python/GNUmakefile \ --replace "ifeq (\$(STD_UNIX_LAYOUT),\"TRUE\")" "ifeq (1,1)" @@ -68,4 +77,4 @@ composableDerivation.composableDerivation {} (fixed: rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; -}) +} From 64b57cfc1d9ba2758fa7237997261d497d9e721a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 10 Aug 2017 20:37:56 +0200 Subject: [PATCH 074/213] shapelib: use not HTTPS as TLS is configured incorrectly --- pkgs/development/libraries/shapelib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 529dee9376a..b481bd0cf65 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "shapelib-1.4.0"; src = fetchurl { - url = "https://download.osgeo.org/shapelib/${name}.tar.gz"; + url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y"; }; From d98245b25609bc7529e292bcee8ab9c18404f0eb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 00:02:24 +0200 Subject: [PATCH 075/213] pythonPackages.keystoneauth1: fix substituteInPlace --- pkgs/development/python-modules/keystoneauth1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 033f08f9587..c2c2235836f 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { postPatch = '' sed -i 's@python@${python.interpreter}@' .testr.conf - substituteInPlace requirements.txt --replace "argparse" + substituteInPlace requirements.txt --replace "argparse" "" ''; } From 84a9a80123206fbb37cf20f87283336b8bfc6b21 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 00:02:48 +0200 Subject: [PATCH 076/213] pythonPackages.oslo-config: fix substituteInPlace --- pkgs/development/python-modules/oslo-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 7cdfb9061fb..a76937278c4 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - substituteInPlace requirements.txt --replace "argparse" + substituteInPlace requirements.txt --replace "argparse" "" ''; } From dec77a45fafb41dd57aef11b0a784a3fb100593a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 00:03:06 +0200 Subject: [PATCH 077/213] xastir: fix build --- pkgs/applications/misc/xastir/default.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 9b27e8fc794..c677f7371fc 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -4,11 +4,9 @@ , perl, proj, rastermagick, shapelib }: -let +stdenv.mkDerivation rec { + name = "xastir-${version}"; version = "208"; -in -stdenv.mkDerivation { - name = "xastir-"+version; src = fetchFromGitHub { owner = "Xastir"; @@ -17,15 +15,16 @@ stdenv.mkDerivation { sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl"; }; - buildInputs = - [ autoreconfHook - curl db gdal libgeotiff - libXpm libXt motif pcre - perl proj rastermagick shapelib - ]; + buildInputs = [ + autoreconfHook + curl db gdal libgeotiff + libXpm libXt motif pcre + perl proj rastermagick shapelib + ]; - configureFlags = - [ "--with-motif-includes=${motif}/include" ]; + configureFlags = [ "--with-motif-includes=${motif}/include" ]; + + postPatch = "patchShebangs ."; meta = with stdenv.lib; { description = "Graphical APRS client"; From fac1ded619c8a4ecb6b7fdb5a119e4ea7f586f20 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 03:20:08 +0200 Subject: [PATCH 078/213] trezor-bridge: remove --- .../mozilla-plugins/trezor/default.nix | 47 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 49 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix deleted file mode 100644 index db871c0c9a5..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, dpkg, zlib }: - -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "TREZOR-bridge-1.0.5"; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb; - sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z"; - } - else - fetchurl { - url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb; - sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n"; - }; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - dontStrip = true; - dontPatchELF = true; - - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; - - installPhase = '' - mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins - cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/ - cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins - ''; - - meta = with stdenv.lib; - { description = "Plugin for browser to TREZOR device communication"; - homepage = https://mytrezor.com; - license = licenses.unfree; - maintainers = with maintainers; [ ehmry ]; - # Download URL, .deb content & hash (yikes) changed, not version. - # New archive doesn't contain any Mozilla plugin at all. - broken = true; - }; - -} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 556bb695dc2..eaf297240db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16396,8 +16396,6 @@ with pkgs; treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; }; - trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { }; - tribler = callPackage ../applications/networking/p2p/tribler { }; trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { }; From 72457cdebbeeafbc48cba517f07351ff02cc0dab Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 11:35:58 +0200 Subject: [PATCH 079/213] pythonPackages.worldengine: fix build --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efb40cd6241..78521902c52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25473,7 +25473,7 @@ EOF substituteInPlace setup.py \ --replace pypng>=0.0.18 purepng \ --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \ - --replace 'argparse==1.2.1' 'argparse' \ + --replace 'argparse==1.2.1' "" \ --replace 'protobuf==3.0.0a3' 'protobuf' \ --replace 'noise==1.2.2' 'noise' \ --replace 'PyPlatec==1.4.0' 'PyPlatec' \ From 28cc2642f09419b0a8345d6349329b851d11ad98 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 11:40:08 +0200 Subject: [PATCH 080/213] treewide: use less `phases` if not necessary This removes some skipping of e.g. fixupPhase and cleans up occurences where this led to duplicating code --- .../altcoins/zcash/libsnark/xbyak.nix | 2 +- .../mozilla-plugins/bluejeans/default.nix | 2 -- .../git-and-tools/git-radar/default.nix | 6 ++-- pkgs/os-specific/linux/iputils/default.nix | 8 ++++-- pkgs/tools/backup/duply/default.nix | 9 +++--- pkgs/tools/compression/zstd/default.nix | 4 --- .../networking/connman_dmenu/default.nix | 5 ++-- pkgs/tools/networking/quicktun/default.nix | 5 +--- pkgs/tools/networking/ratools/default.nix | 8 ++---- pkgs/tools/networking/tlspool/default.nix | 4 +-- .../nix-prefetch-scripts/default.nix | 28 ++++++++----------- pkgs/tools/security/jd-gui/default.nix | 3 +- pkgs/tools/security/omapd/default.nix | 19 ++++++------- pkgs/tools/text/popfile/default.nix | 11 +------- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 2 ++ 16 files changed, 43 insertions(+), 74 deletions(-) diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix index 1e5d19b044a..88d432fd163 100644 --- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix +++ b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn"; }; - phases = ["unpackPhase" "installPhase"]; + dontBuild = true; installPhase = '' mkdir -p $out/include diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index c33bff60e01..fa98f2a9e78 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; installPhase = diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index 3b10c3305ef..1bf7a14932e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -4,10 +4,6 @@ stdenv.mkDerivation rec { name = "git-radar-${version}"; version = "0.5"; - phases = [ "unpackPhase" "installPhase" ]; - - dontInstallSrc = true; - src = fetchFromGitHub { owner = "michaeldfallen"; repo = "git-radar"; @@ -15,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9"; }; + dontBuild = true; + installPhase = '' mkdir -p $out/bin cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 1b6be8e4aa1..dd5770744bf 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , libsysfs, gnutls, openssl -, libcap, sp, docbook_sgml_dtd_31 +, libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: @@ -18,13 +18,15 @@ stdenv.mkDerivation rec { }; prePatch = '' - sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile + sed -e s/sgmlspl/sgmlspl.pl/ \ + -e s/nsgmls/onsgmls/ \ + -i doc/Makefile ''; makeFlags = "USE_GNUTLS=no"; buildInputs = [ - libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle + libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle ]; buildFlags = "man all ninfod"; diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 7917403a915..e8d3a2e185e 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -12,16 +12,15 @@ stdenv.mkDerivation { buildInputs = [ txt2man makeWrapper ]; - phases = [ "unpackPhase" "installPhase" ]; + postPatch = "patchShebangs ."; installPhase = '' mkdir -p "$out/bin" mkdir -p "$out/share/man/man1" - sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply - mv duply "$out/bin" + install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin:${which}/bin" - "$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz" + ${stdenv.lib.makeBinPath [ coreutils python duplicity gawk gnupg1 bash gnugrep txt2man which ]} + "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index fb9301bf1ce..2be3bf167da 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { owner = "facebook"; }; - # The Makefiles don't properly use file targets, but blindly rebuild - # all dependencies on every make invocation. So no nice phases. :-( - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - makeFlags = [ "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}" ]; diff --git a/pkgs/tools/networking/connman_dmenu/default.nix b/pkgs/tools/networking/connman_dmenu/default.nix index 42ef7f4f4da..c39c82df634 100644 --- a/pkgs/tools/networking/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman_dmenu/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, connman, dmenu }: + stdenv.mkDerivation rec { name = "connman_dmenu-${version}"; version = "git-29-9-2015"; @@ -12,10 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ connman dmenu ]; - phases = "unpackPhase patchPhase installPhase fixupPhase"; + dontBuild = true; # remove root requirement, see: https://github.com/march-linux/connman_dmenu/issues/3 - patchPhase = '' + postPatch = '' sed -i '89,92d' connman_dmenu ''; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 22c6331cb44..6332d6c8577 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -13,14 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium ]; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildPhase = "bash build.sh"; installPhase = '' - mkdir -p $out/bin rm out/quicktun*tgz - cp -v out/quicktun* $out/bin/ + install -vD out/quicktun* -t $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index 00c1c86ea8b..5e18ee80f99 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -11,15 +11,11 @@ stdenv.mkDerivation rec { sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - makeFlags = "-C src"; installPhase = '' - mkdir -p $out/{bin,sbin,share/man/man8} - cp bin/ractl $out/bin - cp bin/rad $out/sbin - cp man/* $out/share/man/man8 + install -vD bin/* -t $out/bin + install -vD man/* -t $out/share/man/man8 ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 2a43358a5e1..4a1e91f7f59 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -23,11 +23,9 @@ stdenv.mkDerivation rec { libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ] ++ stdenv.lib.optional useSystemd systemd; - phases = [ "unpackPhase" "patchPhase" "postPatchPhase" "buildPhase" "installPhase" ]; - patches = [ ./fixing-rpath.patch ./configvar-fix.patch ]; - postPatchPhase = '' + postPatch = '' substituteInPlace etc/tlspool.conf \ --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \ --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so" diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 291b1a7c600..95280bf60b3 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -8,19 +8,13 @@ let mkPrefetchScript = tool: src: deps: buildInputs = [ makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; - installPhase = '' - mkdir -p $out/bin + unpackPhase = ":"; - local wrapArgs="" - cp ${src} $out/bin/$name; - for dep in ${stdenv.lib.concatStringsSep " " deps}; do - wrapArgs="$wrapArgs --prefix PATH : $dep/bin" - done - wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" - wrapArgs="$wrapArgs --prefix PATH : ${nix.out}/bin" # For nix-hash - wrapArgs="$wrapArgs --set HOME /homeless-shelter" - wrapProgram $out/bin/$name $wrapArgs + installPhase = '' + install -vD ${src} $out/bin/$name; + wrapProgram $out/bin/$name \ + --prefix PATH : ${stdenv.lib.makeBinPath (deps ++ [ gnused nix ])} \ + --set HOME /homeless-shelter ''; preferLocalBuild = true; @@ -32,11 +26,11 @@ let mkPrefetchScript = tool: src: deps: }; }; in rec { - nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [bazaar]; - nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [cvs]; - nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils]; - nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial]; - nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out]; + nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ]; + nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ]; + nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils ]; + nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ]; + nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ]; nix-prefetch-scripts = buildEnv { name = "nix-prefetch-scripts"; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 32bc1a4d711..72cb19aa732 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ upx patchelf ]; - phases = "unpackPhase installPhase"; unpackPhase = "tar xf ${src}"; installPhase = '' mkdir -p $out/bin @@ -41,6 +40,8 @@ stdenv.mkDerivation rec { $out/bin/jd-gui ''; + dontStrip = true; + meta = { description = "Fast Java Decompiler with powerful GUI"; homepage = "http://jd.benow.ca/"; diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index ae1c2c05f14..9e01e8f0a9f 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, qt4, gdb, zlib }: -stdenv.mkDerivation rec { +{ stdenv, fetchurl, qt4, gdb, zlib }: +stdenv.mkDerivation rec { name = "omapd-${version}"; version = "0.9.2"; @@ -11,23 +11,20 @@ stdenv.mkDerivation rec { patches = [ ./zlib.patch ]; - buildInputs = [ cmake qt4 zlib gdb ]; - - phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ]; + buildInputs = [ qt4 zlib gdb ]; buildPhase = '' (cd plugins/RAMHashTables; qmake; make) qmake make - ''; + ''; installPhase = '' - mkdir -p $out $out/bin $out/etc $out/usr/lib/omapd/plugins - cp omapd $out/bin/. - cp omapd.conf $out/etc/. - cp plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/. + install -vD omapd $out/bin/omapd + install -vD omapd.conf $out/etc/omapd.conf + install -vD plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/libRAMHashTables.so ln -s $out/usr/lib/omapd/plugins $out/bin/plugins - ''; + ''; meta = with stdenv.lib; { homepage = http://code.google.com/p/omapd; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 4048093a395..334c0ee403c 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -25,15 +25,12 @@ stdenv.mkDerivation rec { TimeDate # == DateParse HTMLTemplate # IO::Socket::Socks is not in nixpkgs - # IOSocketSocks + # IOSocketSocks IOSocketSSL NetSSLeay SOAPLite ]); - - phases = [ "unpackPhase" "installPhase" "patchPhase" "postInstall" ]; - installPhase = '' mkdir -p $out/bin # I user `cd` rather than `cp $out/* ...` b/c the * breaks syntax @@ -42,11 +39,7 @@ stdenv.mkDerivation rec { cp -r * $out/bin cd $out/bin chmod +x *.pl - ''; - patchPhase = "patchShebangs $out"; - - postInstall = '' find $out -name '*.pl' -executable | while read path; do wrapProgram "$path" \ --prefix PERL5LIB : $PERL5LIB:$out/bin \ @@ -66,6 +59,4 @@ stdenv.mkDerivation rec { # http://getpopfile.org/docs/faq:systemrequirements platforms = stdenv.lib.platforms.linux; }; - } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaf297240db..18f66f33b64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11943,7 +11943,6 @@ with pkgs; iproute = callPackage ../os-specific/linux/iproute { }; iputils = callPackage ../os-specific/linux/iputils { - sp = spCompat; inherit (perlPackages) SGMLSpm; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78521902c52..8ad10d47867 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6925,6 +6925,8 @@ in { propagatedBuildInputs = with self; [ six pycrypto ]; + doCheck = false; + meta = { description = "libthumbor is the python extension to thumbor"; homepage = http://github.com/heynemann/libthumbor; From 6a8c520fbce9313ca06fbf6ba6d8c5ff930b73ed Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 Aug 2017 12:32:56 +0200 Subject: [PATCH 081/213] slop: 7.3.48 -> 7.3.49 --- pkgs/tools/misc/slop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 234ca22faa3..f6c4c3548e2 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "slop-${version}"; - version = "7.3.48"; + version = "7.3.49"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "17a070y186wa375l4z8j7xql92hgpang69fkdyksycdznih7jwk6"; + sha256 = "0is3mh2d1jqgvv72v5x92w23yf26n8n384nbr1b6cn883aw8j7jz"; }; nativeBuildInputs = [ cmake ]; From 3cbc3ddf310b758562b82ca1082ea7a83333a827 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 Aug 2017 12:38:50 +0200 Subject: [PATCH 082/213] maim: 5.4.66 -> 5.4.67 --- pkgs/tools/graphics/maim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index fcb12239650..3d278cbce6f 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.4.66"; + version = "5.4.67"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "0aimci6n7dvfwa690rbcd6fdrsvcanxy53j752v3151x6gahw3gb"; + sha256 = "1p72pkfnzhxxmlnryjyvgr6cgjm5ww10xr35si9mx9s4b9pz38jd"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 8648468833136f4a571a5dcab9a9bb6f36c4dbf2 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 10 Aug 2017 20:41:27 +0200 Subject: [PATCH 083/213] graylog: 2.2.3 -> 2.3.0 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index b1f3cff0839..00cb6fd44f2 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.3.0"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "02x8brzlyx7qpxb1pgs74iv1gdykvs7cihff0rzjmh7bp1y1xq1x"; + sha256 = "03jv8l5hj3hw91vk69pxhc2zvxyzc5sfvxf700rq83wsjh6gb5iz"; }; dontBuild = true; From 25f3cf03003677647853706019fd32e014f40024 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 8 Aug 2017 18:03:44 +0200 Subject: [PATCH 084/213] graylogPlugins: update/extend plugins --- pkgs/tools/misc/graylog/plugins.nix | 33 ++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 1c4e2c99283..8ea86d1a7a5 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -22,13 +22,26 @@ let }; }); in { + aggregates = glPlugin rec { + name = "graylog-aggregates-${version}"; + pluginName = "graylog-plugin-aggregates"; + version = "1.1.1"; + src = fetchurl { + url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1wx5i8ls7dgffsy35i91gkrj6p9nh2jbar9pgas190lfb9yk45bx"; + }; + meta = { + homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; + description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; + }; + }; auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "1.0.6"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0wvdf2rnjrhdw1vp7bc7008s45rggzq57lh8k6s3q35rppligaqd"; + sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; @@ -64,13 +77,13 @@ in { jabber = glPlugin rec { name = "graylog-jabber-${version}"; pluginName = "graylog-plugin-jabber"; - version = "1.2.1"; + version = "2.0.0"; src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/v${version}/${pluginName}-${version}.jar"; - sha256 = "1r12hpjp2ggmhsapgrk829va94aw44qi2kqqkgf1fj9ih4k0c837"; + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-jabber; + homepage = https://github.com/graylog-labs/graylog-plugin-jabber; description = "Jabber Alarmcallback Plugin for Graylog"; }; }; @@ -103,13 +116,13 @@ in { redis = glPlugin rec { name = "graylog-redis-${version}"; pluginName = "graylog-plugin-redis"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0hwz83m9gwx0fdapc63v3lr1q6acbphssqwp4qqzz78wg2w79xgi"; + url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; + sha256 = "0dfgh6w293ssagas5y0ixwn0vf54i5iv61r5p2q0rbv2da6xvhbw"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-redis; + homepage = https://github.com/graylog-labs/graylog-plugin-redis; description = "Redis plugin for Graylog"; }; }; From aa8e60d934eed31844333ab1bdb6cef3799fc502 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 10 Aug 2017 21:29:54 +0200 Subject: [PATCH 085/213] graylog module: adapt to Graylog version 2.3.0 --- nixos/modules/services/logging/graylog.nix | 24 +++++----------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 9f0fb11f025..a0dc0d6d089 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -11,9 +11,7 @@ let password_secret = ${cfg.passwordSecret} root_username = ${cfg.rootUsername} root_password_sha2 = ${cfg.rootPasswordSha2} - elasticsearch_cluster_name = ${cfg.elasticsearchClusterName} - elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled} - elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts} + elasticsearch_hosts = ${concatStringsSep "," cfg.elasticsearchHosts} message_journal_dir = ${cfg.messageJournalDir} mongodb_uri = ${cfg.mongodbUri} plugin_dir = /var/lib/graylog/plugins @@ -91,22 +89,10 @@ in ''; }; - elasticsearchClusterName = mkOption { - type = types.str; - example = "graylog"; - description = "This must be the same as for your Elasticsearch cluster"; - }; - - elasticsearchDiscoveryZenPingMulticastEnabled = mkOption { - type = types.bool; - default = false; - description = "Whether to use elasticsearch multicast discovery"; - }; - - elasticsearchDiscoveryZenPingUnicastHosts = mkOption { - type = types.str; - default = "127.0.0.1:9300"; - description = "Tells Graylogs Elasticsearch client how to find other cluster members. See Elasticsearch documentation for details"; + elasticsearchHosts = mkOption { + type = types.listOf types.str; + example = literalExample ''[ "http://node1:9200" "http://user:password@node2:19200" ]''; + description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication"; }; messageJournalDir = mkOption { From 14080832b02d7c8925504f2172e71bf2d37bb9c6 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 13:26:10 +0200 Subject: [PATCH 086/213] spCompat: remove not used anymore --- pkgs/tools/text/sgml/opensp/compat.nix | 21 --------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/tools/text/sgml/opensp/compat.nix diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix deleted file mode 100644 index 496d68df5b3..00000000000 --- a/pkgs/tools/text/sgml/opensp/compat.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, opensp }: - -stdenv.mkDerivation { - name = "sp-compat-${stdenv.lib.getVersion opensp}"; - - phases = [ "installPhase" "fixupPhase" ]; - - installPhase = '' - mkdir -pv $out/bin - for i in ${opensp}/bin/o*; do - ln -sv $i $out/bin/''${i#${opensp}/bin/o} - done - ''; - - setupHook = opensp.setupHook; - - meta = opensp.meta // { - description = "Compatibility wrapper for old programs looking for original sp programs"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18f66f33b64..82b971a96c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3558,8 +3558,6 @@ with pkgs; opensp = callPackage ../tools/text/sgml/opensp { }; - spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { }; - opentracker = callPackage ../applications/networking/p2p/opentracker { }; opentsdb = callPackage ../tools/misc/opentsdb {}; From 83f8ffb11d0a229873d6e4895865a1eed11aa1f0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 13:32:05 +0200 Subject: [PATCH 087/213] Revert "trezor-bridge: remove" This reverts commit fac1ded619c8a4ecb6b7fdb5a119e4ea7f586f20. missed one use --- .../mozilla-plugins/trezor/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix new file mode 100644 index 00000000000..db871c0c9a5 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, dpkg, zlib }: + +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; + +stdenv.mkDerivation { + name = "TREZOR-bridge-1.0.5"; + + passthru = { + mozillaPlugin = "/lib/mozilla/plugins"; + }; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb; + sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z"; + } + else + fetchurl { + url = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb; + sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n"; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + dontStrip = true; + dontPatchELF = true; + + unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins + cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/ + cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins + ''; + + meta = with stdenv.lib; + { description = "Plugin for browser to TREZOR device communication"; + homepage = https://mytrezor.com; + license = licenses.unfree; + maintainers = with maintainers; [ ehmry ]; + # Download URL, .deb content & hash (yikes) changed, not version. + # New archive doesn't contain any Mozilla plugin at all. + broken = true; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82b971a96c5..bab28228b1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16393,6 +16393,8 @@ with pkgs; treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; }; + trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { }; + tribler = callPackage ../applications/networking/p2p/tribler { }; trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { }; From aa661ed796414fc6bd4c1432e6172321efb31e1c Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 11 Aug 2017 11:10:31 +0900 Subject: [PATCH 088/213] firefox-bin: 55.0 -> 55.0.1 --- .../browsers/firefox-bin/release_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5a34d305af7..2d076828694 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,955 @@ { - version = "55.0"; + version = "55.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ach/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ach/firefox-55.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0ce9a2852a86553f96018e8873e966996f5386204065200f0b24dd0b939aa815efda0fde06133974d79ae4f944c5a77ef4d91929baddc6d72a5a457203ef7784"; + sha512 = "c991a8c53d1f415253a66fdf337e082a3cb75f30b9b340ed29b059e2a6f50d67c320bcfa9584206f1e23c1af5d3e8b825e30ee009f7d8130318cc356d8550316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/af/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/af/firefox-55.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "97c01c8794e2ffe0cc25e6352ba4c6155ea1e1dfc8bcec669036ffda1aec943326ac38c43eb8260a55d46a264858144bdf0cceb9912c4f2d0d373d4d0d4256b8"; + sha512 = "8112c343179b1bd61f03cb67a0712ef5584848bd2dfb28dc46ccabfc66eb803ef9f23d023c6f22c6cadf715ba459f36e99bae5be8f6c62af772a7f67f724767e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/an/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/an/firefox-55.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f30070803ac80d00e4fb248f0c1e871b51bb4c78f8c3b12923d6b96c9686ea22768aeb9204da880647893524aa68e44576be4092d44a6b189b5cf01f493f9c82"; + sha512 = "41899ad93e627e851423ec8b5acd6bd940a10dbe80e98377e7d4080b31e9a8f5ceb51eec46931429688a4b56065af2a3595f51c3ef2c51561dd5a06d0c0cb347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ar/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ar/firefox-55.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "213d73338a3087f925a5137432e84f1c0f881d37c33c109d9ab6e2744556341697e56c7efcd7f4d5011cdb6fec03de072afbf14c34a30770456f71c8971d4b6d"; + sha512 = "ba4bf0c1ede64f3c11d00b5ef3b193d4e36bfc49687572050b22cbd0bc30be050a7df3401eb20e869b1f33ab16988701392b845f89d4693a589be589eda54ecd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/as/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/as/firefox-55.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "1d33b5602db1a326be0ac9ed726e38b5e871904685e6586211caf6b330417d33c717399663d94d725d4f8784591c5b7eaf4b4ecb867b8d99e2c85671b31f5877"; + sha512 = "b3ae2fad8940ddaa16102f9d43bc5113a5f4f38a4527c43e1a4b88a63015d128a201b68b72377c23274023b7486829181bb44ecec43ba50fe1bc438d30da8349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ast/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ast/firefox-55.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "93a08c86dac4a81fee72cd4c35f39f578222ef11e28e503851c9a7ad7cffec3e3324c32374ed851094b8ae91c642a2d726b98cade60fb4511a935320ba790faa"; + sha512 = "80688f5eb65f4fe09a840d5f3ba2516bbe45dbb2f2b96cb4f8af38900880dea22f3b8e040491d81c96abb4fa1d50815e86b5806dc8e31148c0235b0a72bafb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/az/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/az/firefox-55.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "4661628ea83c2101481bf08c1484952a30c27b9cd1d169bacd96fb6416ef77321e7e606e989521189c5135c63b2b82b7fbd3e85d0f50919f6c9c277176aa34df"; + sha512 = "0e8d42394d79c3a8f8f9f7a7ddf5894adbd89627832908e2f82b4712bd3260e8b10e04eb0166ee8c2a1010cd9dc4836ccbf99d3af794187ee90f06142286bed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/be/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/be/firefox-55.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "7062919a385600ed74972b1851ab7bd20a46003c37e058b93cf8fdb853ebb890b173aa6cc572d2f51661b571d3efbc189d04abff4dbbd9e93398ad5a55015e7f"; + sha512 = "c13a53874775cf3e2da703dc7ca5c1f9d69e3af9050b7f58cf903f87a2ee7643e7db361d3d3628e470d808ce1b412d355653cf2d67691e1e89c584a9709cfe41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bg/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bg/firefox-55.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d58389193c33aa24aac09ad286b83f0f808116f20907506d2d37a3cc45ae43223784fc12face495cbba34be24358584e38add83048b477a27a93f8934c86c82e"; + sha512 = "8a6a34f0a31793e70edfd44edb54d3709a3960c3625f5856626c28f0df0e93d18d0190d3161c18315df678328918fd4029de9be9db7a6ee426a9054dc5d9c50e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bn-BD/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bn-BD/firefox-55.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9d552eec9497565bcd71faba474338e97465d1902280972a04f4f7e5fae88cdeac144b12fd1bc80d079b8c16b0c7e5a4dd5da6e56486e688820653cff35ae517"; + sha512 = "17e2b8046b6dfe2bef7c8dd7027fa2fe2c008672b7d5a9676a9b6ece12b7b3bf7fe61a5d5378f1974f530199739982a83b421b7cf4643c9bd654a4b2235f3bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bn-IN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bn-IN/firefox-55.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "4f150944cc42c829fc619e3a20fbca9f5116180b5c2e160d48c8b9f42325898847abbc0bb0724343527e97cbb74b7286dd8b7901c0ee9ce83559198994486505"; + sha512 = "39a5c15019881507552a583053fe601dbc04e0de410dad3ce7727ddcdb128b28c5becfc748a1c5b89bb272db66f2bcb4eb6ea1b8a3cd37c1d10156ba29b3165d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/br/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/br/firefox-55.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "18f0d851b249c7bb8979499b146756efbad587ce48ded72a58bbfa2dd1fe951d5ee6d1188f6e659c760aa4e60095b481921feb016e69f78e439de18f7ecc0bcf"; + sha512 = "7ee7d1fcffbaa0791c88338a8b471bc20747abed505ece15f74f58b747eb56b300b71ff15e72e56d5deaf75d98ccbe93bf8c1e0ad3038238913f72f9156f8790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/bs/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/bs/firefox-55.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b0b838026b932d558ff3af52bca708e3f60929c2928c17c956b1d4f2e023edd45d98d65b7ea268c2ae04299944d26cf19d9a9deecabfe447c8548cd8afe98b28"; + sha512 = "038c185cd6fd2efb1dc51c9e2275d98fa0040e68de306d5cc3d799893a69f937353c94c00bfb9fcfef2a2c6099149926ce30ecfbd972170cea501f9c44c836c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ca/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ca/firefox-55.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "fd700550d5983f53d80330d08754c84e7683f965316f738e9ca5d45176d7fd42ec57a02aaef3e82358d8c7913cce9284e04299d32cac443063184c41e5c7b0a5"; + sha512 = "be717242a9c93705234d87d0b091925f1b07e60130aa06ef19b72283f0594abafed577b6d98eaa9fab6941d1f8c2f43292de20b9476312aebe0fc51d368ac50d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cak/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cak/firefox-55.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "4cfc69ef47fee1a8a2127be92cef59d2dfb40c99ac172eb78de978e7cd7aced093a7c1da91fdf518a0c9b23a81f393919c44c353b52fcb71b53b41ffe88fa22f"; + sha512 = "1b9ea57bd4164862c9c29e3fa16200aa7ca15c277f00b838439edba4256e323aff97d27264bbd20a5e08ed70e4f897611505570eb01a2ce0f9cb30c2c611d065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cs/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cs/firefox-55.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "33c912c591e8856bad1130281db996c82df28fff10d7f7031ababeb7acd385df6ef14165c491b48edd285cd8086071dbf41e3448431f028364d62810b3fe4a34"; + sha512 = "ee32ed99d5d4b05d6a9ca4d6d274e16ada833dfc9f5735898eebcffa7925d1ac1229ab671af9f8eaad7d4fd6d2135e58c8f6266e1173a8797a513b977235ec0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/cy/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/cy/firefox-55.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5cdc13b0317d7b0998c534a92e094374ffedea9f430e0f27c97b972985ca050abb7ddecff60f87ccc0d6c240db453b335fba12eec3e8448f0f830b402dfa6171"; + sha512 = "29302ad22573fc52e0764b89848ea43ebff98ffe94d3d91d1aafa05e063cf9c5580c9e79e0b987f18a87a648a6076f98c48d20d5621ebd46be02fcf41ce19779"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/da/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/da/firefox-55.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c0cfc7e4a398d5004c1a3f1afb3ee5c32502e7929cd7ff7cbdced2f9104452a6754db8c22764cdaa90885698cdf40379016f866595f98adf1498f48576a1fc86"; + sha512 = "25f8252bac8b1b4e353dc8be0945820bb9e013dfb30866b14d6109026c122cd9038e0e70d54f959a59dbf99fbbee48d0e3254f7e1091b2e2e2811b83498e36d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/de/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/de/firefox-55.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "544e6069c5f2c92b80f804d105d4a198ca360415701d9a9ebb08044cd877a2e0793b03381bdab55e31649b021a1343647ae8f21844915096347fdc2e8280ed45"; + sha512 = "2d013bd921ea9758807e64588f887fd841c6b8b32a18b9eab3b2ac1f598c4d7acb27b2defd4a836bedac238c96cc7bf700ef87f973a39d21e87ddbb7e27be1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/dsb/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/dsb/firefox-55.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "53e7bbac4a479e06a14dc91313b66f28c5731b88faea2254c0e72e40ef4eb772c61bf494557474f03e1b52d3d85f8cfd2785085b4d7324907107080342899a56"; + sha512 = "f640fd20c2beb5cf6aaf402fa220a01176e0eb74d4429cc10f76bfca9a8579e17e490bb2f045ca6e61de4ab49703c68571c4dd7ee82c438b2f8ab94ecf53ec0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/el/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/el/firefox-55.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "304085e04c30b73476ffc84da692d9e08c3edfebb31e7e9777afa7a1e12ee0d15c5d9bc4124edade6701833de02813c0549d8a731a58e824b00e483f4965f49c"; + sha512 = "6d1f68305ef9faf6c0d304b8ed4b4c093375c03b95b01ea7c61fd421cefbc84b8fb878cf49fdc5f3ec8552b277dc351f201470c5c4f45a249b3e010a863dd65b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-GB/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-GB/firefox-55.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "237cc95b7c83b2e76627fcd2f417d21868d62398dd5477bcb9355bc0c73f53e9e595e95bf9de0597c15f7eec836aa9e3f9b1fab29309599cd4ec1c7b69b938d6"; + sha512 = "e4bb9746e00490bac82750130284847d845ee8c85d48d84b799d725a3dd82ce68046bb2c9bcfa4c92070383a4f439766abe58dbfc9346cb51aabdc730b3e8ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-US/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-US/firefox-55.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "1d86223b3f56266eb83307e92c4d39c0d765b94015b089bef8eec5730e0a8e4aeb7cd06e4cbd43b445ac4d24cccabebfae02f003b791d1be03dbec3c9a46c9ce"; + sha512 = "13598109ae60682bfa122925874173749114a093f7989bf0a4cac4def59db5ad53db61546d28ce09482cab1225924c7d35bf4efa8b3051e78ad760f892050a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/en-ZA/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/en-ZA/firefox-55.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "8411248503638d44933c38bc105874befc160e90f2323764c7bc02667c634456c7c79cc8a7931e10ccdbaf4e20e3b2d5098b9b87ec63f75ffa56b6c62aa5b746"; + sha512 = "5d7dd0d6b2e06dc2c3ab94cdeefd168c005703cc3c632aafd7896bc631002ebe26c1c0103307f3165b720cfe79e63fdc9b37429885a2eefdba492b714ab308ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/eo/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/eo/firefox-55.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "fe376d69e5a8100e3ae70036d875019b04ff2c8d62d7caf32adf528fa90f78a0d16c986b7077c61c38be5331f3413777028a853681b090d42bb3e09475a5b5ee"; + sha512 = "1f67bfb98891effb2ecfb127b9ab9ffda714187a34265277fb7841f41d5a4ddfb81ead7f4cc1d38af290feaeb36c315b2050a889b6e9b9bd7b9cdd51ba0cbb6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-AR/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-AR/firefox-55.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "7ee72d922075b528dbef56bcf784690bb54582094a113c9ff0dec0f8ef64ec214f2ee16e930f8ba7963c4bffb4a8d5fd23e5cd76ad8557d70b1632a6124ca6f6"; + sha512 = "011b4f49e90ad091be5e8d932ee9a76b1653f307db328ee6770b99ef37f57e62477ca7529d182f328203523f9d0160f337748166691921d5720640c634522515"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-CL/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-CL/firefox-55.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d03c2d4fb96b2d64c263fea62ac3cd643648baeadc4091238fff87cbc2fc37cad3069e1e4fe949a4ff7162fedc85dfaeafe49326aa5de780c96a0160e91ee9f7"; + sha512 = "ef29baee74951692720c32522bec81330911ac0366e9bbd816a5bdf0738e064268af2f63ea5b3542e51eed21775cde8b4d60f6cb47bb18b94315afcd078a1c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-ES/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-ES/firefox-55.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "6893e72c09cea00bf2b7e05f0e170e97967868675d8d9752c18bae61a5f147b60db5ef165138a3355b0221515838d526b14f09cc1f99ee893b7c9cfc618ddfe0"; + sha512 = "8f21e0632e2b4d86883b139f5992becd89a8c243afd131e2f9dd863e2fb21279bd858f618789a73d46218de3bd59a5c4b017dcdda5b1db9a3400e0e0ace3c9c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/es-MX/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/es-MX/firefox-55.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "ba8469977b4f61df8165b09d333fa6ffb718d7e3710f62a459bd0da3a80a63b947ef1cac26704b5c4e9f4eb2380b2047e500fae372a82808cc7e5fa4ab9b0e62"; + sha512 = "9d59bfffc685aee31004894e81dda5efa3c512bfe61dbf5d224b31cdff6a859598287a8a80e7d96645718689df2dfee3b4a79c064e789d246cf32138b9346f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/et/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/et/firefox-55.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "07f6ac8fab7a73fde5c607b31be1630fc2c01778808259f0f1472ad3bde56dfcdbaa584de0f9fe1fba6a540fbea6709d124daf64bdd89f755ae98884c971cfc0"; + sha512 = "a833839e8243760942337161192fdcddcdd7ccffd3b5ce3c7dc939492366e8579e0deabc933a607885f20059e40dabffd389a52db05ea6bdbc794d9e15a1c9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/eu/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/eu/firefox-55.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4f26a97eef55cb6cb4b236fb69dab897b9263ace1de3ac9fca099118b7f96db41e5b8f1dc371e636715ab2aa078d2e5e76c88fb907234d7a206e8a96f8dc9a21"; + sha512 = "0415c1f00f612d080dccfc3829c3f89de4fc5921ad8603c7eda0aaf9ca57b055c66a4a0f44782a8b381e4e166964f5cc805b65b84525a073a1fa3e605bd07aaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fa/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fa/firefox-55.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "86a1accb6903fc0f2cf49cc86920e5e4b4a20a610c6a212864ae83e2bece1d818be515fcf9823bcb1c31ae748776514ce54fe6a1a57c728d1745d67c45856a66"; + sha512 = "699be76441b245de502cf0b9ac44fe3c454fd11fa00d6ad590b2a393a31f4f291c3b5b7075741c82c28a721eb38a11a3627e71b42e910fbc2f474f2284820f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ff/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ff/firefox-55.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "b33df9a1488989cefb5bc849d44c5194c25874c679e48634673ccf8cd32cee3274b6417de6b58bdc45a68c58adbeb3e0fe36dffd9b0526b9c79a902cb7b5077c"; + sha512 = "910928159d16269784d3a41b8a423138060bdedc7e190c80e5bc95bb9358b6e8fd08c519106d68326eea4bc8f5c54157cda151fcb72d5bb1d19f82696297760b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fi/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fi/firefox-55.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "c03b784f3d13078fdc760f07f5bdc2352e5e3ea2d8d49931f6ca6a9ce91b787d85624cb1f2d6bcb624cab6a3c018669c1f47443e2a32fc0472d2139623275885"; + sha512 = "1085f674e3fd557d62d29c81d52dbabbf09229a03d38d8eba1886a98937c560e91b8a5cd5fac1d313946eba6622eb21462bb1227cd35dfef523b34e8928b7f3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fr/firefox-55.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "d9f0baca6f54ec4bd60c33ec87bc7bb307054c5214182ba7c14ddbfba6748e77f87914b6373d288f8514361dc2627ca75cba9bb97038f183787dca07ecc629a2"; + sha512 = "038f8198004d38ad9e2814bd55b2ef1d6e3af3f8f3369a90b41e44421b94ae960380ab65367375e15eeb1d0af72343874314c1005aee18dc86cf079fdc19fb80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/fy-NL/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/fy-NL/firefox-55.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "8452dfef5134afe2184cb8d2589d95fc75bb9bd487a2451fbbcb873f72b3612f7eb552772e4b9957060d506274d2655505838628d468efcc1b534697734466d7"; + sha512 = "83eb5df7022ad9adce4ab7966fc4979aad7f6d1bf2b47001105d67d7933feb8c264708938b87fac3908a65adcebf72f6af9d5623fa6026458dad76a360f0608d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ga-IE/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ga-IE/firefox-55.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ca465448eb5ca014579e73c5e9aa09129f7ac3725f90e6ba8bc96f67ee74e5bf916050d968ed91d52b60cd8f291f5553bd66ab4373af6537c43fce4e8a526c5b"; + sha512 = "34f3bf3ecfc264bcbde3bbca80bf138d1f7f925ce6606d6c588f0df25f22eb912dd3d0388a6798091cb88b51a22380e01fe984bc80edf95c76e301e7cac2b2cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gd/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gd/firefox-55.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "c79b3c9c3970cc3eb8d0de8004479e1d6832d8b1c40640112e508ddc3db36a318f620c519a11914d5a103e01d8227016e4a57c41474aae346af15cdd5d5754e1"; + sha512 = "4d2f04c7cf06c6f8efed7abe74f8ab27794c01aba57ae2f45bbd1a749295ed7b6db4389b1c93148330695c6d213642dd9046068f0bd23ed3920bfcc7fb9dd4f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gl/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gl/firefox-55.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ed98aef69f2aa9de72508e6860935b4465777cf26252c4a4233a4809e1e5f91e44d737bfa13d2705bae2e0c250cd9b4a92711cb022d84c109dbcf61a47286a85"; + sha512 = "d70c3cd99be7dd1d80c070d5301a1d84f33f1b626e0471861980512c81672066a7869a5d289cf862ff4d0ff6f488b0a7cc298675aa9afb0a62a191ac476b71b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gn/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gn/firefox-55.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "0c6eb876fa8ab4c0896d96cf87e52eb43f0ded62c93770ad3f59ed7c2e81bb7a231d4d698e83aead3f557e7c3443cb105860b2f98998804ae14e49c3ab3bafc1"; + sha512 = "f183e3c3ef451367362aad3bc96cf1500fce451d3c0f467822e756266bc48d7d9d7952e82f171db2d8bf23d41bf58cef34f67da7211d31335f86574abaee567f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/gu-IN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/gu-IN/firefox-55.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "3a57b1adba2f9fe33f91ac645665ab8301b1adc5a22f2f1a04d1a3c3947c25499b9d14a3e00b8f147ecc2664a3ef5ee1c4f5b397283c5fad454dcde94c261932"; + sha512 = "31afdd21bc2d9af1a52cd24f74c76480658fb0506f38e6fd5f5f85bd66eedae49cef89aed9060f1255c515d24b2998cbf9eb449b5083bc6f2bf1805d152197ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/he/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/he/firefox-55.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "46002542fa8baec217d26a1b246e2e2403cbe3af1a471da0fcb936c67e63bdf547577bb9655d1df414bfba8a16d2abd29954697dc967328f77678d08196ead3e"; + sha512 = "c68c416515336a6c2c8ae69151c1b8c972f24671d354929eaf3eb647944d6e99085b5768a8156e59015401a33174fac774f0bdacc6005c3ad23a008009653fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hi-IN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hi-IN/firefox-55.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c905d2044a685dda24288c3729261f58e1d896c71a8d437471dca5457676e9a77d2a112252f2482ffd744c08f6c8090541c53f8c27f85a609557603ddd114025"; + sha512 = "2e62b66e9d34c9a7d9472726dc322746ef399b24400b9315dcd15f010d0bdf80d8f0c1ca912ce3275770ad925f47d576b59484b3acd861d1f3fae9e2ffe5277f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hr/firefox-55.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f4a0084786f61e6586f0cf4f534c4402b66c82654d95db92fadadeb743766a976a4c349097633a536aad8f5dafb25127c4366ed002cdcf93f0a963ed431d827b"; + sha512 = "a5caa5839d7ba556314c513a9599ebdae05de41f5b3289987a1f1d1dee030b53da07773fd6517f42899ef443770ec3549f4160c77e26f68a1e1bb3ca598bd866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hsb/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hsb/firefox-55.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "d1366512fbb61a283f363a29ebf8e8570844ebe29bc0068a68837261181f44aca5e8fb5c3ade82d930b624e1ae7dc2cf30a0e6e0d830a60c529f6fa9d2bae1b8"; + sha512 = "df83ae1a93cbed29c85d75add44b70fde9c187953fa169cbdc106ecb722ec845b129fb762325f08d0ecca188ac6bac43c6662059a6694d43ed90472ee8eb23de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hu/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hu/firefox-55.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d76a3a892c22efa04e84ae9c66ee76494709b1185f8d1033fc3bffbe67e433607edd152277218501ca94d5cfc88f8e9de356176c7ac2204ceab18eddf51cac75"; + sha512 = "c5787634d4fcff538423fdd9761989ef341058fb129f33bb729686cbe5319aad7d67c8d19d9e42b7d81ac08381cd0d07504fe413a9c38c310ba3d7440ceb6934"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/hy-AM/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/hy-AM/firefox-55.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "f771b69e18434a8f9a5fe5e381702e078e37c87c4bc1cc4e0fa30be0c46f3eaf36462e6d4dfc1e12d5896ac6a5597f5987477fb8aaa5a5a5f0648c92d159cbe8"; + sha512 = "6318a512fee633ce49a2ac6cf3b3295e74624bd935e9979193796956c11239f1da3ebeb99b5547e3aaaf339c4f87d0e4501edacc13fd11435abf000a9e119ed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/id/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/id/firefox-55.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "6fb40ff190d292d18da43a769aa679da1ed6510f185023ba08e749af46b4b0fecb3d305d9dface2ea1c2096bd8176add235daebcfde6bfae767407d57e040ba5"; + sha512 = "2c7d0de71a675a0d6abe14037db11087ad9a2825bc2d9bbd863f209b86d9875da08eb2005590418262b63bdb12a9b122e54230824d5916059f3855b628eec8de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/is/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/is/firefox-55.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "47f51627d21b803477b237b8f3599cb02efe107687fc25ca14c82a7d1413a0b49f3f47cadd42a937e10142ec0db6e538f2fd17ec1fabbb868e0db45011ce1365"; + sha512 = "a1dc23e047cb7bc21f3c1a888cd8f9168161296a47148c2296e4f033d7038fed83566a429610fb35b514aa8a902839a00201901d46361205e5e292eca7418813"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/it/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/it/firefox-55.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5707b17aac678c28ebfef28b062799f4683c2f2192de7b305b8699ed788de54aead0012c1a41c999a2270a30e368dbf25d53bc887f5249279220ffcff143dab4"; + sha512 = "cb2bd028873e28aa197e3f599b2d1aed913273f888cc2eb69775b1936763011baec1f03bc57e3da6b2088a8ff37d08ab014bdce8161bf6929c57f658772af8fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ja/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ja/firefox-55.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "9290d777a33e434c587c19b5193a32c2130662c0c74917dc1c298b0f906aa3ccfd8631dfc3c396ec771efbddb254fe603ea9adf42524e72c9b607a7eaa81485f"; + sha512 = "dda54f19f4a5a493b7ae6167955c9ff4c503d8cf239fe6b993a87d3f73171162e29270366bb3f2f1f1afea80e3332928417bb3e26fc414d6543e9ab2e1a2008a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ka/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ka/firefox-55.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4ffddb53f2f9ed891aa75ff92dee070fbed1570585bdd8d1517af6cb604fef9ef98e4efa0ff5672a911e2934e91b8e74ef808826b6f4a7c08ffba45bc1e2df1e"; + sha512 = "9e0a7042225361addf1fe41c13e0e3df869e41c1a88b4adfa64cd4912c4cc113804dac23ef5ac7a8a196ebb8552a2baf988aa9da618ab1a64e307d02c15177c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kab/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kab/firefox-55.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6cf1f5f445a99a90bb509e9f962f63c3674d1f621c469b354044f2ecf30f756599d1c920b34e4665412694da7d6f85729608522b5f7e6c3c0b02ae23b0b12fc9"; + sha512 = "27f319c418dc54296f616b9fc2b6069f1f0da92b2eb95d872b4fa582f494f0339cbe40fe0427ae1cf8a1ddb1ee436ae56773c7413591f4bd76f027916bcef187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kk/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kk/firefox-55.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "0b5810e34c15a1152524e4a437399e627edce29bf9edad54cb4731f23ff3fe06fa94fd750f35398ee2577dbb0abf94d9f965c90520e1cc24bfcb97aa5bc2696d"; + sha512 = "7d5664fb243b214846fbf2a1772be96df94345bbc6cb076b9e75ea0dc126e3113faab67ee935792df48a915aa7274acc1d4ce48bf09f17f662341b2235ef6d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/km/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/km/firefox-55.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "86ffecf5a046d4084bb991e527e3fa009dc4a228f4f9595fa594967652fa926ac3c126b9848002b856b9c7a0295d757311b4475a88f42f6e9087df6dd29886cf"; + sha512 = "7df87f956678f7f90df95f5bbe1309eba7f89ec2e1030746f56df0e14cdce200a1204bb73f8db68b02655db36d13941cd0887116e974df2e11d8d222f5dfb6b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/kn/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/kn/firefox-55.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ada203b9d3edcb87fa87f421509738dd023c0be9444ecdb411c66d6f3dce567a1720b1bf013fbaa259628b399f117e20d365ab6d2e5a2b02d1ac93d7b857a0e9"; + sha512 = "532c5d7a67d6508188628b9728fb6a1339ed9c789fd8cc58c33a9b9495e8ba8b979c631bfae66096b164c277dc0eeca167911aa4b856a1d6d437bd5a60103a3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ko/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ko/firefox-55.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ea8aef83aab3b5f8c6d1add9c7be91f883253c2042312daedccace4254e64cc352f45b1ff0b18c1f20fcce852bf3a203e579660acd9c15f90a27b6002670c626"; + sha512 = "c1170288dfe6d2ea418d93e3d401a2746c88df77cd8ededd70b17dac4652488b20966aa472f7e929662a8305fc03f7153b534d79d6e8dc62dfb0b468a417317c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lij/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lij/firefox-55.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "43a44b2f0c0626399593b386c8ecd278248bf63ce2646dcb1a2bd28c3da32d99bb7fecfddf42097f7f89966bbbc78094f04b0ce2771f2319f83d19f1e0aa6e44"; + sha512 = "3f2b8227f04064ea5507774848296fb12d4e17b806cea7a356c36995648a4db740d68382ab6d6417d745dc278b6cddc6f18cfc6fbbeb60480106d726715c0d1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lt/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lt/firefox-55.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "959869c39df29073c5a10ea314884d474b77c0c40832651083932785db629b0dc7dec8554da33306bd8db588c1a54cd042443970fa7c8aef26ef7f218ec49719"; + sha512 = "24d0621a76f53b2a4fc7f3b4d97a1a066ff6fb7c7e1dba9028ef719a38042271412068a7a874862ccbbaf010a7491088e231036271c54e51c624bb82937b139f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/lv/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/lv/firefox-55.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "594a01d1b5dfc77082696b754065e4b6b5543ed5e4d356dd38255d323b8c1803447734ea631b5d5e5a9b4f8611167c3bd6527e076d546731f9a8b406c8afbc23"; + sha512 = "c36c40e21e305373e7d4ddb67702055cdef28f880739c2339c5e75a0f1d30c2e73316f65badd69dc93552ae33a1f493658002d73caac5a97b8d03e3e4365e6fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mai/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mai/firefox-55.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "90d6997dc57a5986d62760d6d163c0a56460959964f0c2e9acda5570cb768e95be04b5b8648437df9845169262954d2b411656d3a054e2fec408f71453928c21"; + sha512 = "f033e7d1cf52486775ec614bf6272cdde3cbb17a00aad49c8c7739d72488c03d9803c860aed581640689e336bc55799521da4bb0b3a6c9cedd3af38f94c944f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mk/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mk/firefox-55.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "06c3a0a722059ef6db6cdd5cb38875c1916dfa2a8bf7c27b0eca2e9ae893348cd935f208dc1e09c7760dfe3dd63428e83b1f8b2a364394507188cdc4eb86763d"; + sha512 = "d01f9acf588e5067681422daff9be1f2e033b91ab2dba9a979dfd9bd918b1a20e5ace64739ebccffe025e03b80a2f3a955cbf5940ee9341e2f62053ffcbdc408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ml/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ml/firefox-55.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "8d51b7daa4fc768752dc9a48ca9c38c62e0dd35925518ac4f4d80ff6178789205a7c2c8935b5336751106d8504900bfcd2af8aff2f977c7b35d1295071581c87"; + sha512 = "95a6cabe1b0fa984de1df148207d22b570a09a5c1fe95e898a33e0e0c905b9f868586294032712339562d8f5cc78961a7fed5aa3c1a5c1a77ea5a5f3197b520d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/mr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/mr/firefox-55.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f9aec2aa02c336c8699b4420abe7e7a94e0d376529275e24a57e8158c99e472e3fb78d757782ab9510abe6e0272a66865e7e84ab599e3d5477c2af91f079bb0f"; + sha512 = "59053496d9d37cec07ed1dde98ae07db593726d49fe97399e97e4a6ac667835cb34db4864c5e67bffd1a9c1727c1af2feb19fea0685fdd2f6b5226ad24022656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ms/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ms/firefox-55.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3e6879f56f8e4b85c306c73a5c59ef463ed287793ff2bca0834b2640070eff9417d4c59bdad4963229d3c3e38fde67386531ac69abcd3164adfabc668d68003b"; + sha512 = "c3a23a7165b0f233fa606e622868690f696b262f33a2c1f2b23ab37f392e71bac7cfd04f9e240660ed5f6075cd3192d9ce1be46a649d5abfb7beb9a16ff91e7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/my/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/my/firefox-55.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "64c34b420d5e9e0cee53486947dd634ef015a2c043601e3ff040b08a840375755390ed6b2898e8024f9c6a87e367d7dadfe04f26bb6c500c391056100eb01fc0"; + sha512 = "493e5d971b55696121edcd72712120caf638aa13d2654e8f4db4e814a7b8c4cc2c7b89622b385029ed1a9ca14294cc39d8522784000708f418205c36b1f2fa64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nb-NO/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nb-NO/firefox-55.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "17e1ea276a3000105018046f53752c0b4498d701844aa29ad7cfe5857ada0c3ecfe29f9bc11bf09801db35b0c58be030069229096e01eddbc702e6f8917b5167"; + sha512 = "c7c3e85d2749bbdc75a359ff5285ef3cee14b710aaa6e0f39415cd72693f219589b64d26cbf15020c380b51ac0d4a6d41e730af9991cca1b4d5f1ddae4c63dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nl/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nl/firefox-55.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "70fe41e9c3f6bb8d5fc3be480a469bde02197036c763839021ff38c25050be3a4b0f15f71b16ddd4c0827fbc635be81751e1d679e6445f509b2b8cc30d70a5a2"; + sha512 = "1d77c158ebfdb65004f5c999e6da15ba2cef2dc998c69bbf5477bdb8b41131e968187017783c65103f2040db2154833857790ab9c6aa705b866b60683f0c4ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/nn-NO/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/nn-NO/firefox-55.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "803390f1850a286531046e3d3d9499050680f8ec8d8f727f0755b69af833fef7aa1bc841566809d38dfdbff0433b20853e4cd64ff0648789279b1cf9181e64fc"; + sha512 = "37630d6abf1db435bbff8ea2821966ea58fcc3326199dcfc0e95833732c9ad767610781046ba4b031b516f5dc301e7a7d699699ad7b39efd2e9cf3df05bc3637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/or/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/or/firefox-55.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "79d474b2c0e3dd1b09f42895370ac7cccaa7ce71f1d1154665865114dc6db2a165e099de03f064ad6603e7fba967f85865070184ae7d478940d250c0579a8b14"; + sha512 = "bec28704aff4671d2ee5413a29335f84bb04b4d5dfbd108988e1772c68486e1f5bdb2b7b799792343b1191b768cee7cda59aad0efbc0dbc45def3149e7eb41a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pa-IN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pa-IN/firefox-55.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "958cf459da7c99979c2684bce55f47ba5bfcc3ba908bf11f3c981bec565406aedeeef2ab691e28bd35b7763695fe1cccb9ed76de9442612c99e01960925758a4"; + sha512 = "eeb9a7a8400e14241296ea75c55fbc17461d298bf7d4a4b57e26cec434e398d070b9207d6d19a3038b65fec4792f9eff47b758f5e5b0ff373b349f67f44ee1c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pl/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pl/firefox-55.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a3c0c0b388ab02a2014a7a1ba18d373557e1828f449fd5ed713c8ea2ed110e3450fca2efe093a0e9ba0893fc447e5189ae7afdc77ba3eb1b7c5eb416b4efc50d"; + sha512 = "560a7fe08b460f99e6d166caa8fd442ea343a1eff9c5643b96ce9085fbd76cc27eb3b2ccda59172c5e7542bfecdc3cad39257506531c51350f655744bfe166f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pt-BR/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pt-BR/firefox-55.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "5ea81d1719cfbb161ce4a27a72bef3d579850bc26f911729bfc46cf495d680898746361fd3e73d0096b962c498ed9cf7706d6fd940f04d1f6a2b81f0790001b2"; + sha512 = "452bdb25f38b31af0ed6cb1f2636ce238ab898065b8f61f505206e1dde12555a18d491b5895b549e1d5efef94144b99988a69e19f9ccc068c76474bc0898aca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/pt-PT/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/pt-PT/firefox-55.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "460393c862a11816d7b3bbbaeb3fef4c566c1fb4c479ddbafa4edadc1f085e00bf8e9b01e5d5342058fa384512701e48745015d3a56d98a8e954679e0258c703"; + sha512 = "54c6b9bae229fbdbe366fac25e9a3b89f48d85f41f715f9db1f3f1b4fd210056f642549a982eff9ac4e2b68640ab01517ff9756cd63b72045f11c07619b59761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/rm/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/rm/firefox-55.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "0dd87197bf700923f771fe96bbabddd209f5022ca6248599beaec3f32d86559b560342989d24612977c30f61797a02d453e0e36259496128314a87f8a8b3aab1"; + sha512 = "075a161ab0cbc6417dbfb4873c8ade404a2fc911f2da9e0149d90b04b32f6c9ccbf42b22f2abaf13ef4f9cb4d8330a90054517a651d0c0f1f940431ece8b2518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ro/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ro/firefox-55.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "60f1d69e881aabb32b40566f907560eb17d5b700fede8ecc1b5c8d198041cefa774b953dceb69e30c0d5ee57ef32b27b9cb4f43d550452b43414a8d712943c8f"; + sha512 = "5c1eea33100fe2bd020f9d1ac2bb781ec04b25a12d271d3dbc311319f7a688f245e2d7357055bd8321ead58923857f689e417827ac3125ec206975134e4203cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ru/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ru/firefox-55.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fe4c0ada1acf61cf784ecd6975d3c49a897285f2f816d60c33b82f8c4f0cdcc221bfc5032381488202454ecfef5bda99de12eca7336ea1028c2c13f2c2d052bb"; + sha512 = "c9d99eaa7ad17a29cfd860c343581654da5daf15db5bf653a3d0b13b03d1914fafe7f6801810b3ee06abcf687c71cc1f9d20cd727b10cbe91e7bb6c977aa279b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/si/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/si/firefox-55.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "ee52d9a71535bb8df0101a91b414e5a60b2f4d3db9e2ef65a1dc737d2f81d20bce6813968c5f8d25db40b14dd253149fd7511505ac43f2bdede7363df8e1f594"; + sha512 = "e36e3e4767f9afd211dd4333bee2ca4ad3d9ccc7081b1cd008098263570aad4272eab91032527c3f6f0a70e54953dc806cfc00a08627ebd81943195add184603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sk/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sk/firefox-55.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "be8e5677c9e244ef4f8c660380f3e2c141b80534685079c8a76f6d74a12defe5517de04a2504dbf5c4027dfcf76e4c80414320f36dac8701c8baf16ca75740bf"; + sha512 = "148b8ebbaba7d111234108758fb48ddc883c6d9094e8f22680d65cb9ef05fb34eeec4e09c141e7523ff511fbbc2db84b0eef31efa92730ab30a4830192875c51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sl/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sl/firefox-55.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "cc693f834b5017fac4c2655b3b362cf54a0920dd25194a5c1fbd8af8c68a9d130d0dd055eaa9fb4c4348b0bd479da517e6b3546190f83222f2ac2fcbf411f19f"; + sha512 = "fd0f058fb2a7fd304d08fc4966c7235c557d869b0a02955a3459b354793a1c2245e45ecffe9d0b251357062cd81db10b5d3f982ab15abcdf275af31d91038f9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/son/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/son/firefox-55.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "39618b1e8d08c7ef70ee7873daccfbcc41d0ede0a3a39dd861bd3155e82f1104b72d4ee7193fc30b4f53aa9f6ca12209a68b68470bb319189c5dffd7a9db4d1f"; + sha512 = "4e6bc840e788b0a3a9cbeca86969d3a37afcf600b583777de84cd77d21010360afa39dc2ab4809b12cd798307cb84c6f10e7760395b2fd2aedabfc6419b02d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sq/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sq/firefox-55.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "e518cbd7d40c96dd2ce6171bbfa76b946cf4d397790b4b9ae8f00691cdeaa95d3104bf174900b18115eb07c8ac5d6158ab5aa01533f9bf06d435ebccc1a034a0"; + sha512 = "e852af7925a2a5a0c59cc54137d1a574d5cadd831929ddbf375b726b1241dcf901b18f97f030a5ca08283453ee86ddfa113488adeac6fb974524911e354cb763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sr/firefox-55.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9ac9d605aaf3982ce6ff4d76ce54b30bce251e9739061607377483663b1654805b818d08b29a636b8a9f8b83bed38d8f91d2d48f29e39b4caf03fc895b7ea605"; + sha512 = "99b3f089f8c17701ddedb41add217ff5395b3f942e7f455c19f63e49a499282a2432d9f198eb4ca219cf25656ac90c803c4cb7be01975be307b7835b2ad0561b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/sv-SE/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/sv-SE/firefox-55.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7bad9194fa09f4785317488b430b1cfc3add9b460d340756477631b8f2d05b9ade9326cacd735f804fd26f702152906cbab844d9b7abc7ee7f68a7e52e6d60a0"; + sha512 = "f5f91a85e7ed10c2734779586e69856903051074ac76dd186d1816253e4d7441d60cad5172c1dc2496e0cb660dbc40fef4bc586e8e7bd19f7145f3b53f2c2736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ta/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ta/firefox-55.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "501093bddb36797bc4e6b97e5101dcb5f7c630aad13db5c8b4c3cf8db3d8182a4b9c68c43835c9366db72ea4dd6cef2b1d3c429c28d104a107e969bf852ea318"; + sha512 = "291bd760b10656f5cf7df91e5c978e3caf8748180aa98507e378ee90033df8b971a020b253d5ea691067eb7d08a3ac3f998b64860b49bdf7b2b8eeb29d18b737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/te/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/te/firefox-55.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d3bb8e779529649794daa3efc52fca016195da4afba374500951d87dbe74f4ad2856e7549c959eef4e5711e7b1d1f66e04f6e7e622ba9a3c27b2f7e769f00496"; + sha512 = "4b24c2f7a8e9b660285a9a8e14789bf18fe42bdd484dabf68a99b502a52eacce81df5d5375321cdc5c1b69988e35f0e9e3d2d2cfacaee72033a2c68af0b25a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/th/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/th/firefox-55.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "7fd54688fd6fcfe3042d02b4204d82ebf11391784c36be3f479f41a32f1e7fde704773345f16a562044da5bac02302722ae248aaac5a4b2cb8add484939c8d51"; + sha512 = "a479f709c4c512dd3906e9694ffc454ae315855b4a37740619b8536d1dd98764ad191944617351243eba474ec44c95d3153efb69d4dc13aa8047bbc477feabec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/tr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/tr/firefox-55.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1d4fcec068163b55461d082f87c070a4a04db04e0b9d292a29e41baaeb3a44415f60338174a7589876bb98ff271bd0b4e1fe58a794053d534e27bffc522ad599"; + sha512 = "1e12a004cd63cd547cd925736a2cec78ffb98d5f395474c9e8fc96752cf621a2311d638d96444afb593f113c6ec46a892fe96fba882ed7b7c49aa05d4685e70c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/uk/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/uk/firefox-55.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2f048f195269c652e642250014ba6b3012ef0e212ea794a989ecbafedc6fee27976869b807c87411896da344fcc81b3803f226a70f881f2d66dd517c86f98511"; + sha512 = "0634489527974d7c7afbe2c55d054f9dd50ebfeb2777944dcb8d4a14ba5171230540c17172c5b0d5df64d99fd23d7b9ce384657e1e1b25b73118b9b66b748613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/ur/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/ur/firefox-55.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "0700f646fb81bb96a7aafe0c8246fab8cc39200e34fda0b89535d026e6ea71d3216679f13867a8fd6f43c2efa23902e926f68ec15ec65aa1d5f67373ea3b7341"; + sha512 = "8a519683ea1d611f6932e651dd0e400596529ae428700ddf8929924910614598f8d8c660e317357520d31bf1347d1f90c1e89b91eb74b339eedb981da032af4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/uz/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/uz/firefox-55.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "17c0be62adaa2f3a930e727910f0ffd9dae03eb53ef6fb72ce3fcbf9b6facf49e12164632acd8446c24560f2d8a233ee946ffdbcb270c815b9beee146e93875b"; + sha512 = "964afe349e8b7f908f520d039fd1da6c8ee245b68dc8957a04222ff281a077f86e7b8185850ef7a4b741a697832bc36bbfda39051409a9c3adb74f2def64b621"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/vi/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/vi/firefox-55.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8b120d1ec2fdbcd7b0276975842604c41f840e59739166f32c35a8ec93805b6220e3570fa6c5cbea66dc988e354d4fb5f900b5a359a784279f1ee78a32a7ae15"; + sha512 = "ae9dc4d2be8d82cd82dbcfe638d021713e8559fae2d14847aec687fa90d90afbbb206bfbabaa15ed00ba8c4ac058f4c950bfd320c307b968246968fdd30748de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/xh/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/xh/firefox-55.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9b981b60acc1d5fb66208279a3dc5ed113c3b1cf8c2169d5ad7ea258654b311f2338afdf9fae38c88b1c575cbe0f00b2359f928beb90288ad5b456e9f956c19b"; + sha512 = "f9f0c35d0446da3bcc57b0b2dd9cd622de5a3fbb0a6daa987d2de6fcb2804be9020ca190c8b318375fb255d7ff86b265a65e7d0fd819f9004fbeab1546cb62c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/zh-CN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/zh-CN/firefox-55.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5148d542265e62ba50129526bed91f15ae06018e097fe0afcea228d183b38521a6025e83ac7325f8db991c3517ec38b4590b6065028abcce011cb1ff3f89e8bb"; + sha512 = "f67ba436854973c9a809b78c3a2511aed27b6c4532304464220841a2159f851e84bdf0fe394527aeea48238802fc5c7336b2399078a8891d4c76554e8067038e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-x86_64/zh-TW/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-x86_64/zh-TW/firefox-55.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "466f5e6edf90c6e2864d234cad8271cc9e278dce0748054b109fad9f0c2f5df75ae6b50098a4130a55355dc7cf65556a3cd1a1b3d62e6fc5551317b86b464263"; + sha512 = "ef0e3fc59630c9ab9072142651420151b897b048af3eac878c8222bdba76d47e2e45160227a2a58862a55ccce954451b892b4f5b5c6062d769dbd940edfefdfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ach/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ach/firefox-55.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "c0fecaed3198f68ff1504be584fc74d6c4efa3ed785eeb330c65ff2f8a4c3979efb01ddf9e6dca047db6efbcdcdb51720bc2612ea0954b340e20c5d9f90cde04"; + sha512 = "cfd977fb5aea5c5b707df817993d547aae8b8c04293c3f57dfb630fcb2a0e85b5deb79253da544b7c3a92ec5319989fa148ad3b1ce950d6bafc7d4fe8f1bd2d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/af/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/af/firefox-55.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "b9a1ba9d7b48997fa4ed799276da18cfadcaa29a206c135c7c7d74bf677f5f40621feb50fe258bd341fa57840dcd3d5144ddc5385f408a6200e8f5ddbc5c02eb"; + sha512 = "b6c671a746691cea4d4cf6d5b9932b0f1c025f04e11e7ecd38a53c0c2759d3a3ca82e6d00febd1f644fc18730b2f6538734adc02c9e18094f7533f81a955088d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/an/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/an/firefox-55.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "205d0f8893cd5d90eb0b5bd34341bfd7857c88089685d7560a57e6a46e65e03bbd447e8b3b9471f1bb2f0a69c2abbb9ee96d0aacd5d544053dd7f33842402e7c"; + sha512 = "51f824b2208b18939ac12a6d63507186d20e8e66e0fd9ff030c1bc637a14d987ba85ad5b2425883d90f88952fde84f43e291e68da004e8114d854965421ba9b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ar/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ar/firefox-55.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "3db4dae2cd2a4fc51792f8bb398b47c91e13fc5dfeeb8ad14c7bc101b55d14f1d75e719d5ce03e96d29245805471ce0ad2f38663b3dc837d83a16a365bc1de05"; + sha512 = "411b0f01d5f6a4f8915f51960b0d7d62a1b9cd9c3de665674a019d356677e9ea82720df4b715523ddc87458dc3edabd8945b7d1e41574a22dc4df5c0b62ed869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/as/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/as/firefox-55.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "5b06bd9944c38dfc8c5c92930e2d3c2470d8cadcb11cb97d1ac98426624e4082fb0f61ce27a70572967525166b1343d84ae4cf9c46c4aba9c9afb4e4513c74fd"; + sha512 = "18d6094a2780759e97b4556fad1d504ee1c1cb41a5ceb8481599f2a41458b5c0100b1fd2a0911f1e125b4089b093f1a306bf838e1c00bbd1bd5c482e0f894881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ast/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ast/firefox-55.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5653c855893160419dedf857b6568f9c1bd122da27593f749e81389aef248eb4f1d57b85de70c2a122ba2d941a8da3cb320975ffbb9b56d7647e5bfc18ea7c0a"; + sha512 = "ec88a6ae8ef64aa01b2c03feed80ece24ddbe19f2c1abe38f5e2b21554b782ee52331175ccada48f47d60c56d4c9a36b28b6d62b332dfe64f033ff9a90581449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/az/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/az/firefox-55.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "dd6b4c7ff6362710dd631f40a33b5c97f3e3cdd245443ae9a8ba03e31335ff73c9ab695addea10b83733bbc6b65dc68ffa54315c50602661ab447a25cf58912d"; + sha512 = "e58a646b68a068de0c5b96f088770383345fe46661d667e6d9cc1b7fb0384351dbb10caca6eec618303ab8dfaa82708a71d9376e16017173710f41e0b7d55357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/be/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/be/firefox-55.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "3688df68952a358e7005ccd64c2b0912d9b113dc146ecce19739043ccfd37f92fc2b470d47c2723a24c8b53d113f705afe56d1fdc3c1b7304c3ed4546b9d347f"; + sha512 = "e4d8d905eab7b69c78864cbf268ff8e8246f5792e3e55d28e8a44c12027ae8269738a0ddd0fddd4282dd7536e1266e58461553334f1287f7416c9fd5dd29e2d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bg/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bg/firefox-55.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b3ef5094491445ba3544a8a4880f8474cd9d7092cd67184acbebf4e3768b6a0bd43e03938120f3d67ac519e86f3c538c26458963c1c32ed3bd89e9f8019cb5e9"; + sha512 = "62ae8fab0c91d585234f7eda98a4a7075956b00bbcee5ba06d1dacc2262b32eae37ef3cd1b66da34b02bc309b1b704a2b97c297e3c189de6eb2c969dc1100626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bn-BD/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bn-BD/firefox-55.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "3584ed2d1eb05f217cd475edaaf1869ae3e564af8738cfeca7d0484dee12abb4040c56d4e7c20cf15c983cb2245fd84e9ba1561b27f4dee57a50549fa07c20ed"; + sha512 = "0cce61b9d0f88911abe306140de86964808d8e94880287e1d3ca6dec6b3c36b79143d03d46bc366809e69b70492ae648aa80bc57897d38c92bd76ab56b36a24e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bn-IN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bn-IN/firefox-55.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "0632856baad0891c3d22454146e64e884828d7aaabb58c1f1fb3c45314eec95765df9bf6bcf68e1edbc5873c93d0d99135f71f7ffe979ff656c2748df1305edd"; + sha512 = "53f25ae4f49e125b7757740a5f5ec9d08687871d4ab56ae3f4f4506bee2d1453c24c99022a4be0e07f6376bce3b0c0063b7155ec7decff8e2ad61ca456def7e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/br/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/br/firefox-55.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "dae7d1bdd93492303adf1ebe37b92fb3400437911ee0c8bda33840c5cd1fd0307d631a65300dcade93c116fcd3c85d04c518d2aa2ca792eaf20a7d10d99ce3d1"; + sha512 = "98d83c45d5599bbc62db2204f177b2ff4b710a75ccbbe6d67c8d16829504b8f4a2dbfd2940e583514e41147811c4b3cc4f74637b3212e018eacad85f6f56e892"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/bs/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/bs/firefox-55.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "d9fbb02a07176a8063c8317f795859e2bce1ec56f63742cbbe88fce9b07f03ad3b536ba459a1d655b50f3a867e84f8f56dc041a9f57ee93eebd14f174b938d6c"; + sha512 = "7691546b4cb9cc4de8f0544e42528704f5c204b382b195da7ef2764faf5e2b6cc58285da890e800ed83e82be01924db0e219d1523959c04faa24a11e3e16b04b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ca/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ca/firefox-55.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "cd93cc44280eb61b2958e745ce27b94fe583535ccb7dc7788f0f74c625a0189db6515328f479224dd3899beaf9a878969ea945da053f2819510b1a9584ced229"; + sha512 = "21d664d5a589ef1f0f41a936d8e46a3b220d7b1c6e996f639556986e36097144b82dce5dcec1807b3191e5dc3835df6007e845c847bafcffb0e456777cfcbb67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cak/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cak/firefox-55.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "14c43245c2f91db0d7ccaf010572fad29f29687156ae21abaf98bcdac578d49673342fb4ba7143aa5d6268c03d37169d7fcf95dfaf48cb494ea721657f66d0b9"; + sha512 = "a2a289569ed8ce5fd9916d11bab43a0f4166c2878095f2a30fc8ed587eabad7ddcd5fa7a43070eb54daf8549e5f19a3c12d103d1cee493eac2e1adc3b536a952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cs/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cs/firefox-55.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "40c11bc35d1d781cc8c76f7bf42997a0781627c0385fc67b0562edcac04d8bf6f2a4217702ef4ea681f4e39147afbc814a89e23df46b561b1a4f5149404fc955"; + sha512 = "a24dcacc4f5de63f335e44087f40c203de5ffd482232e691f1f1cd576bd4d41ab949c3d07ad8c1aeeba38863b1a9ce69380079a3cfa0ae7ea3dffebe7d964972"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/cy/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/cy/firefox-55.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "9a946b301e70e7afccbb599e4d4c4d43645cfee27d3e3afbf5862ebb36436c66e0a59a5136ab9729e9d2e01f752feaa2ea341726b41fa03e91d7e909b0dd0b95"; + sha512 = "7e961c9366d3c0fb2668d6f8d9d874bd7d52e28ed53a461afc234375a5d06239fdb866c12d53f41027672afb889e257075bb59ad869c56a54b409bcb3a4e0ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/da/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/da/firefox-55.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "cf42e36971c0d743daca66b5355ccfeff994094bda6ad3526af76c89818f8335af49d0dfb520d2b58d40da64587f85588cd4c61eafdd12a0763ce1034bf44fb4"; + sha512 = "a058ea5cde4277a26d6f3592b281212087511e8efd79dbd05a59696c81e762949709e12f94f794b252abbfb810a410f95c103b52cfcba34d2397a0b0ca51ad96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/de/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/de/firefox-55.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7cec9410debcbf95489e3d9a8129a53507de27fce635cff7a60b7f977f6407f7396d03ee5570528eb4524901a1703b2ce7798a637711c9166d3789e95e4b6d35"; + sha512 = "22788aa3f8bf59a1366ef4bcf3250f2d6155d7ee3de8b2b019dda6a294e6fef58ce1ec6bd0d54b41e8618491de872249f4fe1618779edc418a43d2a5189f4b99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/dsb/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/dsb/firefox-55.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "387ccb1bea5c49115a89c6b64399647e9df08c3b4c2997c9aee761ca73bdacb6a3a05a594453f44aae119512cd5dc62a1adda94ee1974a8809fd9ac6907a5562"; + sha512 = "bbafd69ddb7f73c4b3fa272fdf91352a9db8b9ab57d56d2d5e743738026e6e5f811c0bda9a69b1db4d533ca8c6de1b5bece1f0f4784092b3b3e8672bb30c3876"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/el/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/el/firefox-55.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b894fcd577e94288d785eaf058707a456841b2a50786de9a8e9324008e76e29bcd83960f4e292d046f304d90b1d95c941e126d701417b58708a68a85c0f25496"; + sha512 = "650b3add1753bbad904bb2c1577ee28598f0a0588e38a219b29ca1cb333e9e561c17e560e4e00ba6c861d89ddb70bd7352289b5711c0e24f6f78d37e53e02683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-GB/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-GB/firefox-55.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "74b06f6c1d61ea89994df6ed8716b72e9b8cb256bc4420e6011600aee9f161287250baa9f39ad7f8b806fdecfc60c4d7e5bd31e6b02a2f2fbd20fda09c2da2ff"; + sha512 = "e82dc2a34212a8346bee261ecfb07e82aca6b09582a652f1f9ff90df6f5a5fb9f44c284eb27db4aeba743239262a87faa0e4f6ee3fec66fa97788e66c4e83bfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-US/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-US/firefox-55.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d40f8913e3a280f846c8507ef55d934b5e183ad16e01c27d05767ab660235673a4615a8a10f52d5562912f4e88d4c0d4be3ee6a3ab13508a0bf9a8768a06743a"; + sha512 = "763f0b2294085215282852ce482f2be625efe355138ae709c84ed65ef4ba28908115fe3027eece41e3b5fd1fc164c050d150fefb4fb142eb6652229c021bfe7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/en-ZA/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/en-ZA/firefox-55.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "eeab81e4954ac3ad4ecb1d973d592f137c59fbb62190e6128c6728c78a3ffbcd0ab053a31529bf6a4b2c59787c25e3c62b41e6de682cad7530a40bfe34f83f86"; + sha512 = "9ca62fc6eac9050a7141ad4025e6fd6e3a703e18c3a184ecd1620fa8cf098867ce4886774673e0c10833ca1312b555f02d436b5d8088b78963b682a5de1537bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/eo/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/eo/firefox-55.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "471b7b8ade86cc0584d3354e074acbdcdfb1afd048e6b6532e10c664668fd3d42d3c57412befa7905d9eec60b4aa2e484982e72e3f2d1c10c4a2f8025083c8db"; + sha512 = "3dd8d02a132d96913e017aa4194ab496c21a7b708c5ee1e02bec3c7bcc769a7f53c8908bd56a71918e55b49201f645f68ece3e0eb522fe0719a152bd6067245b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-AR/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-AR/firefox-55.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "7f8ba4fdfa1114c52dafc0b20aae6decdaf79d273494f9a758172d0a66f38b77a1eac6470afbf5f1bdca0844ac43be6b59d70ad24992146959c358e6732b4400"; + sha512 = "aa8ab141a092b481cfb9fa72f2226913ab7672260b2fd0dbee894215ce373d7cbc1ed7451cd1c1010ff079d14cf9f2e992cc32e981b44360b82d867fb4709d85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-CL/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-CL/firefox-55.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "85705a9875897c45fcf0ec1edc87cd3b7f68d4bdc271a9a998609d71ea49e58ab5440913ba33e09153d7095d4303572be84c01f1d7ea1d08251c5194b983de34"; + sha512 = "73d2ae9ad8442a49700341127e7ba31ecba568e558d27b607c5a6bf8e89a9e515c3bf6b9946f094ba4640cf5bea970e5f8473a5ce953a09c1fdcabd2a68d7a7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-ES/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-ES/firefox-55.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5d900419effda0612c0f45a0c8023938f2d8b60cd240d71f5b334b2f903e3c4fad8c7ee548431bb85f3868af844b7214ef67ccd9b7a3775f8bbbe0cddcd53ebe"; + sha512 = "213f71697b99bb7dcc978bca57fe119940f8197b75b5aed3964db89859fdbaaa0968829269c5a8d6f01bf21f670f85bcbdc9f7d4f6b111971636e44580b67003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/es-MX/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/es-MX/firefox-55.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "054cf514419b9b30fee31554ea08aa58d8d36b6b1b51c1bb91cb2436dd26db349b31a1ee807906b113536d94a73c352430f3044b32a0e582c0ff328ac10d518f"; + sha512 = "d12e8f13fd94c3c6f93f5e20ef5cfeb5c3f82a479baa5bca5a5517dd55bd048db59454a56730e69f6bf051a81b5d2bad239ce0fe8975aa00c863667b464503cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/et/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/et/firefox-55.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "af38aefbf277b85fff536a35a4138354ce12ac8b3536f7c0cf5a1a3d5ecf79f138adbcdda1f68cfefcf137c1aa1581fe34749d1d005ffcf369db8561bf2ae536"; + sha512 = "8f6a6393f009b19743debdaf1bf3cbe12e566a4288f8fdacbb0119961542fcbf082aff03ebe79f54311ba00017851ca4ec4efab9553ea2e1178b6dba9677e31e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/eu/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/eu/firefox-55.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "04176bc464fa903a4a04c9e3ded80dd909d5820ef75bd2bd9ecdcb703cdb19675430d9561e2bc49338ca59eac1be1cdfda9d4acbc4ca5ff61893d32882161dba"; + sha512 = "7b1f3af68205e3688bfc0e519f9cc6f796477d2f8b11f0c7e035fab1ce917e713b6b18dd498c5d04da3c51a50dda01132268a24180ebcdc15f452bb25d0dab0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fa/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fa/firefox-55.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "ef46e0a4b523b3ba883e07b79ebbb343caaec7675b5f6aa456b13b3e362c17069a563c18ce0692fb7854e2f6c72ca880130bf9ae0671177262027564803f971c"; + sha512 = "1379243d07c5216b31ae2689b11d8729d0905ace42e4bc8ba40289bd39509020ae551e2fd0f5a16b883486ae0bc20c33ee2902650304cf628a239ce3071ed683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ff/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ff/firefox-55.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "fbeb3f00058cece9df5181aac388f57a60dc9bfb2c5971af6d96e2fa876e7d55a43aed82e56eab302e470c67831c84785dce08ba926e1649c13e0641675bb325"; + sha512 = "3bf4eec5d5a3c4da765db6997a57dca3f67d52ef302cd38db759592b9904e7b357870d39920bd75b805700ec4b9f4a94400111a321518c5d4f31690ece946289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fi/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fi/firefox-55.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "4af7d213d3fe7e30940adeaa5ac59d1c7b20bd243935684a83ce746576ea68347c41cb897fee50636852402f05aab757208db03a7c746025212dd028b43b7f4b"; + sha512 = "1a33cd82fbda2554fa76684afbf3a843babd5872459026f1f32fe496e99ed631252ec63933a291214535476f8858d03aea26b7cf2108a029ab5f99ea8c229650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fr/firefox-55.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "09c81a787cfde2292b88960a7b95a2e5c18e9f0c40a5972f18580c27fe3d2140c4295282e8b8ac2b3ec1b1dcafe1244b7392832805878d7231e1531ddf1c923c"; + sha512 = "c92bf5cfce5b5114342d98d526e287ded4d82516f008e705ded1ddbf11c1cccd8ba3d3ba777f6be0727f7aca776ac7312fc7e5ce3c2f77ae69420541471d0289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/fy-NL/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/fy-NL/firefox-55.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e495c0b559da6d9173786af68760a4fb0b25f4e5d504a9a8e58b21e37903336e4eb15c4beed8a5a791f8c25da0d46ba95256cf5edd31fdcc2acb47ffa85a1b87"; + sha512 = "16973677379fa16283956fd31a73da2697c4f38b41618e14bcaef4fd3e68430c15ca5327f6752d8123c137b3e026ff682d534e7819f87d8cc3ebe7a7ca865b87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ga-IE/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ga-IE/firefox-55.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "29b28a8c717660ff3b0f07b330ee377927b17deaa887802615e447544b88279871e72a4c73441d9bb76eb6a60e85907ca94ac8375c0125eeaed2500e815f9a6f"; + sha512 = "a26c96dccb61b5e7685a9914f68e40e3ca468438438bbb07f9b524a9a2f3b26959b7a359b332eeb7da47f7a8ffee5f8811115e857406e99abd7f170b64fa26b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gd/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gd/firefox-55.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2e3d7902773255a69990d1f5176637aa45753eac4d6c903bd8dfdea505f2a07d714181bb4662bae4591b4155fb04a87e09d65eb19476ce2c4d0143b7f8f2641d"; + sha512 = "d2e4578150f8ad0166c48f6fcad2f735ddc982af2cca30aa694e44e593f4033c259e7f7aee1fd1941fded86d2937464bf11e8a906fb732ca2084632ffc7d642a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gl/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gl/firefox-55.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5af911b6e1bacef308491b10b21592f06539f4360a84d126d0f78fb43196029ec352f8aeb9fa6180899f5d74334ae002602aa70e1b4112ed4cbe79b00bc4a929"; + sha512 = "999546c43bb56cf95509a8e9b122e649e4ca608fc4e0a3b8e82e9f58c334460420c58650a8837e4247b63eee6f840def3bb80e6c517badd50449e0dfc471d661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gn/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gn/firefox-55.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "721330e35f1632969c92cb732af6a1873c0516292f58e04db3d0c7a96d1cca2ffdcbbacdfb65ff3a958f8757fbf788dd7e667e3037f3b1505a1cb5c34114e02d"; + sha512 = "caeec1355d3bd3331241fec97b0c6008b8f3c42c1d56b1796a7be4c2ae994569a5d2011fd5b723ca3e560bf07fb1de50523ad2736345aee753f37d6cf5ae7f09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/gu-IN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/gu-IN/firefox-55.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "c56f1f632cf4bc89c5f2ae69c375878d9f4aadb3ace0c228f36ab42311ea41eb2aaa4b858596e820729a7474a568c57f6a259a2745902243c5cd21b94ea59fa4"; + sha512 = "1e3feebb32c4240d5c15b0c915b92eff9f63b266ed74b32e1df9fe824b27a3c4d2d06492c9b9d47ba22460e0c2cc854322250edcc1a54e4b6346ac9ee0048b51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/he/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/he/firefox-55.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "69336ba52a347549bf684bb5238ab14dda633d485de617262fc9377572b7c77cfd024cae9f299ff58425d95984939b95cd02f2a3a23ee07879ebc5455a7f7adc"; + sha512 = "5d83b761b3f8653e1701e75a66c3741a9dc7e377fdb2d7b66a23bcf314f3993e45293d8682e65fb58f2d6a720ecffb0b2568aedcc89804da1efad0590629c3a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hi-IN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hi-IN/firefox-55.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "a141064e138094b02989aec9c3801dfbb6dd70869e3fd590325e6fa4b84968d73270a6559156e774ed27f42062b0fa5f78f0c0a373bfa2a02ae2525d3b516781"; + sha512 = "9c59cba32c02786bed46c01797e7bbf3d745f90da98cd07ce6ccb578c402bdc8cf3d8887a57b5523a072ddc6d98dcd9761862f32c59570160c732b8408f182c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hr/firefox-55.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1547872d6d1535cd106b0627830c093d33622f42ff01a419695422af5c030a54996c8b9c95e89589c8ec75eed68485e3ae78bc7cfc0a3b09d303e3a1c0bbbe76"; + sha512 = "20684ed388fffc81fd7b8d88f4d57f4bb130ea4671a60d4dd70d1bd5250b491a36cb0eff0b7820a26f24695d30afd5c909709b6e8ab27f9e24ae1381a8b4dbc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hsb/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hsb/firefox-55.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "796500589c98757a7986158bd08f12ff76ccc09aa4d6132b78c011cb58ecd4d5d0798d780e6178a0597bf5c921e6168e606df56106c8ddbc49262991e10233b6"; + sha512 = "996ee7693cdb808ede4df1c6d8533a964f0bd98a4026067bfcdad8d1c78b232cdd83f1fa7fceb532deb9197ccde437d42d13449c8ad0fe9cde3dec1f3006a775"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hu/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hu/firefox-55.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "7801da792cca62683a7d1ab812fb831ea80d90994b18a151623c05d2f30979d557cc1a6aa0a7ecd44f440c76e71cec9a4749fdd4c49442ea151c1720a7a5d988"; + sha512 = "faaf14a3f2aaefdada31761bca2056d2592bdb6ec5a053d7c8efe871b0b2ff191b152fc240782b24f3954b4913501efd303bdb301b4a69140e6c47a3fa6856a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/hy-AM/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/hy-AM/firefox-55.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d47fccbc883ca137200c613aa96899e356cfb09190952805c20d36653d3477abee4db49471a1416ce13455ad5bb6836a7217ae51fce77dd0fb12f1187e11bae9"; + sha512 = "9190ade1a9885ebbfd0090ee926e0d5e31da61a7c98f874916c423a60328c5f936f29fb60949c1ebf9d726f07f097312c64a67dc193d71537d4adf4a9b7729c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/id/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/id/firefox-55.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "41e111080bed45b7783cd50e7069811b17b35eb0268a92f901531dc1e0a7e7fe07b94ac325f5b5b436b71ceffc1d329837c74875a32e13d3205537b750fbee58"; + sha512 = "88fe78ccc643a704e068a32d2fc60624a23c269b85bf0c96c8538fb5243c1db93578f1a91993537bd7dc672acb9dc6f4cc75ed444774ff74c7abaf621226b43e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/is/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/is/firefox-55.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9172c69ae72fa83a05f0926cbf87ed4694653395027b91f441ab976790c581b9383dbe62bfc74a425279ef68f8c6f6d2ef003b20aa241be6269c34bbab147150"; + sha512 = "969e28b5d8696fe735063161b4848fb3a8cc400ca2f2e3db246dbe68d301c7da3adad7bfda61eed10c85ac028582b2568f57d0c727abd184be2850d44bea427e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/it/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/it/firefox-55.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "daaade14d2dafbb76e021f87773a535783e533474138652fcb0b25bc41a1ad4f13d7cf65119730fed56c43116a3392f3adc435a7f8e8326ee8ea4d9e9cf19ef9"; + sha512 = "59b389ae6710bfe3d8c62b9b482bf44af419446db0ff5278b1c18bb45eaf122f5b3b47d32b19eb3686cd965bf1e51643221bb01fd6be6990f8ef14159ae6477a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ja/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ja/firefox-55.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "6741bb18a17559482f8b95c1fc6acfce6b0e31e474e5d88905bdf3b939967c0ba625cea7e1f1b2f2ce6e77f3128f1f85069e946e7e6a16fbf4a637cac7e79565"; + sha512 = "f79c322f4d2d23efc682ca4e02d114583008f2797e5672022d412b27356a1bd34f4c216545ef8c8f00fef17be0fb405384d98f4e44679372b9cf7953e2e8af78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ka/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ka/firefox-55.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c1849ec6d69ffc87918515a7de95e0405a14b1cc268e68dfa11f8c832ced907e73a021b5c9b5f1839e99d692c13fd3f33197eb91de98f588f5750de03fe098f6"; + sha512 = "a5f440758bc4607955911d0fb2320036b4d9a06dea07c7cbfe9fd67b767a544cc0df582af329e4c99f3eeb065627e90a989368d26a14530fc94a28d6fe65c7c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kab/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kab/firefox-55.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "aaa9a9d415f39dc957ec59becf3b649c650cce619417dd5182835190aa8bf361bfd048ff647099320cbda296c9a992927de9c6a90e84dace4a1e5cbed0b9758a"; + sha512 = "1f9d2fd390226d06f0165d9a5f53c5b9d67a424969b7881b91374867179ed09efd05cf404de086734165312cfe09131692874632359c9a9fd323a6a9b7dec101"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kk/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kk/firefox-55.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e7f47f9270c909135dcaea2e4a47e1e16a6a0d3b886ef9f4ff0e3e750cd8b6b253eb7944c6f7155df6e91c838bc84544c2880f9c75eff12c97f68ef8da098575"; + sha512 = "faa9e21a95a41d8c846a5cec6f7cd0d2cdb0a382593e91e824e1d8013af146378c965b28cd44953702167e2e355436a2f5042ae727cf6c95ca75d0eb57f92119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/km/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/km/firefox-55.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3e46f8ffba4f93450dcc2aadd010ce0b181e1461902a517c4d6030baaf6814debd2280202308980b3e02879d23144aa186af5c9af6e53e8d6b8d5e5b430bfc26"; + sha512 = "514bccf7cf2c433d846c7307c75b512f20c6ca4deef5f8f59f744656a81e514a9e62fd4336e223fdb59698b6dc00db0aeec51da4518f0d3467b5a3f06598ef42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/kn/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/kn/firefox-55.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "8de3d801bfe8a1b87719715982cc9eba3b39158a8933b26379884d795bd2eecd43578197165a97f514c50286713bb83c06e200818c2e4ff2714baea72b8a3dc7"; + sha512 = "814b1fcdd19fa4044ab760818ffc6e246ea2cea36b89785069af857763b23623f4e9cc50a6aa19a77a00a61b501c26182d7296706b7d01bc9a25006c03580058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ko/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ko/firefox-55.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "5991b9223486acba78015b19d6d0e32dc28aa0e341b4b11928a9f28b1a6f4d366c38690d311ee15ceb607933887cbd8c93940ef0dbab8fb129c94868a5a5d27d"; + sha512 = "462747db276da856fffb562036367b947822f18513c2eb7cf70d6d3ac31438b59896ebf9c12e9e61abd5adb0b761774ad90cb41eb59789beb994c8dba11fe8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lij/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lij/firefox-55.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c5ce8dbb363667ef0b037c5022404b756a360272505d756593860598e8d08a04bebb45edd9a27ebc279547658f142ec1e65798c2e2d13ebbfdfee56cd30e20c1"; + sha512 = "04802af2002399a7540f7ea5e5dbb23cb02d30f567a0afb64fdbc45645251d8bdd6e9563f4b5f5c324c267828115c719b161b074b80f7b9ba8ad4a1a0b24f371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lt/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lt/firefox-55.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "131d67e7bfcaba8ff55d7fbde587aaa1039cb73980e728b29a445acb4bc8f2f17f97802e03a400ef3d6933c2475fe35e7a3acb1b30f949ad71dc054b8d496c36"; + sha512 = "968e19afc7f0613fc184632529b379334d2409d5d0da5b24117748cbdfac714e8465267b65d2674f8721b47e969279c054add60f2a060331617ac2a02e97d032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/lv/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/lv/firefox-55.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "7e9b614dbb86ef76fd752180c5b633345d37d24e731eeb10ded7694278903d42f5beaab8a17c5a6472401754b582687595f34233058bacca00dbf3d1f774a5d7"; + sha512 = "b6ec789c77040508706702d1fff20f0a277c8a5a1f28a375eedef91e0d7cf29a58b3f2027ce1ad2bf8a25ea5043751ee52b8468c4cfc516e1859570a1dad02d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mai/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mai/firefox-55.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "cdf641eadf20fa21c5384377183c7797d199c3232f55dc1377d52e330d1ca2d0b1478e3301fef696726a4094284a94d77257462d4a5447ec2ea6b99e2d009e67"; + sha512 = "1ca567163688b14cfd4deb5cd2f0739807807060dde26508d87c8590cb8ebc9010edd7dc92869de6af2928eab32d42fad5da94a74ebb3bf96cdb7883cf2f9225"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mk/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mk/firefox-55.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ed8d29a7a6a0c255a24be9c6c670677b2cb081129b36490ff59eceae374e2da3911cc279975c55b5ecc8fe7988364b069145b16633ab6c4c945f35c91772c484"; + sha512 = "87ad815c0aa9e45507ef044248fb961b7bb98b4d4b10426aa448f41d129a162bc1d3f6106016c7cd92cf03b63c1682224aedfea9093030561b13dca79c6d11f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ml/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ml/firefox-55.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a4a4758635913dc8a4b5d55df97fc9e1141a7120541a0a962aa4b2c566d0985a6500bd25319b0a5f81821c22ee3745e12603499d8f996276db9df07033741f0b"; + sha512 = "85fe206ba0b20d8eb6c3846685c851ec579d8f188a5d6626ec56c9840bf8a76a0616457ee687cb4d395ac0e71978f9403832207a4675c560546c7ea813014aca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/mr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/mr/firefox-55.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "59144a70caf75fcdb3b7b4898899e0e3f48449d2b0ae0a92ac5cb022ba8a72e076b53c59bc7dab61dbad17561930b0e1182e47081712bbee66f5beaaef84206e"; + sha512 = "c41938fdc8a19a49a6100ebf2d452750069e3038d8dbaeab4397f2289622963fa6d74a3c96419eb6cfe7e14bafcbf4b3b4a1f85638f1a402c2cb69daf720b740"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ms/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ms/firefox-55.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "833f8d447913836f26588aa0e5054658cc38b986b72385486cce8a2c9e7e7519615149e7a4da4eee64f83bacd24c924a4cbb5c7f5b8450b75070f28fc558dcb6"; + sha512 = "f37a606f1713e2f680b32ebcd5bb90f68cf324f26512bfeb628a4d9e71d138004bf08082fad8fa961b2ff28ae3d34c453d890c37b9f775fe27944bb7a5c013f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/my/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/my/firefox-55.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d44980bbf4e9498eba7cc0170a558a0ed1a6e3fb9d4e55cbe4250d35e9a06c1a7e221f2f81e51733e28662ddb64a5de9833e78068390087d42ff8a7a10e3527a"; + sha512 = "fa730b3568f06a8350372ac88d3ed7738cd254406a65c36570efbb502a61a60a1a4ab14bf587b4ffe365d3133eb76c841540248402dc87db0d3607235f2878c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nb-NO/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nb-NO/firefox-55.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "757b17a9e585bfdedfa6d72860903e7b6430a434a747cfe590f3886f846e03f5f584b62b4e6caa73840260a82d7a9709f99b2a321bfe872f4a81859ae1d3f5e4"; + sha512 = "5e1fb7632da3755454deca4169802694051c769b0da75978b1762694e0516b202198b74b306d2670c9d05f7237faead7ba15cb55272cc8b3c7cdf14c0a44ce8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nl/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nl/firefox-55.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7c4289a63586f2420609f525b28a01ce19943afd8b9417583a51afc50bf741439cfc8a2aa706c6d2230f45c6603a86a595a1525dc1abddef1496737bb321b01d"; + sha512 = "5e6dc41cb51190786724b34a566ffa8b16314f54200b7bc2130a6178f0d3693df0fefc7a3935db13e9cd27ff5ade21927900680e9cd6c964ac7a23961d72214d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/nn-NO/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/nn-NO/firefox-55.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "5508f9dd6102f45694c2a7145b9b58f35ba2f0d2703f9e8bbb84094b81f384a2c7cad6df4de245dd87b1dee379d7fc202a66b46be8cad50de94f37afc1e51e63"; + sha512 = "2d95d711b99a9e94bcb0e2cb923fa584d7a1e7ca2d2b3d289b20f78a8f8c0bf909a26d45a1feb540bcc4c9e983e40d0eecd24b16d0227d5155f7ad684705215c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/or/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/or/firefox-55.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a5acda036bfaeb2c06c9b8f2e74475f67624416cb41069654b5dd104e353d2f84ee9a51a036a828355aaf6bdfa9f8f3f9495a287f2c237dd9b15e06d2a774272"; + sha512 = "d9bb706c45c5e7a822f106888f47615c1948ee74d8bb5a179ba838634262862a561fcf8d0b79a86089b08f0213cf1ee21387bd4e7de1b47719fd76ef607234ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pa-IN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pa-IN/firefox-55.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "a3e807fe14653a8d55925f2c7ca8e963534b14fd5163b1eb168aa9de31f39da90b1a01c2510cd91117e3949b90bdded0666397d7383c4ea20a70fece438ab7ca"; + sha512 = "ca8121c9ab978cd044bf8efd5c0ad07d7e790cfd1cd6121413d2508d6ddf8fa75e510cf866b5e8506312b1b22fdbc95e3af9008440fdfb8c392dbefeb81ad3a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pl/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pl/firefox-55.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5f256d8ad06ad7dcb8898ad5b7abac13c01ad34f94a2c1a457199a61e94e5b89f76f271f17d90d9686eb49055ef14dc222773d33fd3f53617b2a2f51577bd9db"; + sha512 = "d83d65bf5f0ed37a7f5a2b66e075aaf4caea91240763e537d0198369e93d0c64b1526f14023d7daa697ac6678728f6d7520aa66bcec7ea282760116642b00c05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pt-BR/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pt-BR/firefox-55.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e36673066bc2d6c68b0c4eb1b6e493d5d5f7f14c29c3c117c76057168f35bc5b7d5966d9f310930e1f8172baa8ca2ed3f04afefa9a752648867c3a3dce48fff1"; + sha512 = "2184c06f9f205b624f2fa7e9437311c9dd3100135061cb0eb94dabafa27e9b5c5da5aa31e97a70e6f8b773b1c1704472a4cd87d30d6dd463eaad3d8eda009254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/pt-PT/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/pt-PT/firefox-55.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d57456e2da3f1c0287554cf2a1aca6b19e99a08c34423711e13176ac8d47da25f2856cab56ad0daa99c60ed0fce417af2447fed1d94c2d0daf4b35f22a9b889b"; + sha512 = "c40aea22fe64588eae5510b0c047c2d42673b7f22ef17a126bd642a2cfa9fa6ee27e7480089b381d4ceaedec2508ca6685f8301631948624f85b024403456d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/rm/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/rm/firefox-55.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "036a41157ba884430046fdcead68a37fe254447016cef723754f70cfd88f2fd385ac7c374e82adb06556c541f0ae82ee5f739d1a190ba06a1cf04405e4669b1f"; + sha512 = "235cf224fa8f78561ce0f1178dbaf3ac0798cbfd3c3da97069e74aadfb38c6fdc90c3e01d45a5346588bc001f5f82e5fbed73672e7bae6fd2ce721d99416c1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ro/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ro/firefox-55.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "ac349bd51e8fd251f9581ba96c4ca6c69e24e736e44d28c9661e5163a3893ec9ae42c437a0a5b465266a35b966bff0bed8ae081fc93b56d59134fec4ff38cda3"; + sha512 = "f6f3ba58b8241678c4a82d03433e2f58ead36037068809c404e930afb335fcd4057f3db6a5266785fd573271e66dd98d4987d6524c2b0fa2d01fb05b5671432f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ru/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ru/firefox-55.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "dde58da3b6789ab33fdd8982d328412ac9c6821fd59268dca2fae0bc8dfb8558dfaec4a1d3c9802b33e2c10f7cb0bdf5480dcbbb1fe8e6b8be1774064ca5b85d"; + sha512 = "c7f9833724b30b81a58c6efb00ae57a69b32c2e7590d6ca0ccdc65d8960336068daf7b8f4e305a466c054f8f4897464cadb3fea48ac05aecef14e18c121a64ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/si/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/si/firefox-55.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "41b96f0c5c4dea98296f791e121e2421545b04995d92326176561f0c034c261e19bb2a7db9e72df52a9285ad5d1ff96a4e38559a386212c7267ccf475764b281"; + sha512 = "669762fb074a3d7da7ae00c753863519e1d8afe68a183e7f6bd83d8e4305f2db7e1bb8b9a8e64aec20d3b735196bd55874573cca257d4a2de5f59b3d6d7aaee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sk/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sk/firefox-55.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c19fb32205523afb74ac7edf29f3e55a9ffef4e24d18c47cca493b38d5e1bab8fda308f6c5889a64b8a8ed266c8795a67bbfd690bc381c02405be1ff6cb5e9e2"; + sha512 = "beb2861f5127b121fce3ef6811de7d801c5ec3cd05c832c16b2839c08a925d2e34a8106270ec956e5f45d6062e9d5cbf72ae4d7d9ed894d9cb44d5914f0a41dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sl/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sl/firefox-55.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "490c0174c5d6bb8cdf0619eaf00b87fd15d5365b40680786943cc7c775ba14cadd21e5aa6948b82f0f45bbf17d747f0217ec43b3da8c523b1acff60c3a6c7c63"; + sha512 = "687b20e50fae586cfff1426e189f28d54aecdeacef80b3f68caacf002f52cb7141fe34803dd1e1d8664efc8500987c752e616e26aaa15b3f051afe878e3a82af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/son/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/son/firefox-55.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "b0e9ad5e3b2c0c274d70a048855c2a923304be5464ddc7066f64cd20833929702c413816f466c98693fab9c7167f4343a12a7d528bd499d3c4d7fd3b268c4a49"; + sha512 = "92b0b4353fb0e858e3998903c5d2ef82e38259ce1d9560abf06ec6b55174d17db871d967cdb62b4ad23bfbcbb10a2541d14f0b2886f73d6b2d670c93fc48220d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sq/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sq/firefox-55.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "285224e3a62ad4c93f63c24757e4d3d973a2c599baa7cb8729c3e4446e7ca054b38f80dcfec26b52491631f04aa10406b4fe25bd9e9d60174609ff6c446036f5"; + sha512 = "d9ec031149f9a845e6f11c34a96aa54cc14566e569b1395a83158fe32f433c51a95b1e16e99706f92973661c48856372b134c43b2ebbdc8d358108dc0998033c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sr/firefox-55.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "3a4b5082d7f9afe834ff3236304b6a50a5b2262f9024ba8477bf6b2d25908d0aa440432b093a5e2d6a7c698a683e00ac299ffb1913d28298005dbbc38c8c1515"; + sha512 = "cbb81a562427e4773a4c971d24bfc5f9ac689f8f85b6edc2a2b32572f10b202e8b16de562cae85cfe1a9e86eafa3bd60c8bcbfc2b3675128c96c73c223894f08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/sv-SE/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/sv-SE/firefox-55.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "dcad45f1cfa03e12c594665666d715310d29f0984ef4af446356c9d030decd9551782a1b591fad218c2421edafe7f2262200a2e6a1672ac41d7f16a9664ebd7b"; + sha512 = "f46223ace271fcd4ca96ac6724bf60d99da5e80dcf00d6f2889cfdb41d1ca8c03ea3ca5ba61f6cc855c9cc2b62e4602628847d641f85d8bf2c6dd33cdd208b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ta/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ta/firefox-55.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a351f1850772b6086a70d6c8f6edc5b0906b8b5a9dbb8c05dea8a75f4ebeb46b1e9077f2c145b5b557acf3e7382d72f94949a1a0420c5c04d9e7b17292ef5d63"; + sha512 = "cd3297d41e6524eb7ce5d398b8a95ee0ab008a626b1846e50096343aa5f469149a2a5c0f3d452d0f10ebe6f397e68d76dda4eaa9f3c10b0fa2b6a0d5d60bfa2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/te/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/te/firefox-55.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8f1a725b309eff87d1ba130d02e6807a7202d91f0d7cee73672e6dd0dcc90b92b5a7aa73150d9c69140e9c27140b364557d289a644c1131c57d19a34d96acecd"; + sha512 = "ac7a7ffe87187610a861e32a1a314ab0dc3141eb0910a1987946adccc686cbd1b58ccd996009fef49d642f3ae0568cf429811e652f4fa23b1f5381f3511fb65c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/th/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/th/firefox-55.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "95f20d59433954c0b26a709378a853f6297028126ffaf2beabbe0332acc9df3089dfbc0095f3aac503a04b0cdfce9f79199eed9ca04b810f213f5692a1fc4cad"; + sha512 = "2dc3ed9875d863b27151ae75dc83b5f2f738f0fac24f5fd1b3ba9f7a4aed1c2e77aaaf588bdca534b2a4078a086558ed820cbfd6e852244897dda7601bd5091f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/tr/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/tr/firefox-55.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6eb68dc198c1106d48ea93b924dc961aaa10a7e89a74f7ffcd219f1de4952c403b19062bd23fa625f82cc9cdad0506f777aa57da6fb106050e962deffa79cc76"; + sha512 = "869d654afeb246281be5b287ae76749e25da2e15d7d456cb5848281153307ca50f35a2c62dba0014b90ecf322a85ae8b7daa12ca156e8f5ac33854f6a890f19e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/uk/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/uk/firefox-55.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c43f597db5027f6c1ba76e4308a7e733a78f1d3711a4529b5cc8f51eebe7bd2a55007975f248be698485fecb91ecbc43a141a94869e41445a07f90fa81d70cb0"; + sha512 = "709a5b8889c4a871dfa15c46bc7eee38986f4b76eef4bade78daf88f46e0ee50a815c54c0bf1e77924d1ae04d464de3a4d1c03494bb2781df11ab32d9e4766ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/ur/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/ur/firefox-55.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "2d7af1f97cf035519c43e57ba4be3f95f64e2da816d01c924e82dd4c442d767098247f1bd7535f3d5c658254ba7a9ade752f97ca4951a6a0989f6303cfeb3354"; + sha512 = "d7a0481116d791eebc511ef35a79dad263bcbcde54838a03b86fd5864746c4353cea4e8ee7998b18b266509e2ce584da0cfed39c324c79b847b44ecb043ccf8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/uz/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/uz/firefox-55.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "f5173c595187661731aa3e4edb3fa35f3be9c0f494882a06e765142e193488e50538b1558ae094b8a0c462758601a89dc9105ecee6ed485435083f5c9ea67f6c"; + sha512 = "5102829f08869d90f362c8da8a6947c23b23c616b6c3cca58e4a8fc9ba68573e8d74238029ad51ca2439f7946359903bbf03c2468c86bfa7f7679580f9a60649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/vi/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/vi/firefox-55.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2b30eea824bf032526033203798ad34337e7151c45cc055ad7eba9def8f46b6108de2730ae5dea45627b65ed7ec617ca15b5372f23e3e4a33a303bb51ac4983b"; + sha512 = "a4a936439a729142af19aa2db02a6e769bfe6c653e6d54381b7d80756968b6ebe6dbad51a267936e173b49d3f92b94e89012fd35c54aa790f17217b001b7dc3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/xh/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/xh/firefox-55.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2d098f192bfee274dd9c4cd806bf35bd311c50eb73a45e23eb5e497e636617e020c518f131520f5f0ba3d23864c97f09b4d9b46db9cc4d55c63be3731e990aa6"; + sha512 = "9ac4a54cb66cdbc720e263277dbeee14d243c025ee63f6a1ee4990575fbbb333a0979a19615c226fe1486d9896d6754b5485dedcffb576511754d6781c572dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/zh-CN/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/zh-CN/firefox-55.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "f89e61ad4c1b44d48e0e0e7be3dcd80df548e5f0d0932b915a2c37b36bd882cfd4d19c2d2261b64266a8317acb066b2c48db0348dbe37c14b748d5832f6c0e84"; + sha512 = "e007854739c12502665418c3e0470940cb9df0314537275dac5d3c80923a756dda14b7161196b7289187d6706d58f887f59f47e07f764714298e5da1a41a0979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/55.0/linux-i686/zh-TW/firefox-55.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.1/linux-i686/zh-TW/firefox-55.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c8547fe1196a6b0ef8644edf69cdd68b74e208260c7e51f51a03d854374b0ed8623ebfb1e7c6e6c4d05edbc13e7862d0fdf260d77b7f2e125379258c4b3d44c6"; + sha512 = "f414e7c6da2b2b5a1871f25def1ee055f7cdb66a6e76ee66848c26e2eb2d999e65070a816067990cb9d855420392e4b84b52b957e6dca063f8a011f2ddb4bbe6"; } ]; } From 71d0a5a328fa195ab5e5252d3b1b0f06c546c24a Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 11 Aug 2017 11:10:32 +0900 Subject: [PATCH 089/213] firefox: 55.0 -> 55.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 19dfba0b0eb..70b938bc5de 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "55.0"; + version = "55.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "b3ca0a926faedfc12c859965629330489ac6c05730a0dc38748704a1a25e876decfba78a3d665e22a6773b0a3bfed3109cd624be77d130785b4097d6d9f9c94b"; + sha512 = "2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47"; }; meta = { From 1fe7f03544b13ccadf426593436ffc15ae3a7293 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 04:53:39 +0000 Subject: [PATCH 090/213] roboto: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/roboto/default.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index fbb364b9d72..00c4bb7fb88 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "roboto-${version}"; +let version = "2.136"; +in fetchzip rec { + name = "roboto-${version}"; - src = fetchurl { - url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - sha256 = "0yx3q5wbbl1qkxfx1fglzy3rvms98jr8fcfj70vvvz3r3lppv201"; - }; + url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -a *.ttf $out/share/fonts/truetype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "02fanxx2hg0kvxl693rc0fkbrbr2i8b14qmpparkrwmv0j35wnd7"; + meta = { homepage = https://github.com/google/roboto; description = "The Roboto family of fonts"; From 7c79bb6a87a07cad21482fa570ce2208cfe704eb Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 04:51:52 +0000 Subject: [PATCH 091/213] font-awesome-ttf: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/font-awesome-ttf/default.nix | 22 +++++++++----------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index bc564a80d92..34548b97244 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "font-awesome-${version}"; +let version = "4.7.0"; +in fetchzip rec { + name = "font-awesome-${version}"; - src = fetchFromGitHub { - owner = "FortAwesome"; - repo = "Font-Awesome"; - rev = "v${version}"; - sha256 = "0w30y26jp8nvxa3iiw7ayl6rkza1rz62msl9xw3srvxya1c77grc"; - }; + url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip"; - buildCommand = '' - mkdir -p $out/share/fonts/truetype - cp $src/fonts/*.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype ''; + sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s"; + meta = with stdenv.lib; { description = "Font Awesome - TTF font"; longDescription = '' From e8fc26fdb298f457370e95f6d57506397ddc3c16 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 04:20:54 +0000 Subject: [PATCH 092/213] wqy_zenhei: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/wqy-zenhei/default.nix | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 92f043c7fc0..9718763d004 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "wqy-zenhei-${version}"; +let version = "0.9.45"; +in fetchzip rec { + name = "wqy-zenhei-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wqy/${name}.tar.gz"; - sha256 = "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4"; - }; + url = "mirror://sourceforge/wqy/${name}.tar.gz"; - dontBuild = true; + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts + install -m644 *.ttc $out/share/fonts/ + ''; - installPhase = - '' - mkdir -p $out/share/fonts - install -m644 *.ttc $out/share/fonts/ - ''; + sha256 = "0hbjq6afcd63nsyjzrjf8fmm7pn70jcly7fjzjw23v36ffi0g255"; meta = { description = "A (mainly) Chinese Unicode font"; @@ -25,4 +23,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - From 9baf0b76b767f8bc9995bcef9e8f1cf173fb4502 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 04:10:51 +0000 Subject: [PATCH 093/213] wqy_microhei: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/wqy-microhei/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index c0665b2f0cc..038f0316940 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "wqy-microhei-0.2.0-beta"; - src = fetchurl { - url = "mirror://sourceforge/wqy/${name}.tar.gz"; - sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8"; - }; + url = "mirror://sourceforge/wqy/${name}.tar.gz"; - installPhase = ''install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc''; + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 + install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc + ''; + + sha256 = "0i5jh7mkp371fxqmsvn7say075r641yl4hq26isjyrqvb8cv92a9"; meta = { description = "A (mainly) Chinese Unicode font"; From 5f4906616d18221dedd1e7db3f749b47d54803b0 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 04:09:15 +0000 Subject: [PATCH 094/213] vistafonts: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/vista-fonts/default.nix | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 5fea1f795fd..f84d067eed8 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -1,24 +1,14 @@ -{stdenv, fetchurl, cabextract}: +{stdenv, fetchzip, cabextract}: -stdenv.mkDerivation { +fetchzip { name = "vista-fonts-1"; - src = fetchurl { - url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; - sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4"; - }; + url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; - buildInputs = [cabextract]; + postFetch = '' + ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile + ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' ppviewer.cab - unpackPhase = '' - cabextract --lowercase --filter ppviewer.cab $src - cabextract --lowercase --filter '*.TTF' ppviewer.cab - sourceRoot=. - ''; - - dontBuild = true; - - installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype @@ -31,6 +21,8 @@ stdenv.mkDerivation { done ''; + sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g"; + meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx; From dfb345898bc38f49e8a2a11a6e324dfa7a2efcbc Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 04:03:56 +0000 Subject: [PATCH 095/213] ubuntu_font_family: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- .../data/fonts/ubuntu-font-family/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 61e12848d97..e78f86fede4 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "ubuntu-font-family-0.83"; - buildInputs = [unzip]; - src = fetchurl { - url = "http://font.ubuntu.com/download/${name}.zip"; - sha256 = "0hjvq2x758dx0sfwqhzflns0ns035qm7h6ygskbx1svzg517sva5"; - }; + url = "http://font.ubuntu.com/download/${name}.zip"; - installPhase = - '' - mkdir -p $out/share/fonts/ubuntu - cp *.ttf $out/share/fonts/ubuntu - ''; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/ubuntu + ''; + + sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh"; meta = { description = "Ubuntu Font Family"; From 44b3f9151ac5383e7158b45e027f623d22a0221a Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 04:01:26 +0000 Subject: [PATCH 096/213] iosevka: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/iosevka/default.nix | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 78519ff8c9b..0626ab8e489 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "iosevka-${version}"; +let version = "1.13.1"; +in fetchzip rec { + name = "iosevka-${version}"; - buildInputs = [ unzip ]; + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - src = fetchurl { - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i"; - }; - - sourceRoot = "."; - - installPhase = '' - fontdir=$out/share/fonts/iosevka - - mkdir -p $fontdir - cp -v iosevka-* $fontdir + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka ''; + sha256 = "0w35jkvfnzn4clm3010wv13sil2yj6pxffx40apjp7yhh19c4sw7"; + meta = with stdenv.lib; { homepage = http://be5invis.github.io/Iosevka/; downloadPage = "https://github.com/be5invis/Iosevka/releases"; From bee42ef52b3551de862a924166d1903786376b5c Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 03:59:59 +0000 Subject: [PATCH 097/213] mro-unicode: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/mro-unicode/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix index 493a26e5556..8986a9adb7a 100644 --- a/pkgs/data/fonts/mro-unicode/default.nix +++ b/pkgs/data/fonts/mro-unicode/default.nix @@ -1,10 +1,13 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: -runCommand "mro-unicode-2013-05-25" { - src = fetchurl { - url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf"; - sha256 = "1za74ych0sh97ks6qp9iqq9jankgnkrq65s350wsbianwi72di45"; - }; +fetchzip { + name = "mro-unicode-2013-05-25"; + + url = "https://github.com/phjamr/MroUnicode/raw/master/MroUnicode-Regular.ttf"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf"; + + sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g"; meta = with lib; { homepage = https://github.com/phjamr/MroUnicode; @@ -14,7 +17,3 @@ runCommand "mro-unicode-2013-05-25" { platforms = platforms.all; }; } -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/MroUnicode-Regular.ttf -'' From 9f11dcc625be85996348f0e95a27800dcdc4b592 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 03:57:52 +0000 Subject: [PATCH 098/213] marathi-cursive: make the font derivation fixed-output - [x] homepage fixed - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/marathi-cursive/default.nix | 23 ++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index e3f47cb8b0d..48b2f4c516b 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, p7zip }: +{ stdenv, fetchzip, p7zip }: -stdenv.mkDerivation rec { - name = "marathi-cursive-${version}"; +let version = "1.2"; +in fetchzip rec { + name = "marathi-cursive-${version}"; - src = fetchurl { - url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; - sha256 = "0zhqkkfkz5mhfz8xv305s16h80p9v1iva829fznxd2c44ngyplmc"; - }; + url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; - buildInputs = [ p7zip ]; + postFetch = '' + ${p7zip}/bin/7z x $downloadedFile + cd MarathiCursive - unpackCmd = "7z x $curSrc"; - - installPhase = '' mkdir -p $out/share/fonts/marathi-cursive cp -v *.otf *.ttf $out/share/fonts/marathi-cursive mkdir -p $out/share/doc/${name} cp -v README *.txt $out/share/doc/${name} ''; + sha256 = "0fhz2ixrkm523qlx5pnwyzxgb1cfiiwrhls98xg8a5l3sypn1g8v"; + meta = with stdenv.lib; { - homepage = https://github.com/MihailJP/marathi-cursive; + homepage = https://github.com/MihailJP/MarathiCursive; description = "Modi script font with Graphite and OpenType support"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.mit; # It's the M+ license, M+ is MIT(-ish) From be422a4a68cf1d9140b5de6930ef7dcb569731ba Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 03:51:51 +0000 Subject: [PATCH 099/213] ipaexfont: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/ipaexfont/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index e6d4b6734bf..dfeab5124c8 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,20 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "ipaexfont-003.01"; - src = fetchurl { - url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; - sha256 = "0nmfyh10rzkvp0qmrla0dahkmmxq47678y4v8fdm8fpdzmf0kpn7"; - }; + url = "http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; - buildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype/ - cp *.ttf $out/share/fonts/opentype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; + sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj"; + meta = with stdenv.lib; { description = "Japanese font package with Mincho and Gothic fonts"; longDescription = '' From 576e9aacc0cde8cc47b0cbb0849325d5c7ed148d Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 03:50:44 +0000 Subject: [PATCH 100/213] ipafont: make the font derivation fixed-output - [x] make the font derivations fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/ipafont/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 1f37630835d..c056f14f46f 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -1,23 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "ipafont-003.03"; - src = fetchurl { - url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; - sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5"; - }; + url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; - buildInputs = [ unzip ]; - - unpackPhase = '' - unzip $src + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp ./IPAfont00303/*.ttf $out/share/fonts/opentype/ - ''; + sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h"; meta = { description = "Japanese font package with Mincho and Gothic fonts"; From 7e2b15f08bcd882a5dc52935f80333f7ab5b1e7b Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 03:49:27 +0000 Subject: [PATCH 101/213] liberastika: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/liberastika/default.nix | 28 ++++++++++--------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 964210c8dfe..2e1f89ed1e7 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "liberastika-${version}"; +let version = "1.1.5"; +in fetchzip rec { + name = "liberastika-${version}"; - src = fetchurl { - url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; - sha256 = "0vg5ki120lb577ihvq8w0nxs8yacqzcvsmnsygksmn6281hyj0xj"; - }; + url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $(find . -name '*.ttf') $out/share/fonts/truetype - - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING README "$out/doc/${name}" || true + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile AUTHORS ChangeLog COPYING README -d "$out/share/doc/${name}" ''; + sha256 = "1a9dvl1pzch2vh8sqyyn1d1wz4n624ffazl6hzlc3s5k5lzrb6jp"; + meta = with stdenv.lib; { description = "Liberation Sans fork with improved cyrillic support"; homepage = https://sourceforge.net/projects/lib-ka/; From 8ec0a03bb2be8226848f9d4a6133eb9a8f9e0457 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 13:35:52 +0000 Subject: [PATCH 102/213] gentium: make the font derivation fixed-output (#28132) - [x] source link fixed - [x] make the font derivations fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- .../data/fonts/gentium-book-basic/default.nix | 25 ++++++++----------- pkgs/data/fonts/gentium/default.nix | 25 +++++++++---------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index c6812e39ef8..4c1e484253c 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -1,26 +1,23 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "gentium-book-basic-${version}"; +let major = "1"; minor = "102"; version = "${major}.${minor}"; +in fetchzip rec { + name = "gentium-book-basic-${version}"; - src = fetchzip { - name = "${name}.zip"; - url = "http://software.sil.org/downloads/gentium/GentiumBasic_${major}${minor}.zip"; - sha256 = "109yiqwdfb1bn7d6bjp8d50k1h3z3kz86p3faz11f9acvsbsjad0"; - }; + url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${major}${minor}.zip"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v FONTLOG.txt GENTIUM-FAQ.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name} ''; + sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; + meta = with stdenv.lib; { homepage = http://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 975c4c72a9c..2e2ffdeb5bb 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,23 +1,22 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "gentium-${version}"; +let version = "5.000"; +in fetchzip rec { + name = "gentium-${version}"; - src = fetchzip { - url = "http://software.sil.org/downloads/d/gentium/GentiumPlus-${version}.zip"; - sha256 = "0g9sx38wh7f0m16gr64g2xggjwak2q6jw9y4zhrvhmp4aq4xfqm6"; - }; + url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -vr documentation/ FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name} + unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation ''; + sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; + meta = with stdenv.lib; { homepage = http://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; From a3e9a6982180b2e9d3261c8966c629d84a2a6e97 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 13:36:53 +0000 Subject: [PATCH 103/213] bakoma_ttf: make the font derivations fixed-output (#28130) - [x] dead link fixed - [x] make the font derivations fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/bakoma-ttf/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index bffa7edb604..8d87154c1df 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,20 +1,18 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "bakoma-ttf"; - src = fetchurl { - url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2; - sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; - }; + url = http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km; - dontBuild = true; - - installPhase = '' + postFetch = '' + tar xjvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ttf/*.ttf $out/share/fonts/truetype ''; + sha256 = "0g7i723n00cqx2va05z1h6v3a2ar69gqw4hy6pjj7m0ml906rngc"; + meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/; From a4e44ffecb7d0a10cf77f35533a75d273d6a8b3b Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 13:38:52 +0000 Subject: [PATCH 104/213] opensans-ttf: make the font derivations fixed-output (#28126) - [x] dead link fixed - [x] make the font derivations fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/opensans-ttf/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index dbcf84c9a74..2807bd6d435 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -1,22 +1,18 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -# adapted from https://aur.archlinux.org/packages/tt/ttf-opensans/PKGBUILD - -stdenv.mkDerivation rec { +fetchzip { name = "opensans-ttf-20140617"; - src = fetchurl { - url = "https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; - sha256 = "1ycn39dijhd3lffmafminrnfmymdig2jvc6i47bb42fx777q97q4"; - }; + url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; - sourceRoot = "."; - - installPhase = '' + postFetch = '' + tar -xzf $downloadedFile mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf"; + meta = { description = "Open Sans fonts"; longDescription = '' From 078f1dde724456eeacaf83c9931c34c09b35d0bb Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 13:40:45 +0000 Subject: [PATCH 105/213] cabin: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/cabin/default.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index 8e432db8418..5bf4d454b06 100644 --- a/pkgs/data/fonts/cabin/default.nix +++ b/pkgs/data/fonts/cabin/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "cabin-1.005"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Cabin"; - rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; - sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn"; - }; + url = https://github.com/impallari/Cabin/archive/982839c790e9dc57c343972aa34c51ed3b3677fd.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "1ax5c2iab48qsk9zn3gjvqaib2lnlm25f1wr0aysf5ngw0y0jkrd"; + meta = with stdenv.lib; { description = "A humanist sans with 4 weights and true italics"; longDescription = '' From 973ebce99693f7d9673fdd012836bd58f82f8932 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 13:29:41 +0000 Subject: [PATCH 106/213] noto-fonts, noto-fonts-cjk: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/noto-fonts/default.nix | 50 +++++++++----------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 28fce379968..73059cbcc33 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: +{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }: rec { # 18MB - noto-fonts = let version = "git-2016-03-29"; in stdenv.mkDerivation { + noto-fonts = let version = "git-2016-03-29"; in fetchzip { name = "noto-fonts-${version}"; - src = fetchFromGitHub { - owner = "googlei18n"; - repo = "noto-fonts"; - rev = "e8b0af48b15d64bd490edab4418b5e396cf29644"; - sha256 = "02yv12fbb4n1gp9g9m0qxnj6adpg9hfsr9377h2d4xsf6sxcgy6f"; - }; + url = https://github.com/googlei18n/noto-fonts/archive/e8b0af48b15d64bd490edab4418b5e396cf29644.zip; + postFetch = '' + unzip $downloadedFile - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' mkdir -p $out/share/fonts/noto - cp hinted/*.ttf $out/share/fonts/noto + cp noto-fonts-*/hinted/*.ttf $out/share/fonts/noto # Also copy unhinted & alpha fonts for better glyph coverage, # if they don't have a hinted version # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J) - cp -n unhinted/*.ttf $out/share/fonts/noto - cp -n alpha/*.ttf $out/share/fonts/noto + cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto + cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto ''; - - preferLocalBuild = true; + sha256 = "0wphc8671dpbx3rxzmjisnjipg2c2vkhw2i6mmyamd6vvcwajd64"; meta = with stdenv.lib; { inherit version; @@ -49,27 +42,16 @@ rec { }; }; # 89MB - noto-fonts-cjk = let version = "1.004"; in stdenv.mkDerivation { + noto-fonts-cjk = let version = "1.004"; in fetchzip { name = "noto-fonts-cjk-${version}"; - src = fetchurl { - # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file - url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip"; - sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6"; - }; - - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/noto - cp *.ttc $out/share/fonts/noto + # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file + url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip"; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttc -d $out/share/fonts/noto ''; - - preferLocalBuild = true; + sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq"; meta = with stdenv.lib; { inherit version; From 265744f2e0b0dbcc53a1acd24a9f0716060f3033 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 13:42:16 +0000 Subject: [PATCH 107/213] fira-code: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/fira-code/default.nix | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index e14505f61bd..5cfd2ec1f47 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "fira-code-${version}"; +let version = "1.204"; +in fetchzip { + name = "fira-code-${version}"; - src = fetchurl { - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sha256 = "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18"; - }; + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sourceRoot = "otf"; - - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0gngbnrq42ysz13w3s227ghv1yigw399r3w2415ipb5pba8vipad"; + meta = with stdenv.lib; { homepage = https://github.com/tonsky/FiraCode; description = "Monospace font with programming ligatures"; From dfde45d98e1cdcbbaa7456c569461a66ffe17389 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 13:43:18 +0000 Subject: [PATCH 108/213] fira-code-symbols: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/fira-code/symbols.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index e8868764271..c19fbccb142 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,11 +1,16 @@ -{ stdenv, runCommand, fetchurl, unzip }: +{ stdenv, fetchzip }: -runCommand "fira-code-symbols-20160811" { - src = fetchurl { - url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; - sha256 = "01sk8cmm50xg2vwf0ff212yi5gd2sxcb5l4i9g004alfrp7qaqxg"; - }; - buildInputs = [ unzip ]; +fetchzip { + name = "fira-code-symbols-20160811"; + + url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile -d $out/share/fonts/opentype + ''; + + sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; meta = with stdenv.lib; { description = "FiraCode unicode ligature glyphs in private use area"; @@ -18,7 +23,4 @@ runCommand "fira-code-symbols-20160811" { maintainers = [ maintainers.profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; -} '' - mkdir -p $out/share/fonts/opentype - unzip "$src" -d $out/share/fonts/opentype -'' +} From 48b2962550ccb41c7c45663db1be19c5a71458d4 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 11 Aug 2017 13:39:01 +0000 Subject: [PATCH 109/213] arphic-ukai, arphic-uming: make the font derivation fixed-output - [x] make the font derivation fixed-output (https://github.com/NixOS/nixpkgs/issues/27754) --- pkgs/data/fonts/arphic/default.nix | 50 ++++++++++++------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix index b392ac79b2d..37d9a199567 100644 --- a/pkgs/data/fonts/arphic/default.nix +++ b/pkgs/data/fonts/arphic/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchurl, mkfontscale, mkfontdir }: +{ stdenv, fetchzip, mkfontscale, mkfontdir }: -{ - arphic-ukai = stdenv.mkDerivation rec { +let + version = "0.2.20080216.2"; +in { + arphic-ukai = fetchzip { name = "arphic-ukai-${version}"; - version = "0.2.20080216.2"; + url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; - src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; - sha256 = "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml"; - }; - - buildInputs = [ mkfontscale mkfontdir ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xjvf $downloadedFile --strip-components=1 install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc cd $out/share/fonts - mkfontdir - mkfontscale + ${mkfontdir}/bin/mkfontdir + ${mkfontscale}/bin/mkfontscale ''; + sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl"; + meta = with stdenv.lib; { description = "CJK Unicode font Kai style"; homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; @@ -32,27 +28,21 @@ }; }; - arphic-uming = stdenv.mkDerivation rec { + arphic-uming = fetchzip { name = "arphic-uming-${version}"; - version = "0.2.20080216.2"; + url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; - src = fetchurl { - url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; - sha256 = "1ny11n380vn7sryvy1g3a83y3ll4h0jf9wgnrx55nmksx829xhg3"; - }; - - buildInputs = [ mkfontscale mkfontdir ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xjvf $downloadedFile --strip-components=1 install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc cd $out/share/fonts - mkfontdir - mkfontscale + ${mkfontdir}/bin/mkfontdir + ${mkfontscale}/bin/mkfontscale ''; + sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d"; + meta = with stdenv.lib; { description = "CJK Unicode font Ming style"; homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; From 516ba12b6de82559e604de53eeedd42f886df62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 11 Aug 2017 15:03:06 +0100 Subject: [PATCH 110/213] dropbox: fix makeWrapper usage makeWrapper checks now if script is executable, so we have to chmod first. --- pkgs/applications/networking/dropbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 088fda046a4..25259b467bb 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -96,10 +96,10 @@ in mkDerivation { mkdir -p "$out/bin" RPATH="${ldpath}:$out/${appdir}" + chmod 755 $out/${appdir}/dropbox makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "$RPATH" - chmod 755 $out/${appdir}/dropbox rm $out/${appdir}/wmctrl ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl From 211593fe4909fecdb3afc1b2388c37f8392109a0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 11 Aug 2017 09:47:54 +0800 Subject: [PATCH 111/213] influxdb nixos module: allow customizing the collectd dependency --- nixos/modules/services/databases/influxdb.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index dd88624f406..7fe25252350 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -68,7 +68,7 @@ let collectd = [{ enabled = false; - typesdb = "${pkgs.collectd}/share/collectd/types.db"; + typesdb = "${pkgs.collectd-data}/share/collectd/types.db"; database = "collectd_db"; port = 25826; }]; @@ -149,7 +149,6 @@ in type = types.attrs; }; }; - }; From ae5e8dda0775784ccf1d9e63bf45fcefad42b6e7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 11 Aug 2017 10:22:20 -0400 Subject: [PATCH 112/213] sbt: 0.13.16 -> 1.0.0 --- pkgs/development/tools/build-managers/sbt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 8d121b28c95..4627a6bd312 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.16"; + version = "1.0.0"; src = fetchurl { urls = [ "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz" - "https://cocl.us/sbt01316tgz" + "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2"; + sha256 = "0njwch97g69vzxfqhlaibjwbif2vka68dssddk2jlpqlf94lzq4s"; }; patchPhase = '' From 31c344982f0c47af4d33cb5a37125deb1d767ef0 Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 10 Aug 2017 19:43:49 +0000 Subject: [PATCH 113/213] data/fonts: simpler cleanups --- pkgs/data/fonts/andagii/default.nix | 20 ++--- pkgs/data/fonts/anonymous-pro/default.nix | 26 +++--- pkgs/data/fonts/arkpandora/default.nix | 28 +++--- pkgs/data/fonts/aurulent-sans/default.nix | 21 ++--- pkgs/data/fonts/baekmuk-ttf/default.nix | 26 ++---- pkgs/data/fonts/caladea/default.nix | 19 ++-- pkgs/data/fonts/camingo-code/default.nix | 23 +++-- pkgs/data/fonts/cantarell-fonts/default.nix | 4 + pkgs/data/fonts/carlito/default.nix | 19 ++-- pkgs/data/fonts/cm-unicode/default.nix | 19 ++-- pkgs/data/fonts/comfortaa/default.nix | 29 +++---- pkgs/data/fonts/comic-neue/default.nix | 35 ++++---- pkgs/data/fonts/comic-relief/default.nix | 31 +++---- pkgs/data/fonts/corefonts/default.nix | 4 + pkgs/data/fonts/crimson/default.nix | 18 ++-- pkgs/data/fonts/culmus/default.nix | 21 ++--- pkgs/data/fonts/dina/default.nix | 20 ++--- pkgs/data/fonts/dosis/default.nix | 22 ++--- pkgs/data/fonts/droid/default.nix | 4 + pkgs/data/fonts/eb-garamond/default.nix | 23 +++-- .../emacs-all-the-icons-fonts/default.nix | 22 +++-- pkgs/data/fonts/encode-sans/default.nix | 22 ++--- .../fonts/fantasque-sans-mono/default.nix | 29 +++---- pkgs/data/fonts/fira-mono/default.nix | 21 ++--- pkgs/data/fonts/fira/default.nix | 21 ++--- .../fonts/fontconfig-penultimate/default.nix | 17 ++-- pkgs/data/fonts/freefont-ttf/default.nix | 19 ++-- pkgs/data/fonts/gdouros/default.nix | 83 ++++++++---------- pkgs/data/fonts/go-font/default.nix | 4 + pkgs/data/fonts/gyre/default.nix | 22 ++--- pkgs/data/fonts/hack/default.nix | 29 +++---- pkgs/data/fonts/hanazono/default.nix | 27 +++--- pkgs/data/fonts/hasklig/default.nix | 23 ++--- .../fonts/helvetica-neue-lt-std/default.nix | 26 +++--- pkgs/data/fonts/inconsolata/default.nix | 19 ++-- pkgs/data/fonts/input-fonts/default.nix | 8 +- pkgs/data/fonts/junicode/default.nix | 20 ++--- pkgs/data/fonts/kawkab-mono/default.nix | 20 ++--- .../fonts/kochi-substitute-naga10/default.nix | 16 ++-- pkgs/data/fonts/kochi-substitute/default.nix | 4 + pkgs/data/fonts/lato/default.nix | 21 ++--- .../fonts/league-of-moveable-type/default.nix | 4 + pkgs/data/fonts/libre-baskerville/default.nix | 22 ++--- pkgs/data/fonts/libre-bodoni/default.nix | 22 ++--- pkgs/data/fonts/libre-caslon/default.nix | 4 + pkgs/data/fonts/libre-franklin/default.nix | 22 ++--- pkgs/data/fonts/lmodern/default.nix | 23 ++--- pkgs/data/fonts/lmodern/lmmath.nix | 20 ++--- pkgs/data/fonts/lobster-two/default.nix | 4 + pkgs/data/fonts/lohit-fonts/default.nix | 87 ++++++++++--------- pkgs/data/fonts/meslo-lg/default.nix | 4 + pkgs/data/fonts/mononoki/default.nix | 21 ++--- pkgs/data/fonts/montserrat/default.nix | 17 ++-- pkgs/data/fonts/mph-2b-damase/default.nix | 21 ++--- .../fonts/mplus-outline-fonts/default.nix | 19 ++-- pkgs/data/fonts/nafees/default.nix | 4 + pkgs/data/fonts/nerdfonts/default.nix | 4 + pkgs/data/fonts/norwester/default.nix | 22 ++--- pkgs/data/fonts/oldsindhi/default.nix | 24 +++-- pkgs/data/fonts/oldstandard/default.nix | 4 + pkgs/data/fonts/open-dyslexic/default.nix | 27 +++--- pkgs/data/fonts/orbitron/default.nix | 24 +++-- pkgs/data/fonts/overpass/default.nix | 28 +++--- pkgs/data/fonts/oxygenfonts/default.nix | 22 ++--- pkgs/data/fonts/paratype-pt/mono.nix | 27 +++--- pkgs/data/fonts/paratype-pt/sans.nix | 27 +++--- pkgs/data/fonts/paratype-pt/serif.nix | 27 +++--- pkgs/data/fonts/pecita/default.nix | 19 ++-- pkgs/data/fonts/poly/default.nix | 4 + pkgs/data/fonts/powerline-fonts/default.nix | 27 +++--- pkgs/data/fonts/profont/default.nix | 29 +++---- pkgs/data/fonts/quattrocento-sans/default.nix | 28 +++--- pkgs/data/fonts/quattrocento/default.nix | 26 +++--- pkgs/data/fonts/raleway/default.nix | 27 +++--- pkgs/data/fonts/roboto-mono/default.nix | 4 + pkgs/data/fonts/roboto-slab/default.nix | 4 + pkgs/data/fonts/sampradaya/default.nix | 19 ++-- pkgs/data/fonts/shrikhand/default.nix | 18 ++-- pkgs/data/fonts/signwriting/default.nix | 4 + pkgs/data/fonts/siji/default.nix | 22 +++-- pkgs/data/fonts/source-code-pro/default.nix | 25 +++--- pkgs/data/fonts/source-han-sans/default.nix | 32 +++---- pkgs/data/fonts/source-han-serif/default.nix | 32 +++---- pkgs/data/fonts/source-sans-pro/default.nix | 16 ++-- pkgs/data/fonts/source-serif-pro/default.nix | 20 ++--- pkgs/data/fonts/stix-otf/default.nix | 26 +++--- pkgs/data/fonts/stix-two/default.nix | 24 +++-- pkgs/data/fonts/tai-languages/default.nix | 21 +++-- pkgs/data/fonts/tempora-lgc/default.nix | 4 + pkgs/data/fonts/terminus-font-ttf/default.nix | 18 ++-- pkgs/data/fonts/theano/default.nix | 21 ++--- pkgs/data/fonts/tipa/default.nix | 8 +- .../data/fonts/ttf-bitstream-vera/default.nix | 16 ++-- pkgs/data/fonts/ttf-envy-code-r/default.nix | 24 +++-- pkgs/data/fonts/unifont_upper/default.nix | 20 ++--- 95 files changed, 865 insertions(+), 1088 deletions(-) diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 562aa8be4ef..5c708457f8d 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,22 +1,18 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "andagii-${version}"; +let version = "1.0.2"; +in fetchzip { + name = "andagii-${version}"; - src = fetchzip { - url = http://www.i18nguy.com/unicode/andagii.zip; - sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k"; - stripRoot = false; - curlOpts = "--user-agent 'Mozilla/5.0'"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + url = http://www.i18nguy.com/unicode/andagii.zip; + curlOpts = "--user-agent 'Mozilla/5.0'"; + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/truetype cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf ''; + sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2"; # There are multiple claims that the font is GPL, so I include the # package; but I cannot find the original source, so use it on your diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index da34a2f43aa..ff8813f7813 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "anonymousPro-${version}"; +let version = "1.002"; +in fetchzip rec { + name = "anonymousPro-${version}"; - src = fetchurl { - url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; - sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6"; - }; - - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \; - find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" ''; + sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with stdenv.lib; { homepage = http://www.marksimonson.com/fonts/view/anonymous-pro; diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 59be4fd14c8..c2e64cb63dd 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "arkpandora-${version}"; +{ stdenv, fetchurl, unzip }: + +let version = "2.04"; +in fetchurl { + name = "arkpandora-${version}"; - src = fetchurl { - urls = [ - "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" - "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" - "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" - ]; - sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51"; - }; - - installPhase = '' + urls = [ + "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" + "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" + "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" + ]; + downloadToTemp = true; + recursiveHash = true; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k"; meta = { description = "Font, metrically identical to Arial and Times New Roman"; diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 9941b4791b5..1a83ce17646 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -1,21 +1,14 @@ -{stdenv, fetchgit}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "aurulent-sans-0.1"; - src = fetchgit { - url = "https://github.com/deepfire/hartke-aurulent-sans.git"; - rev = "refs/tags/${name}"; - sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; - }; - - dontBuild = true; - - installPhase = '' - fontDir=$out/share/fonts/opentype - mkdir -p $fontDir - cp *.otf $fontDir + url = "https://github.com/deepfire/hartke-aurulent-sans/archive/${name}.zip"; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li"; meta = { description = "Aurulent Sans"; diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index ba1f21c186e..555bba63354 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "baekmuk-ttf-2.2"; - src = fetchurl { - url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; - sha256 = "10hqspl70h141ywz1smlzdanlx9vwgsp1qrcjk68fn2xnpzpvaq8"; - }; - - dontBuild = true; - - installPhase = let - fonts_dir = "$out/share/fonts"; - doc_dir = "$out/share/doc/${name}"; - in '' - mkdir -pv ${fonts_dir} - mkdir -pv ${doc_dir} - cp ttf/*.ttf ${fonts_dir} - cp COPYRIGHT* ${doc_dir} + url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts $out/share/doc/${name} + cp ttf/*.ttf $out/share/fonts + cp COPYRIGHT* $out/share/doc/${name} ''; + sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g"; meta = { description = "Korean font"; diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index 110405839a1..56d8273f78a 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -1,22 +1,19 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "caladea-${version}"; +let version = "20130214"; +in fetchzip rec { + name = "caladea-${version}"; - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; - sha256 = "02addvvkbvf3bn21kfyj10j9w1c8hdxxld4wjmnc1j8ksqpir3f4"; - }; - - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf ''; + sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z"; meta = with stdenv.lib; { # This font doesn't appear to have any official web site but this diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix index bc1402270aa..dfdf367337c 100644 --- a/pkgs/data/fonts/camingo-code/default.nix +++ b/pkgs/data/fonts/camingo-code/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "camingo-code-${version}"; +let version = "1.0"; +in fetchzip rec { + name = "camingo-code-${version}"; - src = fetchurl { - url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; - sha256 = "1gbpfa5mqyhi5yrb6dl708pggiwp002b532fn3axiagb0cxxf02s"; - }; - - buildInputs = [ unzip ]; - - installPhase = '' + url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/${name} - cp -v camingo-code/*.ttf $out/share/fonts/truetype/ - cp -v camingo-code/*.txt $out/share/doc/${name}/ + cp -v fonts/camingo-code/*.ttf $out/share/fonts/truetype/ + cp -v fonts/camingo-code/*.txt $out/share/doc/${name}/ ''; + sha256 = "035z2k6lwwy2bysw27pirn3vjxnj2h23nyx8jr213rb2bl0m21x1"; meta = with stdenv.lib; { homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 98ce946044d..de2edad451b 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; }; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2"; + meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index b90d89c9779..2243435bc5d 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -1,23 +1,22 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "carlito-${version}"; +let version = "20130920"; +in fetchzip rec { + name = "carlito-${version}"; - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; - sha256 = "0nmgzp6gdvv4dipswrw0l1bfjp4jbic2qvm7dpqiq71jpin2plab"; - }; + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf ''; + sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv"; + meta = with stdenv.lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index ed7ce93e189..d17021feb81 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "cm-unicode-${version}"; +let version = "0.7.0"; +in fetchzip rec { + name = "cm-unicode-${version}"; - src = fetchurl { - url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; - sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl"; - }; + url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} cp -v *.otf $out/share/fonts/opentype/ cp -v README FontLog.txt $out/share/doc/${name} ''; + sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; + meta = with stdenv.lib; { homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/; description = "Computer Modern Unicode fonts"; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index c773f395592..0dd4f727ad2 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -1,25 +1,18 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "comfortaa-${version}"; +let version = "2.004"; +in fetchzip rec { + name = "comfortaa-${version}"; - src = fetchurl { - url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip"; - sha256 = "0js0kk5g6b7xrq92b68gz5ipbiv1havnbgnfqzvlw3k3nllwnl9z"; - }; - - phases = ["unpackPhase" "installPhase"]; - - buildInputs = [unzip]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v FONTLOG.txt $out/share/doc/${name}/ - cp -v donate.html $out/share/doc/${name}/ + url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip"; + postFetch = '' + mkdir -p $out/share/fonts $out/share/doc + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name} ''; + sha256 = "1gnscf3kw9p5gbc5594a22cc6nmiir9mhp1nl3mkbzd4v1jfbh2h"; meta = with stdenv.lib; { homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949; diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 5d3da910e0b..07fc172ca51 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchurl -, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "comic-neue-${version}"; +let version = "2.2"; +in fetchzip rec { + name = "comic-neue-${version}"; - src = fetchurl { - url = "http://comicneue.com/${name}.zip"; - sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n"; - }; + url = "http://comicneue.com/${name}.zip"; - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = name; - - installPhase = '' - mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name} - cp -v OTF/*.otf $out/share/fonts/opentype - cp -v Web/*.ttf $out/share/fonts/truetype - cp -v Web/*.eot $out/share/fonts/EOT - cp -v Web/*.woff $out/share/fonts/WOFF - cp -v Web/*.woff2 $out/share/fonts/WOFF2 - cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name} + postFetch = '' + mkdir -vp $out/share/{doc,fonts} + unzip -j $downloadedFile comic-neue-2.2/\*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile comic-neue-2.2/\*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile comic-neue-2.2/\*.eot -d $out/share/fonts/EOT + unzip -j $downloadedFile comic-neue-2.2/\*.woff -d $out/share/fonts/WOFF + unzip -j $downloadedFile comic-neue-2.2/\*.woff2 -d $out/share/fonts/WOFF2 + unzip -j $downloadedFile comic-neue-2.2/\*.pdf comic-neue-2.2/FONTLOG.txt comic-neue-2.2/OFL-FAQ.txt comic-neue-2.2/SIL-License.txt -d $out/share/doc/${name} ''; + sha256 = "1yypq5aqqzv3q1c6vx5130mi2iwihzzvrawhwqpwsfjl0p25sq9q"; + meta = with stdenv.lib; { homepage = http://comicneue.com/; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index 31c89215ea7..2a1273214bd 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -1,32 +1,23 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "comic-relief-${version}"; +let version = "1.1"; +in fetchzip rec { + name = "comic-relief-${version}"; - src = fetchurl { - url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; - sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch"; - }; + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; - buildInputs = [unzip]; - - phases = ["unpackPhase" "installPhase"]; - - unpackCmd = '' - mkdir -p ${name} - unzip -qq -d ${name} $src - ''; - - installPhase = '' + postFetch = '' mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/doc/${name} mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype - cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf - cp -v FONTLOG.txt $out/share/doc/${name} + cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name} ''; + sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; + meta = with stdenv.lib; { homepage = http://loudifier.com/comic-relief/; description = "A font metric-compatible with Microsoft Comic Sans"; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index c514f1ab7fb..91c8ed1163d 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -59,6 +59,10 @@ stdenv.mkDerivation { done ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx"; + meta = with stdenv.lib; { homepage = http://corefonts.sourceforge.net/; description = "Microsoft's TrueType core fonts for the Web"; diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index f612f077064..e96c13b7822 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -1,23 +1,23 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "crimson-${version}"; +let version = "2014.10"; +in fetchzip rec { + name = "crimson-${version}"; - src = fetchurl { - url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; - sha256 = "0qyihrhqb89vwg9cfpaf5xqmcjvs4r4614bxy634vmqv9v1bzn5b"; - }; + url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; - phases = ["unpackPhase" "installPhase"]; + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 - installPhase = '' mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype cp -v README.md $out/share/doc/${name} ''; + sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; + meta = with stdenv.lib; { homepage = https://aldusleaf.org/crimson.html; description = "A font family inspired by beautiful oldstyle typefaces"; diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix index 08783e46cde..236058c0b27 100644 --- a/pkgs/data/fonts/culmus/default.nix +++ b/pkgs/data/fonts/culmus/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "culmus-${version}"; +let version = "0.130"; +in fetchzip { + name = "culmus-${version}"; - src = fetchurl { - url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; - sha256 = "908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1"; - }; - - installPhase = '' + url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; + + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype/ ''; - + + sha256 = "0v5vm8j2bxnw2qn0640kyibn4h8ck8cidhx2pixi5xsayr0ij1n6"; + meta = { description = "Culmus Hebrew fonts"; longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows."; diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index a206bd7f911..66feaf0ff54 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +let version = "2.92"; +in fetchzip rec { name = "dina-font-${version}"; - src = fetchurl { - url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; - sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; - }; + url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = - '' + postFetch = '' mkdir -p $out/share/fonts - cp *.bdf $out/share/fonts + unzip -j $downloadedFile \*.bdf -d $out/share/fonts ''; + sha256 = "02a6hqbq18sw69npylfskriqhvj1nsk65hjjyd05nl913ycc6jl7"; + meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 28b9ee2f1e7..01157e8b7e4 100644 --- a/pkgs/data/fonts/dosis/default.nix +++ b/pkgs/data/fonts/dosis/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "dosis-1.007"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Dosis"; - rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; - sha256 = "0glniyg07z5gx5gsa1ymarg2gsncjyf94wi6j9bf68v5s2w3v7md"; - }; + url = https://github.com/impallari/Dosis/archive/12df1e13e58768f20e0d48ff15651b703f9dd9dc.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF v1.007 Fontlab/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "11a8jmgaly14l7rm3jxkwwv3ngr8fdlkp70nicjk2rg0nny2cvfq"; + meta = with stdenv.lib; { description = "A very simple, rounded, sans serif family"; longDescription = '' diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index 70730a7d8b7..c2a4868a091 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { cp *.ttf $out/share/fonts/droid ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1l3lqfdr9pm05b1py9yr3cf65gi1my7jrrlvikqpqg2zr066n6c3"; + meta = { description = "Droid Family fonts by Google Android"; homepage = https://github.com/google/fonts; diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 0956250e36c..53a5d9f73cc 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "eb-garamond-${version}"; +let version = "0.016"; +in fetchzip rec { + name = "eb-garamond-${version}"; - src = fetchzip { - url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; - sha256 = "0j40bg1di39q7zis64il67xchldyznrl8wij9il10c4wr8nl4r9z"; - }; + url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "otf/"*.otf $out/share/fonts/opentype/ - cp -v Changes README.markdown README.xelualatex $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}" ''; + sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; + meta = with stdenv.lib; { homepage = http://www.georgduffner.at/ebgaramond/; description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 4082d5949a3..10305a8c2d2 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "emacs-all-the-icons-fonts-${version}"; +let version = "3.1.1"; +in fetchzip { + name = "emacs-all-the-icons-fonts-${version}"; - src = fetchFromGitHub { - owner = "domtronn"; - repo = "all-the-icons.el"; - rev = version; - sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; - }; + url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; - installPhase = '' - mkdir -p $out/share/fonts/all-the-icons - for font in $src/fonts/*.ttf; do cp $font $out/share/fonts/all-the-icons; done + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons ''; + sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq"; + meta = with stdenv.lib; { description = "Icon fonts for emacs all-the-icons"; longDescription = '' diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index e0f79b2722c..96d64e13893 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "encode-sans-1.002"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Encode-Sans"; - rev = "11162b46892d20f55bd42a00b48cbf06b5871f75"; - sha256 = "1v5k79qlsl6nggilmjw56axwwr2b3838x6vqch4lh0dck5ri9w2c"; - }; + url = https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip; - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p"; + meta = with stdenv.lib; { description = "A versatile sans serif font family"; longDescription = '' diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index a87c89d1df9..de52ae411ef 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -1,28 +1,19 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "fantasque-sans-mono-${version}"; +let version = "1.7.1"; +in fetchzip rec { + name = "fantasque-sans-mono-${version}"; - src = fetchurl { - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; - sha256 = "0lkky7mmpq6igpjh7lsv30xjx62mwlx27gd9zwcyv3mp2d2b5cvb"; - }; + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; - - unpackCmd = '' - mkdir -p ${name} - unzip -qq -d ${name} $src + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile README.md -d $out/share/doc/${name} ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "OTF/"*.otf $out/share/fonts/opentype - cp -v README.md $out/share/doc/${name} - ''; + sha256 = "1sjdpnxyjdbqxzrylzkynxh1bmicc71h3pmwmr3a3cq0h53g28z0"; meta = with stdenv.lib; { homepage = https://github.com/belluzj/fantasque-sans; diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 3997ba27719..4fc6aab9510 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip { name = "fira-mono-3.206"; - src = fetchurl { - url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip; - sha256 = "1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi"; - }; + url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3206.zip; - buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraMonoFonts3206"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0m4kdjh4xjyznybpgh21a0gibv4wsxq0rqyl3wv942zk6mclmgdf"; + meta = with stdenv.lib; { homepage = http://www.carrois.com/fira-4-1/; description = "Monospace font for Firefox OS"; diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index f777ae33e0b..cddb8cd726a 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "fira-4.106"; - src = fetchurl { - url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip; - sha256 = "123xwd7abb96lsla1v579vfpvc7fwixhq78221qxrw4dv8mgf8id"; - }; + url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4106.zip; - buildInputs = [unzip]; - phases = [ "unpackPhase" "installPhase" ]; - sourceRoot = "FiraFonts4106"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "174nwmpvxqg1qjfj6h3yvrphs1s3n6zricdh27iaxilajm0ilbgs"; + meta = with stdenv.lib; { homepage = http://www.carrois.com/fira-4-1/; description = "Sans-serif font for Firefox OS"; diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix index 360cacb551d..da1c4467036 100644 --- a/pkgs/data/fonts/fontconfig-penultimate/default.nix +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: let version = "0.3.5"; in -stdenv.mkDerivation { +fetchzip { name = "fontconfig-penultimate-${version}"; - src = fetchFromGitHub { - owner = "ttuegel"; - repo = "fontconfig-penultimate"; - rev = version; - sha256 = "1xi664bs6n687s972nch87hi0iqkd6gr1l76zl58pymiw2132ks8"; - }; + url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/etc/fonts/conf.d - cp *.conf $out/etc/fonts/conf.d + unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d ''; + sha256 = "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk"; + meta = with stdenv.lib; { homepage = https://github.com/ttuegel/fontconfig-penultimate; description = "Sensible defaults for Fontconfig"; diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 00d5cfba27a..87b3abe2911 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -1,20 +1,17 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "freefont-ttf-20120503"; - src = fetchurl { - url = "mirror://gnu/freefont/${name}.zip"; - sha256 = "1bw9mrf5pqi2a29b7qw4nhhj566aqqmi28hkbn2a38c2pzqvm1bw"; - }; + url = "mirror://gnu/freefont/${name}.zip"; - buildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "0h0x2hhr7kvjiycf7fv800xxwa6hcpiz54bqx06wsqc7z61iklvd"; + meta = { description = "GNU Free UCS Outline Fonts"; longDescription = '' diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index 28bea4c2c8b..359074099ba 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -1,62 +1,51 @@ -{stdenv, fetchurl, unzip, lib }: +{stdenv, fetchzip, lib}: + let fonts = { - symbola = { version = "9.00"; file = "Symbola.zip"; sha256 = "0d9zrlvzh8inhr17p99banr0dmrvkwxbk3q7zhqqx2z4gf2yavc5"; + symbola = { version = "9.17"; file = "Symbola.zip"; sha256 = "13z18lxx0py54nns61ihgxacpf1lg9s7g2sbpbnxpllqw7j73iq2"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; - aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "10mr54ja9b169fhqfkrw510jybghrpjx7a8a7m38k5v39ck8wz6v"; + aegyptus = { version = "6.17"; file = "Aegyptus.zip"; sha256 = "19rkf89msqb076qjdfa75pqrx35c3slj64vxw08zqdvyavq7jc79"; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; - akkadian = { version = "7.13"; file = "Akkadian.zip"; sha256 = "1jd2fb6jnwpdwgkidsi2pnw0nk2cpya8k85299w591sqslfkxyij"; + akkadian = { version = "7.17"; file = "AkkadianAssyrian.zip"; sha256 = "1xw2flrwb5r89sk7jd195v3svsb21brf1li2i3pdjcfqxfp5m0g7"; description = "Sumero-Akkadian Cuneiform"; }; - anatolian = { version = "5.02"; file = "Anatolian.zip"; sha256 = "0arm58sijzk0bqmfb70k1sjvq79wgw16hx3j2g4l8qz4sv05bp8l"; + anatolian = { version = "5.17"; file = "Anatolian.zip"; sha256 = "0dqcyjakc4fy076pjplm6psl8drpwxiwyq97xrf6a3qa098gc0qc"; description = "Anatolian Hieroglyphs"; }; - maya = { version = "4.14"; file = "Maya.zip"; sha256 = "0l97racgncrhb96mfbsx8dr5n4j289iy0nnwhxf9b21ns58a9x4f"; + maya = { version = "4.17"; file = "Maya.zip"; sha256 = "17s5c23wpqrcq5h6pgssbmzxiv4jvhdh2ssr99j9q6j32a51h9gh"; description = "Maya Hieroglyphs"; }; - unidings = { version = "8.00"; file = "Unidings.zip"; sha256 = "1i0z3mhgj4680188lqpmk7rx3yiz4l7yybb4wq6zk35j75l28irm"; + unidings = { version = "9.17"; file = "Unidings.zip"; sha256 = "0nzw8mrhk0hbjnl2cgi31b00vmi785win86kiz9d2yzdfz1is6sk"; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; - musica = { version = "3.12"; file = "Musica.zip"; sha256 = "079vyb0mpxvlcf81d5pqh9dijkcvidfbcyvpbgjpmgzzrrj0q210"; + musica = { version = "3.17"; file = "Musica.zip"; sha256 = "0mnv61dxzs2npvxgs5l9q81q19xzzi1sn53x5qwpiirkmi6bg5y6"; description = "Musical Notation"; }; - analecta = { version = "5.00"; file = "Analecta.zip"; sha256 = "0rphylnz42fqm1zpx5jx60k294kax3sid8r2hx3cbxfdf8fnpb1f"; + analecta = { version = "5.17"; file = "Analecta.zip"; sha256 = "13npnfscd9mz6vf89qxxbj383njf53a1smqjh0c1w2lvijgak3aj"; description = "Coptic, Gothic, Deseret"; }; - # the following are also available from http://users.teilar.gr/~g1951d/ - # but not yet packaged: - # - Aroania - # - Anaktoria - # - Alexander - # - Avdira - # - Asea - # - Aegean + textfonts = { version = "7.17"; file = "TextfontsFonts.zip"; sha256 = "1ggflqnslp81v8pzmzx6iwi2sa38l9bpivjjci7nvx3y5xynm6wl"; + description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; + aegan = { version = "9.17"; file = "AegeanFonts.zip"; sha256 = "0dm2ck3p11bc9izrh7xz3blqfqg1mgsvy4jsgmz9rcs4m74xrhsf"; + description = "Aegean"; }; + abydos = { version = "1.23"; file = "AbydosFont.zip"; sha256 = "04r7ysnjjq0nrr3m8lbz8ssyx6xaikqybjqxzl3ziywl9h6nxdj8"; + description = "AbydosFont"; }; }; - mkpkg = name_: {version, file, sha256, description}: - stdenv.mkDerivation rec { - name = "${name_}-${version}"; - src = fetchurl { - url = "http://users.teilar.gr/~g1951d/${file}"; - inherit sha256; - }; + mkpkg = name_: {version, file, sha256, description}: fetchzip rec { + name = "${name_}-${version}"; + url = "http://users.teilar.gr/~g1951d/${file}"; + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.docx \*.pdf \*.xlsx -d "$out/share/doc/${name}" || true # unpack docs if any + rmdir "$out/share/doc/${name}" $out/share/doc || true # remove dirs if empty + ''; + inherit sha256; - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype/ - - mkdir -p "$out/doc/${name}" - cp -v *.docx *.pdf *.xlsx "$out/doc/${name}/" - ''; - - meta = { - inherit description; - # In lieu of a license: - # Fonts in this site are offered free for any use; - # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. - license = stdenv.lib.licenses.free; - homepage = http://users.teilar.gr/~g1951d/; - platforms = stdenv.lib.platforms.unix; - }; + meta = { + inherit description; + # In lieu of a license: + # Fonts in this site are offered free for any use; + # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. + license = stdenv.lib.licenses.free; + homepage = http://users.teilar.gr/~g1951d/; + platforms = stdenv.lib.platforms.unix; }; - + }; in -lib.mapAttrs mkpkg fonts + lib.mapAttrs mkpkg fonts diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index 0c9dfa40982..a0af38cfd24 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "10hfm2cpxlx1ng7r2mbvykjhmy131qlgzpdzj7ibg9kr293bcjc0"; + meta = with stdenv.lib; { homepage = https://blog.golang.org/go-fonts; description = "The Go font family"; diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index a5f43d4169b..492d89a674c 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -1,24 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +let baseName = "gyre-fonts"; version = "2.005"; +in fetchzip { name="${baseName}-${version}"; - - src = fetchurl { - url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip"; - sha256 = "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"; - }; - buildInputs = [unzip]; + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.otf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype ''; + sha256 = "17amdpahs6kn7hk3dqxpff1s095cg1caxzij3mxjbbxp8zy0l111"; + meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; longDescription = '' diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 689e1e054dc..f997f10db1d 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,26 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "hack-font-${version}"; +let version = "2.020"; +in fetchzip rec { + name = "hack-font-${version}"; - src = let - version_ = with stdenv.lib; - concatStringsSep "_" (splitString "." version); - in fetchurl { - sha256 = "16kkmc3psckw1b7k07ccn1gi5ymhlg9djh43nqjzg065g6p6d184"; - url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; - }; + url = let + version_ = with stdenv.lib; concatStringsSep "_" (splitString "." version); + in "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip"; - sourceRoot = "."; - - nativeBuildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/hack - cp *.ttf $out/share/fonts/hack + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack ''; + sha256 = "0cpsglb9vnhmpsn496aqisfvmq3yxvjnj7c361dspy0fn6z8x60c"; + meta = with stdenv.lib; { description = "A typeface designed for source code"; longDescription = '' diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/data/fonts/hanazono/default.nix index 01be8afd7aa..27459b2d1f3 100644 --- a/pkgs/data/fonts/hanazono/default.nix +++ b/pkgs/data/fonts/hanazono/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "hanazono-${version}"; +let version = "20141012"; +in fetchzip { + name = "hanazono-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-20141012.zip"; - sha256 = "020jhqnzm9jvkmfvvyk1my26ncwxbnb9yc8v7am252jwrifji9q6"; - }; + url = "mirror://sourceforgejp/hanazono-font/62072/hanazono-${version}.zip"; - buildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/hanazono - cp *.ttf $out/share/fonts/hanazono - mkdir -p $out/share/doc/hanazono - cp *.txt $out/share/doc/hanazono + postFetch = '' + mkdir -p $out/share/fonts/hanazono $out/share/doc/hanazono + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hanazono + unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono ''; + sha256 = "0z0fgrjzp0hqqnhfisivciqpxd2br2w2q9mvxkglj44np2q889w2"; + meta = with stdenv.lib; { description = "Free kanji font containing 96,327 characters"; homepage = http://fonts.jp/hanazono/; diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 51d2b8b9c11..96af2e573a2 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -1,25 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "hasklig-${version}"; +let version = "1.1"; +in fetchzip { + name = "hasklig-${version}"; - src = fetchurl { - url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; - sha256 = "1hwmdbygallw2kjk0v3a3dl7w6b21wii3acrl0w3ibn05g1cxv4q"; - }; + url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; - buildInputs = [ unzip ]; - - sourceRoot = "."; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + unzip $downloadedFile mkdir -p $out/share/fonts/opentype cp *.otf $out/share/fonts/opentype ''; + sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; + meta = with stdenv.lib; { homepage = https://github.com/i-tu/Hasklig; description = "A font with ligatures for Haskell code based off Source Code Pro"; diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 13e98462b21..a614017b809 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "helvetica-neue-lt-std-${version}"; +let version = "2013.06.07"; # date of most recent file in distribution +in fetchzip rec { + name = "helvetica-neue-lt-std-${version}"; - src = fetchurl { - url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; - sha256 = "0nrjdj2a11dr6d3aihvjxzrkdi0wq6f2bvaiimi5iwmpyz80n0h6"; - }; + url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip"; - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - sourceRoot = "Helvetica Neue LT Std"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile Helvetica\ Neue\ LT\ Std/\*.otf -d $out/share/fonts/opentype ''; + sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9"; + meta = { homepage = http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html; description = "Helvetica Neue LT Std font"; diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index caa67256a1f..13aeae80312 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,20 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "inconsolata-${version}"; +let version = "1.010"; +in fetchzip { + name = "inconsolata-${version}"; - src = fetchurl { - url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; - sha256 = "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m"; - }; + url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; - phases = [ "installPhase" ]; + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/opentype/inconsolata.otf"; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v $src $out/share/fonts/opentype/inconsolata.otf - ''; + sha256 = "1yyf7agabfv0ia57c7in0r33x7c8ay445zf7c3dfc83j6w85g3i7"; meta = with stdenv.lib; { homepage = http://www.levien.com/type/myfonts/inconsolata.html; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 8cfda1a5e9c..5217b175ed2 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "input-fonts-${version}"; - version = "2016-10-06"; # date of the download and checksum + version = "2017-08-10"; # date of the download and checksum src = requireFile { name = "Input-Font.zip"; url = "http://input.fontbureau.com/download/"; - sha256 = "06hrsrb5a6hzrgkkhk0gdj92rhgr433vgn4j5g3pd8f1ijlfqn4y"; + sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq"; }; nativeBuildInputs = [ unzip ]; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { cp -a *.txt "$out"/share/doc/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd"; + meta = with stdenv.lib; { description = "Fonts for Code, from Font Bureau"; longDescrition = '' diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index a8b6c8853f3..8b1ddd0c753 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,20 +1,16 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "junicode-0.7.8"; - src = fetchurl { - url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; - sha256 = "1lgkhj52s351ya7lp9z3xba7kaivgdvg80njhpj1rpc3jcmc69vl"; - }; + url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; - buildInputs = [ unzip ]; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/junicode-ttf + ''; - installPhase = - '' - mkdir -p $out/share/fonts/junicode-ttf - cp fonts/*.ttf $out/share/fonts/junicode-ttf - ''; + sha256 = "0q4si9pnbif36154sv49kzc7ygivgflv81nzmblpz3b2p77g9956"; meta = { homepage = http://junicode.sourceforge.net/; diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index 7b990327286..bfc76b69b65 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,21 +1,17 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { +fetchzip rec { name = "kawkab-mono-20151015"; - src = fetchurl { - url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; - sha256 = "16pv9s4q7199aacbzfi2d10rcrq77vyfvzcy42g80nhfrkz1cb0m"; - }; + url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; - buildInputs = [ unzip ]; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; + sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd"; + meta = { description = "An arab fixed-width font"; homepage = http://makkuk.com/kawkab-mono/; diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/data/fonts/kochi-substitute-naga10/default.nix index ea2c15752d7..c24e6898129 100644 --- a/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: let version = "20030809"; in -stdenv.mkDerivation { +fetchzip { name = "kochi-substitute-naga10-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; - sha256 = "f4d69b24538833bf7e2c4de5e01713b3f1440960a6cc2a5993cb3c68cd23148c"; - }; + url = "mirror://sourceforgejp/efont/5411/kochi-substitute-${version}.tar.bz2"; - sourceRoot = "kochi-substitute-${version}"; - - installPhase = '' + postFetch = '' + tar -xjf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ./kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf cp ./kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf ''; + sha256 = "1bjb5cr3wf3d5y7xj1ly2mkv4ndwvg615rb1ql6lsqc2icjxk7j9"; + meta = { description = "Japanese font, non-free replacement for MS Gothic and MS Mincho"; longDescription = '' diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index 6337387b376..f49d20e3ba7 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation { cp ./share/fonts/truetype/kochi/kochi-mincho-subst.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "10hcrf51npc1w2jsz5aiw07dgw96vs4wmsz4ai9zyaswipvf8ddy"; + meta = { description = "Japanese font, a free replacement for MS Gothic and MS Mincho"; longDescription = '' diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index 8d1111090aa..91d85ce9a0d 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lato-2.0"; - src = fetchurl { - url = http://www.latofonts.com/download/Lato2OFL.zip; - sha256 = "1f5540g0ja1nx3ddd3ywn77xc81ssrxpq8n3gyb9sabyq2b4xda2"; - }; + url = http://www.latofonts.com/download/Lato2OFL.zip; - sourceRoot = "Lato2OFL"; - - buildInputs = [ unzip ]; - - installPhase = '' - mkdir -p $out/share/fonts/lato - cp *.ttf $out/share/fonts/lato + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato ''; + sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; + meta = with stdenv.lib; { homepage = http://www.latofonts.com/; diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 8f6d5ec8ad6..82ceebae327 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { cp */share/fonts/opentype/*.otf $out/share/fonts/opentype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1gy959qhhdwm1phbrkab9isi0dmxcy0yizzncb0k49w88mc13vd0"; + meta = { description = "Font Collection by The League of Moveable Type"; diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix index 64779b5d388..18f236068a2 100644 --- a/pkgs/data/fonts/libre-baskerville/default.nix +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-baskerville-1.000"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Baskerville"; - rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; - sha256 = "0i9ra6ip81zzjxl71p8zwa6ymlmkf4yi5ny22vlwx9a53kbf4ifl"; - }; + url = https://github.com/impallari/Libre-Baskerville/archive/2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f.zip; - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -n -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "0arlq89b3vmpw3n4wbllsdvqblhz6p09dm19z1cndicmcgk26w2a"; + meta = with stdenv.lib; { description = "A webfont family optimized for body text"; longDescription = '' diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix index 691d5556e8f..96f366973f0 100644 --- a/pkgs/data/fonts/libre-bodoni/default.nix +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-bodoni-2.000"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Bodoni"; - rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; - sha256 = "1ncfkvmcxh2lphfra43h8482qglpd965v96agvz092697xwrbyn9"; - }; + url = https://github.com/impallari/Libre-Bodoni/archive/995a40e8d6b95411d660cbc5bb3f726ffd080c7d.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/v2000 - initial glyphs migration/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*/v2000\ -\ initial\ glyphs\ migration/OTF/\*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "0pnb1xydpvcl9mkz095f566kz7yj061wbf40rwrbwmk706f6bsiw"; + meta = with stdenv.lib; { description = "Bodoni fonts adapted for today's web requirements"; longDescription = '' diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index 5037cb81f39..ec932ab978c 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "05aajwny99yqzn1nnq1blx6h7rl54x056y12hyawfbigkzxhscns"; + meta = with stdenv.lib; { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; homepage = http://www.impallari.com/librecaslon; diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix index 473102d77ef..9ca37e35640 100644 --- a/pkgs/data/fonts/libre-franklin/default.nix +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "libre-franklin-1.014"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Libre-Franklin"; - rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; - sha256 = "0df41cqhw5dz3g641n4nd2jlqjf5m4fkv067afk3759m4hg4l78r"; - }; + url = https://github.com/impallari/Libre-Franklin/archive/006293f34c47bd752fdcf91807510bc3f91a0bd3.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v README.md FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" ''; + sha256 = "1rkjp8x62cn4alw3lp7m45q34bih81j2hg15kg5c1nciyqq1qz0z"; + meta = with stdenv.lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; homepage = https://github.com/impallari/Libre-Franklin; diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index e694ba4db75..6876000d6e4 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lmodern-2.004.4"; - - src = fetchurl { - url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; - sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw"; - }; - installPhase = '' + url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz; + + postFetch = '' + tar xzvf $downloadedFile + mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r ./* $out/texmf-dist/ - cp -r fonts/{opentype,type1} $out/share/fonts/ + cp -r lmodern-2.004.4/* $out/texmf-dist/ + cp -r lmodern-2.004.4/fonts/{opentype,type1} $out/share/fonts/ - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + sha256 = "13n7ls8ss4sffd6c1iw2wb5hbq642i0fmivm76mbqwf652l002i5"; + meta = { description = "Latin Modern font"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix index 6e136c39eb0..c6e0788eed3 100644 --- a/pkgs/data/fonts/lmodern/lmmath.nix +++ b/pkgs/data/fonts/lmodern/lmmath.nix @@ -1,28 +1,24 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "lmmath-0.903"; - - src = fetchurl { - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - sha256 = "ee96cb14f5c746d6c6b9ecfbdf97dafc2f535be3dd277e15e8ea6fb594995d64"; - name = "lmmath-0.903.zip"; - }; - buildInputs = [unzip]; + url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; - sourceRoot = "."; + postFetch = '' + unzip $downloadedFile - installPhase = '' mkdir -p $out/texmf-dist/fonts/opentype mkdir -p $out/share/fonts/opentype cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln"; + meta = { description = "Latin Modern font"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index 84752fe6a1d..850fd1a1f94 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -65,6 +65,10 @@ in cp -v ${regular.file} $out/share/fonts/opentype/${regular.name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/lobstertwo; description = "Script font with many ligatures"; diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix index 12c4f67666d..c847b4cdd27 100644 --- a/pkgs/data/fonts/lohit-fonts/default.nix +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -1,58 +1,59 @@ -{ stdenv, fetchurl, lib }: +{ stdenv, fetchzip, lib }: let fonts = { - assamese = { label = "Assamese"; version = "2.91.3" ; sha256 = "0kbdvi8f7vbvsain9zmnj9h43a6bmdkhk5c2wzg15100w7wf6lpq"; }; - bengali = { label = "Bengali"; version = "2.91.3" ; sha256 = "1wdd2dkqaflf6nm5yc7llkfxin6g0zb2sbcd5g2xbrl0gwwcmkij"; }; - devanagari = { label = "Devanagari script"; version = "2.95.2" ; sha256 = "1ss0j0pcfrg1vsypnm0042y4bn7b84mi6lbfsvr6rs89lb5swvn2"; }; - gujarati = { label = "Gujarati"; version = "2.92.2-and-4.2.2" ; sha256 = "1i27yjhn3x31a89x1hjs6rskdwp2kh0hibq1xiz3rgqil2m0jar6"; }; - gurmukhi = { label = "Gurmukhi script"; version = "2.91.0" ; sha256 = "0z8a30mnyhlfvqhnggfk0369hqg779ihqyhcmpxj0sf9dmb1i0mj"; }; # renamed from Punjabi - kannada = { label = "Kannada"; version = "2.5.3" ; sha256 = "1x9fb5z1bwmfi0y1fdnzizzjxhbxp272wxznx36063kjf25bb9pi"; }; - malayalam = { label = "Malayalam"; version = "2.92.0" ; sha256 = "1syv1irxh5xl0z0d5kwankhlmi7s2dg4wpp58nq0mkd3rhm5q8qw"; }; - marathi = { label = "Marathi"; version = "2.94.0" ; sha256 = "0y9sca6gbfbafv52v0n2r1xfs8rg6zmqs4vp9sjfc1c6yqhzagl4"; }; - nepali = { label = "Nepali"; version = "2.94.0" ; sha256 = "0c56141rpxc30581i3gisg8kfaadxhqjhgshni6g7a7rn6l4dx17"; }; - odia = { label = "Odia"; version = "2.91.0" ; sha256 = "15iz9kdf9k5m8wcn2iqlqjm758ac3hvnk93va6kac06frxnhw9lp"; }; # renamed from Oriya - tamil-classical = { label = "Classical Tamil"; version = "2.5.3" ; sha256 = "0ci4gk8qhhysjza69nncgmqmal8s4n8829icamvlzbmjdd4s2pij"; }; - tamil = { label = "Tamil"; version = "2.91.1" ; sha256 = "1ir6kjl48apwk41xbpj0x458k108s7i61yzpkfhqcy1fkcr7cngj"; }; - telugu = { label = "Telugu"; version = "2.5.4" ; sha256 = "06gdba7690y20l7nsi8fnnimim5hlq7hik0mpk2fzw4w39hjybk9"; }; + assamese = { label = "Assamese"; version = "2.91.5"; sha256 = "06cw416kgw0m6883n5ixmpniinsd747rdmacf06z83w1hqwj2js6"; }; + bengali = { label = "Bengali"; version = "2.91.5"; sha256 = "1j7gfmkzzyk9mivy09a9yfqxpidw52hw48dyh4qkci304mspcbvr"; }; + devanagari = { label = "Devanagari script"; version = "2.95.4"; sha256 = "1c17xirzx5rf7xpmkrm94jf9xrzckyagwnqn3pyag28lyj8x67m5"; }; + gujarati = { label = "Gujarati"; version = "2.92.4"; sha256 = "0xdgmkikz532zxj239wr73l24qnzxhra88f52146x7fsb7gpvfb1"; }; + gurmukhi = { label = "Gurmukhi script"; version = "2.91.2"; sha256 = "1xk1qvc0xwcmjcavj9zmy4bbphffdlv7sldmqlk30ch5fy5r0ypb"; }; # renamed from Punjabi + kannada = { label = "Kannada"; version = "2.5.4" ; sha256 = "0sax56xg98p2nf0nsvba42hhz946cs7q0gidiz9zfpb6pbgwxdgg"; }; + malayalam = { label = "Malayalam"; version = "2.92.2"; sha256 = "18sca59fj9zvqhagbix35i4ld2n4mwv57q04pijl5gvpyfb1abs8"; }; + marathi = { label = "Marathi"; version = "2.94.2"; sha256 = "0cjjxxlhqmdmhr35s4ak0ma89456daik5rqrn6pdzj39098lmci7"; }; + nepali = { label = "Nepali"; version = "2.94.2"; sha256 = "1p7lif136xakfqkbv6p1lb56rs391b25vn4bxrjdfvsk0r0h0ry3"; }; + odia = { label = "Odia"; version = "2.91.2"; sha256 = "0z5rc4f9vfrfm8h2flzf5yx44x50jqdmmzifkmjwczib3hpg2ila"; }; # renamed from Oriya + tamil-classical = { label = "Classical Tamil"; version = "2.5.4" ; sha256 = "0svmj3dhk0195mhdwjhi3qgwa83223irb32fp12782sj9njdvyi2"; }; + tamil = { label = "Tamil"; version = "2.91.3"; sha256 = "0qyw9p8alyvjryyw8a25q3gfyrhby49mjb0ydgggf5ckd07kblcm"; }; + telugu = { label = "Telugu"; version = "2.5.5" ; sha256 = "07p41686ypmclj9d3njp01lvrgssqxa4s5hsbrqfjrnwd3rjspzr"; }; }; gplfonts = { # GPL fonts removed from later releases - kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0ax8xzv4pz17jnsjdklawncsm2qn7176wbxykswygpzdd5lr0gg9"; }; - konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "03zc27z26a60aaggrqx4d6l0jgggciq8p83v6vgg0k6l3apvcp45"; }; - maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "0aqwnhq1namvvb77f2vssahixqf4xay7ja4q8qc312wxkajdqh4a"; }; - sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "00imfbn01yc2g5zdyydks9w3ndkawr66l9qk2idlvw3yz3sw2kf1"; }; + kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0c6whklad9bscymrlcbxj4fdvh4cdf40vb61ykbp6mapg6dqxwhn"; }; + konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "0pcb5089dabac1k6ymqnbnlyk7svy2wnb5glvhsd8glycjhrcp70"; }; + maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "1yfwv7pcj7k4jryz0s6mb56bq7fs15g56y7pi5yd89q1f8idk6bc"; }; + sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "1iywzyy185bvfsfi5pp11c8bzrp40kni2cpwcmxqwha7c9v8brlc"; }; }; - mkpkg = license: name: {label, version, sha256}: - stdenv.mkDerivation { - name = "lohit-${name}-${version}"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/o/lohit/lohit-${name}-ttf-${version}.tar.gz"; - inherit sha256; - }; + mkpkg = license: name: {label, version, sha256}: fetchzip { + name = "lohit-${name}-${version}"; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype/ + url = "https://releases.pagure.org/lohit/lohit-${name}-ttf-${version}.tar.gz"; - mkdir -p $out/etc/fonts/conf.d - cp -v *.conf $out/etc/fonts/conf.d + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 - mkdir -p "$out/share/doc/lohit-${name}" - cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/" - ''; + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype/ - meta = { - inherit license; - description = "Free and open source fonts for Indian languages (" + label + ")"; - homepage = https://fedorahosted.org/lohit/; - maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; - # Set a non-zero priority to allow easy overriding of the - # fontconfig configuration files. - priority = 5; - platforms = stdenv.lib.platforms.unix; - }; + mkdir -p $out/etc/fonts/conf.d + cp -v *.conf $out/etc/fonts/conf.d + + mkdir -p "$out/share/doc/lohit-${name}" + cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/" + ''; + + inherit sha256; + + meta = { + inherit license; + description = "Free and open source fonts for Indian languages (" + label + ")"; + homepage = https://pagure.io/lohit; + maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; + # Set a non-zero priority to allow easy overriding of the + # fontconfig configuration files. + priority = 5; + platforms = stdenv.lib.platforms.unix; }; + }; in # Technically, GPLv2 with usage exceptions diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index fe123f6622d..8a11a98ebd2 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { cp *.ttf $out/share/fonts/truetype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1cppf8sk6r5wjnnas9n6iyag6pj9jvaic66lvwpqg3742s5akx6x"; + meta = { description = "A customized version of Apple’s Menlo-Regular font"; homepage = https://github.com/andreberg/Meslo-Font/; diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index d93c0fb96d4..cc481a136ba 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mononoki-${version}"; +let version = "1.2"; +in fetchzip { + name = "mononoki-${version}"; - src = fetchurl { - url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; - sha256 = "0n66bnn2i776fbky14qjijwsbrja9yzc1xfsmvz99znvcdvflafg"; - }; + url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; - buildInputs = [ unzip ]; - phases = [ "unpackPhase" ]; - - unpackPhase = '' + postFetch = '' mkdir -p $out/share/fonts/mononoki - unzip $src -d $out/share/fonts/mononoki + unzip -j $downloadedFile -d $out/share/fonts/mononoki ''; + sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff"; + meta = with stdenv.lib; { homepage = https://github.com/madmalik/mononoki; description = "A font for programming and code review"; diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index 70fd2060ff1..7d7be9a41a6 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -2,22 +2,23 @@ # # https://aur.archlinux.org/packages/ttf-montserrat/ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "montserrat-${version}"; +let version = "1.0"; +in fetchzip { + name = "montserrat-${version}"; - src = fetchurl { - url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; - sha256 = "12yn651kxi5fcbpdxhapg5fpri291mgcfc1kx7ymg53nrl11nj3x"; - }; + url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; - installPhase = '' + postFetch = '' + tar -xzf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/montserrat cp *.ttf $out/share/fonts/montserrat ''; + sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w"; + meta = with stdenv.lib; { description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; homepage = "http://www.fontspace.com/julieta-ulanovsky/montserrat"; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 49d857ec575..5729561c580 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,23 +1,16 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "MPH-2B-Damase"; - src = fetchurl { - url = http://www.wazu.jp/downloads/damase_v.2.zip; - sha256 = "0y7rakbysjjrzcc5y100hkn64j7js434x20pyi6rllnw2w2n1y1h"; - }; + url = http://www.wazu.jp/downloads/damase_v.2.zip; - buildInputs = [unzip]; - - unpackPhase = '' - unzip $src; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; + sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql"; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 839d61206c2..b70166b7ec1 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mplus-${version}"; +let version = "062"; +in fetchzip rec { + name = "mplus-${version}"; - src = fetchurl { - url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; - sha256 = "1f44vmnma5njhfiz351gwblxmdh9njv486864zrxqaa1h5pvdhha"; - }; + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' + tar -xJf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype ''; + sha256 = "0zm1snq5r584rz90yv5lndsqgchdaxq2185vrk7849ch4k5vd23z"; + meta = with stdenv.lib; { description = "M+ Outline Fonts"; homepage = http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html; diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index d75dcda6421..054c2ca91f6 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { # cp $riqa/*.ttf $out/share/fonts/truetype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1wa0j65iz20ij37dazd1rjg8x625m6q1y8g5h7ia48pbc88sr01q"; + meta = { description = "OpenType Urdu font from the Center for Research in Urdu Language Processing"; longDescription = '' diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 409dcce024b..4b725cbf5f8 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { ./install.sh ${withFont} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0bxna3llj6kf1rndvkw8w81blmgwy9l8kricynlf0l3mdd6li1f4"; + meta = with stdenv.lib; { description = '' Nerd Fonts is a project that attempts to patch as many developer targeted diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index 9bd38409955..35d69aa7f07 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = "norwester"; +let version = "1.2"; + pname = "norwester"; +in fetchzip rec { name = "${pname}-${version}"; - src = fetchurl { - url = "http://jamiewilson.io/norwester/assets/norwester.zip"; - sha256 = "0syg8ss7mpli4cbxvh3ld7qrlbhb2dfv3wchm765iw6ndc05g92d"; - }; + url = "http://jamiewilson.io/norwester/assets/norwester.zip"; - phases = [ "installPhase" ]; - - buildInputs = [ unzip ]; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - unzip -D -j $src ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ + unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ ''; + sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; + meta = with stdenv.lib; { homepage = http://jamiewilson.io/norwester; description = "A condensed geometric sans serif by Jamie Wilson"; diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index 411af37932a..4e55b5098c8 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchurl, p7zip }: +{ stdenv, fetchzip, p7zip }: -stdenv.mkDerivation rec { - name = "oldsindhi-${version}"; +let version = "0.1"; +in fetchzip rec { + name = "oldsindhi-${version}"; - src = fetchurl { - url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; - sha256 = "1sbmxyxi81k88hkfw7gnnpgd5vy2vyj5y5428cd6nz4zlaclgq8z"; - }; + url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; - buildInputs = [ p7zip ]; + postFetch = '' + ${p7zip}/bin/7z x $downloadedFile - unpackCmd = "7z x $curSrc"; - - installPhase = '' mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/${name} - cp -v *.ttf $out/share/fonts/truetype/ - cp -v README *.txt $out/share/doc/${name} + cp -v OldSindhi/*.ttf $out/share/fonts/truetype/ + cp -v OldSindhi/README OldSindhi/*.txt $out/share/doc/${name} ''; + sha256 = "1na3lxyz008fji5ln3fqzyr562k6kch1y824byhfs4y0rwwz3f3q"; + meta = with stdenv.lib; { homepage = https://github.com/MihailJP/oldsindhi; description = "Free Sindhi Khudabadi font"; diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index 125a4b636a9..95f8f3be7d6 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { cp -v FONTLOG.txt $out/share/doc/${name} ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; + meta = with stdenv.lib; { homepage = https://github.com/akryukov/oldstand; description = "An attempt to revive a specific type of Modern style of serif typefaces"; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 5d9bb584360..1320ad8438f 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,25 +1,20 @@ -{stdenv, fetchgit}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "open-dyslexic-${version}"; +let version = "2014-11-11"; +in fetchzip { + name = "open-dyslexic-${version}"; - src = fetchgit { - url = "https://github.com/antijingoist/open-dyslexic.git"; - rev = "f4b5ba89018b44d633608907e15f93fb3fabbabc"; - sha256 = "04pa7c2cary6pqxsmxqrg7wi19szg7xh8panmvqvmc7jas0mzg6q"; - }; + url = https://github.com/antijingoist/open-dyslexic/archive/f4b5ba89018b44d633608907e15f93fb3fabbabc.zip; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v 'otf/'*.otf $out/share/fonts/opentype - - mkdir -p $out/share/doc/open-dyslexic - cp -v README.md $out/share/doc/open-dyslexic + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic ''; + sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2"; + meta = with stdenv.lib; { homepage = http://opendyslexic.org/; description = "Font created to increase readability for readers with dyslexia"; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index fa34d9586c5..e0ef1ecda81 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,26 +1,22 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "orbitron-${version}"; +let version = "20110526"; +in fetchzip { + name = "orbitron-${version}"; - src = fetchFromGitHub { - owner = "theleagueof"; - repo = "orbitron"; - rev = "13e6a52"; - sha256 = "1c6jb7ayr07j1pbnzf3jxng9x9bbqp3zydf8mqdw9ifln1b4ycyf"; - }; + url = https://github.com/theleagueof/orbitron/archive/13e6a52.zip; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' otfdir=$out/share/fonts/opentype/orbitron ttfdir=$out/share/fonts/ttf/orbitron mkdir -p $otfdir $ttfdir - cp -v Orbitron*.otf $otfdir - cp -v Orbitron*.ttf $ttfdir + unzip -j $downloadedFile \*/Orbitron\*.otf -d $otfdir + unzip -j $downloadedFile \*/Orbitron\*.ttf -d $ttfdir ''; + sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; + meta = with stdenv.lib; { homepage = https://www.theleagueofmoveabletype.com/orbitron; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index e24d61d5ba1..8bb4e82747a 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,27 +1,19 @@ -{ stdenv, fetchFromGitHub, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "overpass-${version}"; +let version = "3.0.2"; +in fetchzip rec { + name = "overpass-${version}"; - src = fetchFromGitHub { - owner = "RedHatBrand"; - repo = "Overpass"; - rev = version; - sha256 = "1bgmnhdfmp4rycyadcnzw62vkvn63nn29pq9vbjf4c9picvl8ah6"; - }; + url = "https://github.com/RedHatBrand/Overpass/archive/${version}.zip"; - nativeBuildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/doc/${name} - mkdir -p $out/share/fonts/opentype - cp -v "desktop-fonts/"*"/"*.otf $out/share/fonts/opentype - cp -v LICENSE.md README.md $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/fonts/opentype ; unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name} ''; + sha256 = "05zv3zcfc9a707sn3hhf46b126k19d9byzvi5ixp5y2548vjvl6s"; + meta = with stdenv.lib; { homepage = http://overpassfont.org/; description = "Font heavily inspired by Highway Gothic"; diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix index 1054986288a..109b3c3a0b3 100644 --- a/pkgs/data/fonts/oxygenfonts/default.nix +++ b/pkgs/data/fonts/oxygenfonts/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "oxygenfonts-20160824"; - src = fetchFromGitHub { - owner = "vernnobile"; - repo = "oxygenFont"; - rev = "62db0ebe3488c936406685485071a54e3d18473b"; - sha256 = "134kx3d0g3zdkw8kl8p6j37fzw3bl163jv2dx4dk1451f3ramcnh"; - }; + url = https://github.com/vernnobile/oxygenFont/archive/62db0ebe3488c936406685485071a54e3d18473b.zip; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype/ - cp OxygenSans-version-0.4/*/*.ttf $out/share/fonts/truetype/ - cp Oxygen-Monospace/*.ttf $out/share/fonts/truetype/ + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile '*/Oxygen-Sans.ttf' '*/Oxygen-Sans-Bold.ttf' '*/OxygenMono-Regular.ttf' -d $out/share/fonts/truetype ''; + sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf"; + meta = with stdenv.lib; { description = "Desktop/gui font for integrated use with the KDE desktop"; longDescription = '' diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 1a9cf29c3e0..6124d0c79b6 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-mono"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTMono.zip"; - sha256 = "1wqaai7d6xh552vvr5svch07kjn1q89ab5jimi2z0sbd0rbi86vl"; - }; + url = "http://www.paratype.ru/uni/public/PTMono.zip"; - buildInputs = [unzip]; - - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; + meta = with stdenv.lib; { homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 89d9e9381e7..499871a4228 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-sans"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTSans.zip"; - sha256 = "1j9gkbqyhxx8pih5agr9nl8vbpsfr9vdqmhx73ji3isahqm3bhv5"; - }; + url = "http://www.paratype.ru/uni/public/PTSans.zip"; - buildInputs = [unzip]; - - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; + meta = with stdenv.lib; { homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index 323e10c8b7b..409aaf526f8 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "paratype-pt-serif"; - src = fetchurl rec { - url = "http://www.paratype.ru/uni/public/PTSerif.zip"; - sha256 = "0x3l58c1rvwmh83bmmgqwwbw9av1mvvq68sw2hdkyyihjvamyvvs"; - }; + url = "http://www.paratype.ru/uni/public/PTSerif.zip"; - buildInputs = [unzip]; - - phases = "unpackPhase installPhase"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - mkdir -p $out/share/doc/paratype - cp *.ttf $out/share/fonts/truetype - cp *.txt $out/share/doc/paratype + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype ''; + sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; + meta = with stdenv.lib; { homepage = http://www.paratype.ru/public/; description = "An open Paratype font"; - license = "Open Paratype license"; + license = "Open Paratype license"; # no commercial distribution of the font on its own # must rename on modification # http://www.paratype.ru/public/pt_openlicense.asp diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 7650c13961e..b57cf22569d 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -1,21 +1,20 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "pecita-${version}"; +let version = "5.4"; +in fetchzip rec { + name = "pecita-${version}"; - src = fetchurl { - url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - sha256 = "1cqzj558ldzzsbfbvlwp5fjh2gxa03l16dki0n8z5lmrdq8hrkws"; - }; + url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' + postFetch = '' + tar xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf ''; + sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; + meta = with stdenv.lib; { homepage = http://pecita.eu/police-en.php; description = "Handwritten font with connected glyphs"; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 7298dbb18ce..b27290707b6 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { cp ${italic} $out/share/fonts/opentype/Poly-Italic.otf ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "11d7ldryfxi0wzfrg1bhw23a668a44vdb8gggxryvahmp5ahmq2h"; + meta = { description = "Medium contrast serif font"; longDescription = '' diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 3140be6d035..9f42324e6d6 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,34 +1,29 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "powerline-fonts-2017-05-25"; - src = fetchFromGitHub { - owner = "powerline"; - repo = "fonts"; - rev = "fe396ef6f6b9b315f30af7d7229ff21f67a66e12"; - sha256 = "1l72kf0zqdp52hbnphky5cl0a1p9fghldvq7ppbnnrhmcwvavprs"; - }; + url = https://github.com/powerline/fonts/archive/fe396ef6f6b9b315f30af7d7229ff21f67a66e12.zip; - dontBuild = true; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - cp -v */*.otf $out/share/fonts/opentype + unzip -j $downloadedFile '*.otf' -d $out/share/fonts/opentype mkdir -p $out/share/fonts/truetype - cp -v */*.ttf $out/share/fonts/truetype + unzip -j $downloadedFile '*.ttf' -d $out/share/fonts/truetype mkdir -p $out/share/fonts/bdf - cp -v */BDF/*.bdf $out/share/fonts/bdf + unzip -j $downloadedFile '*/BDF/*.bdf' -d $out/share/fonts/bdf mkdir -p $out/share/fonts/pcf - cp -v */PCF/*.pcf.gz $out/share/fonts/pcf + unzip -j $downloadedFile '*/PCF/*.pcf.gz' -d $out/share/fonts/pcf mkdir -p $out/share/fonts/psf - cp -v */PSF/*.psf.gz $out/share/fonts/psf + unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf ''; + sha256 = "07yjbwri7nnnnynps86sz0dlivwqw7gfw045v63q969nab9dw388"; + meta = with stdenv.lib; { homepage = https://github.com/powerline/fonts; description = "Patched fonts for Powerline users"; diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index 98227605ac8..0c6eede969f 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +fetchzip rec { name = "profont"; - src = fetchurl { - url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; - sha256 = "19ww5iayxzxxgixa9hgb842xd970mwghxfz2vsicp8wfwjh6pawr"; - }; + url = "http://tobiasjung.name/downloadfile.php?file=profont-x11.zip"; - buildInputs = [ unzip ]; + postFetch = '' + unzip -j $downloadedFile - phases = [ "unpackPhase" "installPhase" ]; - installPhase = - '' - mkdir -p $out/share/doc/$name $out/share/fonts/misc + mkdir -p $out/share/doc/$name $out/share/fonts/misc - cp LICENSE $out/share/doc/$name/LICENSE + cp LICENSE $out/share/doc/$name/LICENSE - for f in *.pcf; do - gzip -c "$f" > $out/share/fonts/misc/"$f".gz - done - ''; + for f in *.pcf; do + gzip -c "$f" > $out/share/fonts/misc/"$f".gz + done + ''; + + sha256 = "1calqmvrfv068w61f614la8mg8szas6m5i9s0lsmwjhb4qwjyxbw"; meta = with stdenv.lib; { homepage = http://tobiasjung.name; diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index 116fdd25a04..34c8a74a762 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "quattrocento-sans-${version}"; +let version = "2.0"; +in fetchzip rec { + name = "quattrocento-sans-${version}"; - src = fetchurl { - url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; - sha256 = "043jfdn18dgzpx3qb3s0hc541n6xv4gacsm4srd6f0pri45g4wh1"; - }; + url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; - - sourceRoot = "quattrocento-sans-v${version}"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "src/"*.otf $out/share/fonts/opentype - cp -v FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile '*/QuattrocentoSans*.otf' -d $out/share/fonts/opentype + unzip -j $downloadedFile '*/FONTLOG.txt' -d $out/share/doc/${name} ''; + sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/quattrocentosans/; description = "A classic, elegant and sober sans-serif typeface"; diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index 7ef62d2300c..a78001bb4ae 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -1,24 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "quattrocento-${version}"; +let version = "1.1"; +in fetchzip rec { + name = "quattrocento-${version}"; - src = fetchurl { - url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; - sha256 = "09wmbfwkry1r2cf5z4yy67wd4yzlnsjigg01r5r80z1phl0axn9n"; - }; + url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; - buildInputs = [unzip]; - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v "src/"*.otf $out/share/fonts/opentype - cp -v FONTLOG.txt $out/share/doc/${name} + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*FONTLOG.txt -d $out/share/doc/${name} ''; + sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; + meta = with stdenv.lib; { homepage = http://www.impallari.com/quattrocento/; description = "A classic, elegant, sober and strong serif typeface"; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index e754135755a..2ba9069d48b 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "raleway-${version}"; +let version = "2016-08-30"; +in fetchzip { + name = "raleway-${version}"; - src = fetchFromGitHub { - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; - sha256 = "1i6a14ynm29gqjr7kfk118v69vjpd3g4ylwfvhwa66xax09jkhlr"; - }; - dontBuild = true; + url = https://github.com/impallari/Raleway/archive/fa27f47b087fc093c6ae11cfdeb3999ac602929a.zip; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/opentype - find -type f -maxdepth 1 -exec cp "{}" $out/ \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*-Original.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.txt \*.md -d $out ''; + sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60"; + meta = { description = "Raleway is an elegant sans-serif typeface family"; @@ -35,7 +32,7 @@ stdenv.mkDerivation rec { It also has a sister display family, Raleway Dots. ''; - homepage = src.meta.homepage; + homepage = https://github.com/impallari/Raleway; license = stdenv.lib.licenses.ofl; maintainers = with stdenv.lib.maintainers; [ profpatsch ]; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index e9eff414bc1..175acb22d7b 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -63,6 +63,10 @@ stdenv.mkDerivation rec { cp -a *.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1rd3qql779dn9nl940hf988lvv4gfy5llgrlfqq0db0c22b2yfng"; + meta = { homepage = https://www.google.com/fonts/specimen/Roboto+Mono; description = "Google Roboto Mono fonts"; diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index 5a8a3f3c120..c5ce13ad7ae 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { cp -a *.ttf $out/share/fonts/truetype/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0imhvisjzi0rvn32hn04kngca4szx0j39h4c4zs7ryb4wdca76q9"; + meta = { homepage = https://www.google.com/fonts/specimen/Roboto+Slab; description = "Google Roboto Slab fonts"; diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix index 57639d8e6ab..90b32f251ef 100644 --- a/pkgs/data/fonts/sampradaya/default.nix +++ b/pkgs/data/fonts/sampradaya/default.nix @@ -1,10 +1,13 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: -runCommand "sampradaya-2015-05-26" { - src = fetchurl { - url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; - sha256 = "0110k1yh5kz3f04wp72bfz59pxjc7p6jv7m5p0rqn1kqbf7g3pck"; - }; +fetchzip { + name = "sampradaya-2015-05-26"; + + url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/Sampradaya.ttf"; + + sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv"; meta = with lib; { homepage = https://bitbucket.org/OorNaattaan/sampradaya/; @@ -14,7 +17,3 @@ runCommand "sampradaya-2015-05-26" { platforms = platforms.all; }; } -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/Sampradaya.ttf -'' diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix index 942a284e2c0..034c36a63ce 100644 --- a/pkgs/data/fonts/shrikhand/default.nix +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { +let version = "2016-03-03"; +in fetchzip { name = "shrikhand-${version}"; - src = fetchFromGitHub { - owner = "jonpinhorn"; - repo = "shrikhand"; - rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394"; - sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk"; - }; + url = https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf; - installPhase = '' - install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf - ''; + postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf"; + + sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs"; meta = with stdenv.lib; { homepage = https://jonpinhorn.github.io/shrikhand/; diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/data/fonts/signwriting/default.nix index 147f4edc519..883e43b4381 100644 --- a/pkgs/data/fonts/signwriting/default.nix +++ b/pkgs/data/fonts/signwriting/default.nix @@ -13,6 +13,10 @@ runCommand "signwriting-1.1.4" { sha256 = "0am5wbf7jdy9szxkbsc5f3959cxvbj7mr0hy1ziqmkz02c6xjw2m"; }; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0cn37s3lc7gbr8036l7ia2869qmxglkmgllh3r9q5j54g3sfjc7q"; + meta = with lib; { homepage = https://github.com/Slevinski/signwriting_2010_fonts; description = "Typeface for written sign languages"; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index 382f3fa8f0f..b695143fa59 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "siji-${date}"; +let date = "2016-05-13"; +in fetchzip { + name = "siji-${date}"; - src = fetchFromGitHub { - owner = "stark"; - repo = "siji"; - rev = "95369afac3e661cb6d3329ade5219992c88688c1"; - sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; - }; + url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; - installPhase = '' - mkdir -p $out/share/fonts/pcf - cp -v */*.pcf $out/share/fonts/pcf + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.pcf -d $out/share/fonts/pcf ''; + sha256 = "1799hs7zd8w7qyja4mii9ggmrm786az7ldsqwx9mbi51b56ym640"; + meta = { homepage = https://github.com/stark/siji; description = "An iconic bitmap font based on Stlarch with additional glyphs"; diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index 8679a8fd8ce..08c330809e8 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "source-code-pro-${version}"; +let version = "2.030"; +in fetchzip { + name = "source-code-pro-${version}"; - src = fetchFromGitHub { - owner = "adobe-fonts"; - repo = "source-code-pro"; - rev = "2.030R-ro/1.050R-it"; - name = "2.030R-ro-1.050R-it"; - sha256 = "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n"; - }; + url = https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip; - phases = "unpackPhase installPhase"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "0d8qwzjgnz264wlm4qim048z3236z4hbblvc6yplw13f6b65j6fv"; + meta = { description = "A set of monospaced OpenType fonts designed for coding environments"; maintainers = with stdenv.lib.maintainers; [ relrod ]; diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix index 240f0ff5d29..dc0d3175851 100644 --- a/pkgs/data/fonts/source-han-sans/default.nix +++ b/pkgs/data/fonts/source-han-sans/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: let - makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + makePackage = {variant, language, region, sha256}: let version = "1.004R"; - name = "source-han-sans-${variant}-${version}"; revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa"; + in fetchzip { + name = "source-han-sans-${variant}-${version}"; - buildInputs = [ unzip ]; + url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip"; - src = fetchurl { - url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip"; - inherit sha256; - }; - - setSourceRoot = '' - sourceRoot=$( echo SourceHanSans* ) + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp $( find . -name '*.otf' ) $out/share/fonts/opentype - ''; + inherit sha256; meta = { description = "${language} subset of an open source Pan-CJK sans-serif typeface"; @@ -36,24 +30,24 @@ in variant = "japanese"; language = "Japanese"; region = "JP"; - sha256 = "0m1zprwqnqp3za42firg53hyzir6p0q73fl8mh5j4px3zgivlvfw"; + sha256 = "194zapswaqly8ycx3k66vznlapvpyhdigp3sabsl4hn87j9xsc5v"; }; korean = makePackage { variant = "korean"; language = "Korean"; region = "KR"; - sha256 = "1bz6n2sd842vgnqky0i7a3j3i2ixhzzkkbx1m8plk04r1z41bz9q"; + sha256 = "0xij6mciiqgpwv1agqily2jji377x084k7fj4rpv6z0r5vvhqr08"; }; simplified-chinese = makePackage { variant = "simplified-chinese"; language = "Simplified Chinese"; region = "CN"; - sha256 = "0ksafcwmnpj3yxkgn8qkqkpw10ivl0nj9n2lsi9c6fw3aa71s3ha"; + sha256 = "038av18d45qr85bgx95j2fm8j64d72nsm9xzg0lpwr9xwni2sbx0"; }; traditional-chinese = makePackage { variant = "traditional-chinese"; language = "Traditional Chinese"; region = "TW"; - sha256 = "1l4zymd5n4nl9gmja707xq6bar88dxki2mwdixdfrkf544cidflj"; + sha256 = "1mzcv5hksyxplyv5q3w5nr1xz73hdnvip5gicz35j0by4gc739lr"; }; } diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix index 148f5a4538f..ac85d31d331 100644 --- a/pkgs/data/fonts/source-han-serif/default.nix +++ b/pkgs/data/fonts/source-han-serif/default.nix @@ -1,27 +1,21 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: let - makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + makePackage = {variant, language, region, sha256}: let version = "1.000R"; - name = "source-han-serif-${variant}-${version}"; revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76"; + in fetchzip { + name = "source-han-serif-${variant}-${version}"; - buildInputs = [ unzip ]; + url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; - src = fetchurl { - url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; - inherit sha256; - }; - - setSourceRoot = '' - sourceRoot=$( echo SourceHanSerif* ) - ''; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - cp $( find . -name '*.otf' ) $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + inherit sha256; + meta = { description = "${language} subset of an open source Pan-CJK serif typeface"; homepage = https://github.com/adobe-fonts/source-han-sans; @@ -36,24 +30,24 @@ in variant = "japanese"; language = "Japanese"; region = "JP"; - sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7"; + sha256 = "0cklcy6y3r7pg8z43fzd8zl5g46bkqa1iy0li49rm0fgdaw7kin2"; }; korean = makePackage { variant = "korean"; language = "Korean"; region = "KR"; - sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r"; + sha256 = "0lxrr978djsych8fmbl57n1c9c7ihl61w0b9q4plw27vd6p41fza"; }; simplified-chinese = makePackage { variant = "simplified-chinese"; language = "Simplified Chinese"; region = "CN"; - sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43"; + sha256 = "0k3x4kncjnbipf4i3lkk6b33zpf1ckp5648z51v48q47l3zqpm6p"; }; traditional-chinese = makePackage { variant = "traditional-chinese"; language = "Traditional Chinese"; region = "TW"; - sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h"; + sha256 = "00bi66nlkrargmmf4av24qfd716py7a9smcvr4xnll7fffldxv06"; }; } diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index 83b6a3f2d57..4ae9ceac01d 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation { +fetchzip { name = "source-sans-pro-2.010"; - src = fetchurl { - url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz"; - sha256 = "1s3rgia6x9fxc2pvlwm203grqkb49px6q0xnh8kbqxqsgna615p2"; - }; - phases = "unpackPhase installPhase"; + url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.zip"; - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2"; + meta = with stdenv.lib; { homepage = http://sourceforge.net/adobe/sourcesans; description = "A set of OpenType fonts designed by Adobe for UIs"; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index 0ccb0299a36..d627d813daa 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "source-serif-pro-${version}"; +let version = "1.017"; +in fetchzip { + name = "source-serif-pro-${version}"; - src = fetchurl rec { - url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.tar.gz"; - sha256 = "04h24iywjl4fd08x22ypdb3sm979wjfq4wk95r3rk8w376spakrg"; - }; + url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.zip"; - phases = "unpackPhase installPhase"; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype - find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1"; + meta = with stdenv.lib; { homepage = http://sourceforge.net/adobe/sourceserifpro; description = "A set of OpenType fonts to complement Source Sans Pro"; diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index f32d865c95c..1ae85da3f7f 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -1,25 +1,19 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchzip}: -stdenv.mkDerivation rec { - name = "stix-otf-${version}"; +let version = "1.1.1"; +in fetchzip rec { + name = "stix-otf-${version}"; - src = fetchurl { - url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip"; - sha256 = "1q35wbqn3nh78pdban9z37lh090c6p49q3d00zzxm0axxz66xy4q"; - }; + url = "mirror://sourceforge/stixfonts/STIXv${version}-word.zip"; - buildInputs = [unzip]; - - phases = ["unpackPhase" "installPhase"]; - - sourceRoot = "Fonts/STIX-Word"; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp *.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw"; + meta = with stdenv.lib; { homepage = http://www.stixfonts.org/; description = "Fonts for Scientific and Technical Information eXchange"; diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index d4ec083a070..f535c0d7e7b 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "stix-two-${version}"; +let version = "2.0.0"; +in fetchzip { + name = "stix-two-${version}"; - src = fetchurl { - url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip"; - sha256 = "0f6rcg0p2dhnks523nywgkjk56bjajz3gnwsrap932674xxjkb3g"; - }; + url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip"; - buildInputs = [ unzip ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -v "Fonts/OTF/"*.otf $out/share/fonts/opentype + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; + sha256 = "19i30d2xjk52bjj7xva1hnlyh58yd5phas1njcc8ldcz87a1lhql"; + meta = with stdenv.lib; { homepage = http://www.stixfonts.org/; description = "Fonts for Scientific and Technical Information eXchange"; diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix index 0b9a63f2cb3..7778c4a98b8 100644 --- a/pkgs/data/fonts/tai-languages/default.nix +++ b/pkgs/data/fonts/tai-languages/default.nix @@ -1,11 +1,14 @@ -{ lib, runCommand, fetchurl }: +{ lib, fetchzip }: { -tai-ahom = runCommand "tai-ahom-2015-07-06" { - src = fetchurl { - url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; - sha256 = "0zpjsylm29qc3jdv5kv0689pcirai46j7xjp5dppi0fmzxaxqnsk"; - }; +tai-ahom = fetchzip { + name = "tai-ahom-2015-07-06"; + + url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; + + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/AhomUnicode.ttf"; + + sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q"; meta = with lib; { homepage = https://github.com/enabling-languages/tai-languages; @@ -14,11 +17,7 @@ tai-ahom = runCommand "tai-ahom-2015-07-06" { license = licenses.ofl; # See font metadata platforms = platforms.all; }; -} -'' - mkdir -p $out/share/fonts/truetype - cp $src $out/share/fonts/truetype/AhomUnicode.ttf -''; +}; # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index c934bdb70e3..d0e7b89888c 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation { mkdir -p "$out/share/fonts/opentype/public" cp ${toString srcs} "$out/share/fonts/opentype/public" ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw"; + meta = { description = ''Tempora font''; license = stdenv.lib.licenses.gpl2 ; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 01959f91195..8750dfbd52d 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "terminus-font-ttf-${version}"; +let version = "4.40.1"; +in fetchzip rec { + name = "terminus-font-ttf-${version}"; - src = fetchurl { - url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; - sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188"; - }; + url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; - nativeBuildInputs = [ unzip ]; + postFetch = '' + unzip -j $downloadedFile - installPhase = '' for i in *.ttf; do local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" @@ -20,6 +18,8 @@ stdenv.mkDerivation rec { install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; + sha256 = "0cfkpgixdz47y94s9j26pm7n4hvad23vb2q4315kgahl4294zcpg"; + meta = with stdenv.lib; { description = "A clean fixed width TTF font"; longDescription = '' diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index c385c3d40a9..2dbe7e720d2 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -1,24 +1,21 @@ { stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "theano-${version}"; +let version = "2.0"; +in fetchzip rec { + name = "theano-${version}"; - src = fetchzip { - stripRoot = false; - url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; - sha256 = "1z3c63rcp4vfjyfv8xwc3br10ydwjyac3ipbl09y01s7qhfz02gp"; - }; + url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' + postFetch = '' mkdir -p $out/share/fonts/opentype mkdir -p $out/share/doc/${name} - find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; - find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" ''; + sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; + meta = with stdenv.lib; { homepage = https://github.com/akryukov/theano; description = "An old-style font designed from historic samples"; diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix index 45d88901ea7..1a4954e6ce4 100644 --- a/pkgs/data/fonts/tipa/default.nix +++ b/pkgs/data/fonts/tipa/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "tipa-1.3"; - + src = fetchurl { url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz"; sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m"; @@ -13,9 +13,13 @@ stdenv.mkDerivation { mkdir -p "$PREFIX" "$out/share" make install PREFIX="$PREFIX" - ln -s $out/texmf* $out/share/ + ln -s -r $out/texmf* $out/share/ ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1g2cclykr6ax584rlcri8w2h385n624sgfx2fm45r0cwkg1p77h2"; + meta = { description = "Phonetic font for TeX"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 0ab7657cc6f..a4d479ea33c 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,21 +1,19 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip}: -stdenv.mkDerivation { +fetchzip { name = "ttf-bitstream-vera-1.10"; - src = fetchurl { - url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; - sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; - }; + url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; - dontBuild = true; - - installPhase = '' + postFetch = '' + tar -xjf $downloadedFile --strip-components=1 fontDir=$out/share/fonts/truetype mkdir -p $fontDir cp *.ttf $fontDir ''; + sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m"; + meta = { platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 8db10d7f582..2c58f197f18 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchzip }: + let pname = "ttf-envy-code-r"; version = "PR7"; -in -stdenv.mkDerivation rec { +in fetchzip { name = "${pname}-0.${version}"; - src = fetchurl { - url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; - sha256 = "9f7e9703aaf21110b4e1a54d954d57d4092727546348598a5a8e8101e4597aff"; - }; + url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; - buildInputs = [unzip]; - - installPhase = '' - for f in *.ttf; do - install -Dm 644 "$f" "$out/share/fonts/truetype/$f" - done - install -Dm 644 Read\ Me.txt "$out/share/doc/${pname}/readme.txt" + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${pname}" ''; + sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z"; + meta = with stdenv.lib; { homepage = http://damieng.com/blog/tag/envy-code-r; description = "Free scalable coding font by DamienG"; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 7f7b53526e5..8a3fd2d6035 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "unifont_upper-${version}"; +let version = "9.0.03"; +in fetchzip rec { + name = "unifont_upper-${version}"; - ttf = fetchurl { - url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf"; - sha256 = "015v39y6nnyz4ld006349jzk9isyaqp4cnvmz005ylfnicl4zwhi"; - }; + url = "http://unifoundry.com/pub/unifont-${version}/font-builds/${name}.ttf"; - phases = "installPhase"; + postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - installPhase = - '' - mkdir -p $out/share/fonts/truetype - cp -v ${ttf} $out/share/fonts/truetype/unifont_upper.ttf - ''; + sha256 = "0anja3wrdjw0czqqk6wpf9yrkp0b11hb98wzmrpyij9gfgrspd71"; meta = with stdenv.lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; From fecca868c3790071b6b4bb3f0ef00df076b60a82 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Aug 2017 15:04:02 +0200 Subject: [PATCH 114/213] jenkins: 2.71 -> 2.73 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 8f545df2d8b..b0bc4f4a62c 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.71"; + version = "2.73"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0b3mxbcv7afj8ksr2y33rvprj7003679j545igf5dsal82i7swhl"; + sha256 = "1q9q2vjza3slmbh6sbxak1y3ryvisphlh92nidsp88rv60zn3nv8"; }; buildCommand = '' From 6fdf8b3f778fa7c16040d3d7f3bed408fb7bffd0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Aug 2017 17:32:23 +0200 Subject: [PATCH 115/213] nginxMainline: 1.13.3 -> 1.13.4 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index ced0fd0976f..64d0a9b7952 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.3"; - sha256 = "0whdpgfb1y9r7f3y91r4m0wpgrwwdl2byahp9a7gn0n30j0gjwsv"; + version = "1.13.4"; + sha256 = "1fpvy6738h951qks7wn6kdqwyprfsxirlxfq549n2p56kg2g68fy"; }) From 9f7f85a3cdff9658c3deeb7291242bddcc2e28f7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Aug 2017 17:37:14 +0200 Subject: [PATCH 116/213] nixos/tests/nginx: fix name --- nixos/tests/nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index c2beb5590ef..7f7bc0f0b4f 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -3,7 +3,7 @@ # generated virtual hosts config. import ./make-test.nix ({ pkgs, ...} : { - name = "jenkins"; + name = "nginx"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ mbbx6spp ]; }; From c6e200ea7c8eb71463d239285236e2a429fd06cd Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 10 Aug 2017 19:43:49 +0000 Subject: [PATCH 117/213] data/fonts: simpler cleanups (group 2) --- pkgs/data/fonts/clearlyU/default.nix | 4 ++++ pkgs/data/fonts/dina-pcf/default.nix | 6 +++++- pkgs/data/fonts/dosemu-fonts/default.nix | 6 +++++- pkgs/data/fonts/envypn-font/default.nix | 4 ++++ pkgs/data/fonts/gohufont/default.nix | 4 ++++ pkgs/data/fonts/proggyfonts/default.nix | 6 +++++- pkgs/data/fonts/tewi/default.nix | 6 +++++- pkgs/data/fonts/ucs-fonts/default.nix | 4 ++++ pkgs/data/fonts/uni-vga/default.nix | 4 ++++ pkgs/data/fonts/unifont/default.nix | 4 ++++ 10 files changed, 44 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 9334468d76c..1e4df0c9221 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { mkfontdir mkfontscale ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "127zrg65s90ksj99kr9hxny40rbxvpai62mf5nqk853hcd1bzpr6"; meta = { description = "A Unicode font"; diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index d08887a5cde..b94004b24bb 100644 --- a/pkgs/data/fonts/dina-pcf/default.nix +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { for i in Dina_r700-*.bdf; do bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i done - gzip *.pcf + gzip -n *.pcf fontDir="$out/share/fonts/misc" mkdir -p "$fontDir" @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { preferLocalBuild = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0v0qn5zwq4j1yx53ypg6w6mqx6dk8l1xix0188b0k4z3ivgnflyb"; + meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 84c57fc7e8f..f564507c777 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for i in */etc/*.bdf; do fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz" echo -n "Installing font $fontOut..." >&2 - ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 > "$fontOut" + ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 -n > "$fontOut" echo " done." >&2 done cp */etc/dosemu.alias "$fontPath/fonts.alias" @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { ${mkfontscale}/bin/mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1miqv0ral5vazx721wildjlzvji5r7pbgm39c0cpj5ywafaikxr8"; + meta = { description = "Various fonts from the DOSEmu project"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 203b68f5e5d..40880d022db 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "04sjxfrlvjc2f0679cy4w366mpzbn3fp6gnrjb8vy12vjd1ffnc1"; + meta = with stdenv.lib; { description = '' Readable bitmap font inspired by Envy Code R diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 2bd0d5800b4..f4043697e7b 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0msl5y9q6hjbhc85v121x1b1rhsh2rbqqy4k234i5mpp8l3087r7"; + meta = with stdenv.lib; { description = '' A monospace bitmap font well suited for programming and terminal use diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 9a4cfb3093b..9637a6c85b0 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "proggyfonts-0.1"; src = fetchurl { - url = "http://kaictl.net/software/${name}.tar.gz"; + url = "http://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz"; sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n"; }; @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { done ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "06jsf3rw6q4l1jrw1161h4vxa1xbvpry5x12d8sh5g7hjk88p77g"; + meta = with stdenv.lib; { homepage = http://upperbounds.net; description = "A set of fixed-width screen fonts that are designed for code listings"; diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 2b2a71bf7b4..78d94462654 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { bdftopcf -o ''${i/bdf/pcf} $i done - gzip *.pcf + gzip -n *.pcf ''; installPhase = '' @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "14dv3m1svahjyb9c1x1570qrmlnynzg0g36b10bqqs8xvhix34yq"; + meta = with stdenv.lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index b9af7fad165..75ab2f40b6f 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk"; + meta = with stdenv.lib; { description = "Unicode bitmap fonts"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 63f74bb41b4..ce18893ced7 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + sha256 = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7"; + meta = { description = "Unicode VGA font"; maintainers = [stdenv.lib.maintainers.ftrvxmtrx]; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index bd99d20480b..4d9f3fc7104 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { mkfontscale ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1s7gpxxj760aw3rpk760s3w8qdkn819rs7si1qj4grm3s6hb2gd8"; + meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; homepage = http://unifoundry.com/unifont.html; From f2d420e4c982a102fc40c8b412180a3a102a4a54 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 11 Aug 2017 12:09:42 -0400 Subject: [PATCH 118/213] linux: 4.9.41 -> 4.9.42 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index fb7440a04ae..597d87c63fb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.41"; + version = "4.9.42"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "11y6q0mmi3z6pg4h0prv67pr1a78rvrzw75ygg6720dz0jzvnnmd"; + sha256 = "0ivq75vksd8rca881zyfimb6n43clr93gbgkd9w8p4qcj797f18a"; }; kernelPatches = args.kernelPatches; From 47d9b48e4d7d4e9cdb027c38c3dc7977bd4f6f40 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 11 Aug 2017 12:14:53 -0400 Subject: [PATCH 119/213] linux: 4.12.5 -> 4.12.6 --- pkgs/os-specific/linux/kernel/linux-4.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix index 97072a2ce74..1cbba85b7ba 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12.5"; + version = "4.12.6"; extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1833ibdb13dbg5xmf500bxkin8ng4yav3l5qvfilj0v4ygjlhlbi"; + sha256 = "0ywkzqjl9rq672nwn74cw2d871hpzxkrlyx40lkkp4z1y440ijh1"; }; kernelPatches = args.kernelPatches; From 6f9d84fe6494b9849d20cfa15f7eb1d42d034ea6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 8 Aug 2017 18:11:46 +0000 Subject: [PATCH 120/213] coqPackages.interval: fix URL --- pkgs/development/coq-modules/interval/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index e07c7c80ac0..c3169970ad2 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "coq${coq.coq-version}-interval-3.1.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36342/interval-3.1.1.tar.gz; - sha256 = "0jzkb0xykiz9bfaminy9yd88b5w0gxcpw506yaaqmnmb43gdksyf"; + url = https://gforge.inria.fr/frs/download.php/file/36723/interval-3.1.1.tar.gz; + sha256 = "1sqsf075c7s98mwi291bhnrv5fgd7brrqrzx51747394hndlvfw3"; }; nativeBuildInputs = [ which ]; From 0eb9c5bd42ea4dc1c7efdd2d718aa0c5c24622d3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 19:08:02 +0200 Subject: [PATCH 121/213] linux_3_10: remove Support ends in Oct 2017 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 16 ---------------- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.10.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix deleted file mode 100644 index 9587ba356ff..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.10.105"; - extraMeta.branch = "3.10"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1739mikbyfx1zfmra16lnprca3pcvcplqss4x1jzdqmvkh9cqnqw"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd97b2152fc..0adf513cab3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12071,21 +12071,6 @@ with pkgs; ]; }; - linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { - kernelPatches = with kernelPatches; - [ bridge_stp_helper - p9_fixes - lguest_entry-linkage - packet_fix_race_condition_CVE_2016_8655 - DCCP_double_free_vulnerability_CVE-2017-6074 - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12314,7 +12299,6 @@ with pkgs; linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; - linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12); From 9f3f575ab3eb4cd6b5f8de20e6f1a5374fedef2c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 19:09:58 +0200 Subject: [PATCH 122/213] linux_4_4: remove Support ends in Feb 2018 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 14 -------------- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.4.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix deleted file mode 100644 index 16699dcdf43..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.4.80"; - extraMeta.branch = "4.4"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hs07k49sbpi8yw2mdwn1967i82x4wn6kg0lbjvv5l1pv3alky1l"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0adf513cab3..f06493f5741 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12071,19 +12071,6 @@ with pkgs; ]; }; - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - kernelPatches.cpu-cgroup-v2."4.4" - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12299,7 +12286,6 @@ with pkgs; linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; - linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12); # Don't forget to update linuxPackages_latest! From 05b8cae9ec88156f46d9b98424643b6208664222 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 19:11:48 +0200 Subject: [PATCH 123/213] linux: remove unused kernel patches --- .../kernel/cpu-cgroup-v2-patches/4.4.patch | 407 ------ .../linux/kernel/crc-regression.patch | 24 - .../kernel/multithreaded-rsapubkey-asn1.patch | 45 - pkgs/os-specific/linux/kernel/no-xsave.patch | 85 -- pkgs/os-specific/linux/kernel/patches.nix | 72 - pkgs/os-specific/linux/kernel/perf.diff | 18 - pkgs/os-specific/linux/kernel/perf.nix | 1 - .../linux/kernel/ubuntu-fan-4.4.patch | 1240 ----------------- .../ubuntu-unprivileged-overlayfs.patch | 69 - 9 files changed, 1961 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch delete mode 100644 pkgs/os-specific/linux/kernel/crc-regression.patch delete mode 100644 pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch delete mode 100644 pkgs/os-specific/linux/kernel/no-xsave.patch delete mode 100644 pkgs/os-specific/linux/kernel/perf.diff delete mode 100644 pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch delete mode 100644 pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch deleted file mode 100644 index 8f2418c9efc..00000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch +++ /dev/null @@ -1,407 +0,0 @@ -commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Misc preps for cgroup unified hierarchy interface - - Make the following changes in preparation for the cpu controller - interface implementation for the unified hierarchy. This patch - doesn't cause any functional differences. - - * s/cpu_stats_show()/cpu_cfs_stats_show()/ - - * s/cpu_files/cpu_legacy_files/ - - * Separate out cpuacct_stats_read() from cpuacct_stats_show(). While - at it, remove pointless cpuacct_stat_desc[] array. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 732e993..77f3ddd 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8512,7 +8512,7 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) - return ret; - } - --static int cpu_stats_show(struct seq_file *sf, void *v) -+static int cpu_cfs_stats_show(struct seq_file *sf, void *v) - { - struct task_group *tg = css_tg(seq_css(sf)); - struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -@@ -8552,7 +8552,7 @@ static u64 cpu_rt_period_read_uint(struct cgroup_subsys_state *css, - } - #endif /* CONFIG_RT_GROUP_SCHED */ - --static struct cftype cpu_files[] = { -+static struct cftype cpu_legacy_files[] = { - #ifdef CONFIG_FAIR_GROUP_SCHED - { - .name = "shares", -@@ -8573,7 +8573,7 @@ static struct cftype cpu_files[] = { - }, - { - .name = "stat", -- .seq_show = cpu_stats_show, -+ .seq_show = cpu_cfs_stats_show, - }, - #endif - #ifdef CONFIG_RT_GROUP_SCHED -@@ -8599,7 +8599,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .fork = cpu_cgroup_fork, - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, -- .legacy_cftypes = cpu_files, -+ .legacy_cftypes = cpu_legacy_files, - .early_init = 1, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index dd7cbb5..42b2dd5 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) - return 0; - } - --static const char * const cpuacct_stat_desc[] = { -- [CPUACCT_STAT_USER] = "user", -- [CPUACCT_STAT_SYSTEM] = "system", --}; -- --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); - int cpu; -- s64 val = 0; - -+ *userp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_USER]; -- val += kcpustat->cpustat[CPUTIME_NICE]; -+ *userp += kcpustat->cpustat[CPUTIME_USER]; -+ *userp += kcpustat->cpustat[CPUTIME_NICE]; - } -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); - -- val = 0; -+ *sysp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_SYSTEM]; -- val += kcpustat->cpustat[CPUTIME_IRQ]; -- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; -+ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; - } -+} - -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ cputime64_t user, sys; - -+ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); -+ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); -+ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); - return 0; - } - - -commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97 -Author: Tejun Heo -Date: Fri Mar 11 07:31:23 2016 -0500 - - sched: Implement interface for cgroup unified hierarchy - - While the cpu controller doesn't have any functional problems, there - are a couple interface issues which can be addressed in the v2 - interface. - - * cpuacct being a separate controller. This separation is artificial - and rather pointless as demonstrated by most use cases co-mounting - the two controllers. It also forces certain information to be - accounted twice. - - * Use of different time units. Writable control knobs use - microseconds, some stat fields use nanoseconds while other cpuacct - stat fields use centiseconds. - - * Control knobs which can't be used in the root cgroup still show up - in the root. - - * Control knob names and semantics aren't consistent with other - controllers. - - This patchset implements cpu controller's interface on the unified - hierarchy which adheres to the controller file conventions described - in Documentation/cgroups/unified-hierarchy.txt. Overall, the - following changes are made. - - * cpuacct is implictly enabled and disabled by cpu and its information - is reported through "cpu.stat" which now uses microseconds for all - time durations. All time duration fields now have "_usec" appended - to them for clarity. While this doesn't solve the double accounting - immediately, once majority of users switch to v2, cpu can directly - account and report the relevant stats and cpuacct can be disabled on - the unified hierarchy. - - Note that cpuacct.usage_percpu is currently not included in - "cpu.stat". If this information is actually called for, it can be - added later. - - * "cpu.shares" is replaced with "cpu.weight" and operates on the - standard scale defined by CGROUP_WEIGHT_MIN/DFL/MAX (1, 100, 10000). - The weight is scaled to scheduler weight so that 100 maps to 1024 - and the ratio relationship is preserved - if weight is W and its - scaled value is S, W / 100 == S / 1024. While the mapped range is a - bit smaller than the orignal scheduler weight range, the dead zones - on both sides are relatively small and covers wider range than the - nice value mappings. This file doesn't make sense in the root - cgroup and isn't create on root. - - * "cpu.cfs_quota_us" and "cpu.cfs_period_us" are replaced by "cpu.max" - which contains both quota and period. - - * "cpu.rt_runtime_us" and "cpu.rt_period_us" are replaced by - "cpu.rt.max" which contains both runtime and period. - - v2: cpu_stats_show() was incorrectly using CONFIG_FAIR_GROUP_SCHED for - CFS bandwidth stats and also using raw division for u64. Use - CONFIG_CFS_BANDWITH and do_div() instead. - - The semantics of "cpu.rt.max" is not fully decided yet. Dropped - for now. - - Signed-off-by: Tejun Heo - Cc: Ingo Molnar - Cc: Peter Zijlstra - Cc: Li Zefan - Cc: Johannes Weiner - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 77f3ddd..7aafe63 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8591,6 +8591,139 @@ static struct cftype cpu_legacy_files[] = { - { } /* terminate */ - }; - -+static int cpu_stats_show(struct seq_file *sf, void *v) -+{ -+ cpuacct_cpu_stats_show(sf); -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ struct task_group *tg = css_tg(seq_css(sf)); -+ struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; -+ u64 throttled_usec; -+ -+ throttled_usec = cfs_b->throttled_time; -+ do_div(throttled_usec, NSEC_PER_USEC); -+ -+ seq_printf(sf, "nr_periods %d\n" -+ "nr_throttled %d\n" -+ "throttled_usec %llu\n", -+ cfs_b->nr_periods, cfs_b->nr_throttled, -+ throttled_usec); -+ } -+#endif -+ return 0; -+} -+ -+#ifdef CONFIG_FAIR_GROUP_SCHED -+static u64 cpu_weight_read_u64(struct cgroup_subsys_state *css, -+ struct cftype *cft) -+{ -+ struct task_group *tg = css_tg(css); -+ u64 weight = scale_load_down(tg->shares); -+ -+ return DIV_ROUND_CLOSEST_ULL(weight * CGROUP_WEIGHT_DFL, 1024); -+} -+ -+static int cpu_weight_write_u64(struct cgroup_subsys_state *css, -+ struct cftype *cftype, u64 weight) -+{ -+ /* -+ * cgroup weight knobs should use the common MIN, DFL and MAX -+ * values which are 1, 100 and 10000 respectively. While it loses -+ * a bit of range on both ends, it maps pretty well onto the shares -+ * value used by scheduler and the round-trip conversions preserve -+ * the original value over the entire range. -+ */ -+ if (weight < CGROUP_WEIGHT_MIN || weight > CGROUP_WEIGHT_MAX) -+ return -ERANGE; -+ -+ weight = DIV_ROUND_CLOSEST_ULL(weight * 1024, CGROUP_WEIGHT_DFL); -+ -+ return sched_group_set_shares(css_tg(css), scale_load(weight)); -+} -+#endif -+ -+static void __maybe_unused cpu_period_quota_print(struct seq_file *sf, -+ long period, long quota) -+{ -+ if (quota < 0) -+ seq_puts(sf, "max"); -+ else -+ seq_printf(sf, "%ld", quota); -+ -+ seq_printf(sf, " %ld\n", period); -+} -+ -+/* caller should put the current value in *@periodp before calling */ -+static int __maybe_unused cpu_period_quota_parse(char *buf, -+ u64 *periodp, u64 *quotap) -+{ -+ char tok[21]; /* U64_MAX */ -+ -+ if (!sscanf(buf, "%s %llu", tok, periodp)) -+ return -EINVAL; -+ -+ *periodp *= NSEC_PER_USEC; -+ -+ if (sscanf(tok, "%llu", quotap)) -+ *quotap *= NSEC_PER_USEC; -+ else if (!strcmp(tok, "max")) -+ *quotap = RUNTIME_INF; -+ else -+ return -EINVAL; -+ -+ return 0; -+} -+ -+#ifdef CONFIG_CFS_BANDWIDTH -+static int cpu_max_show(struct seq_file *sf, void *v) -+{ -+ struct task_group *tg = css_tg(seq_css(sf)); -+ -+ cpu_period_quota_print(sf, tg_get_cfs_period(tg), tg_get_cfs_quota(tg)); -+ return 0; -+} -+ -+static ssize_t cpu_max_write(struct kernfs_open_file *of, -+ char *buf, size_t nbytes, loff_t off) -+{ -+ struct task_group *tg = css_tg(of_css(of)); -+ u64 period = tg_get_cfs_period(tg); -+ u64 quota; -+ int ret; -+ -+ ret = cpu_period_quota_parse(buf, &period, "a); -+ if (!ret) -+ ret = tg_set_cfs_bandwidth(tg, period, quota); -+ return ret ?: nbytes; -+} -+#endif -+ -+static struct cftype cpu_files[] = { -+ { -+ .name = "stat", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_stats_show, -+ }, -+#ifdef CONFIG_FAIR_GROUP_SCHED -+ { -+ .name = "weight", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .read_u64 = cpu_weight_read_u64, -+ .write_u64 = cpu_weight_write_u64, -+ }, -+#endif -+#ifdef CONFIG_CFS_BANDWIDTH -+ { -+ .name = "max", -+ .flags = CFTYPE_NOT_ON_ROOT, -+ .seq_show = cpu_max_show, -+ .write = cpu_max_write, -+ }, -+#endif -+ { } /* terminate */ -+}; -+ - struct cgroup_subsys cpu_cgrp_subsys = { - .css_alloc = cpu_cgroup_css_alloc, - .css_free = cpu_cgroup_css_free, -@@ -8600,7 +8733,15 @@ struct cgroup_subsys cpu_cgrp_subsys = { - .can_attach = cpu_cgroup_can_attach, - .attach = cpu_cgroup_attach, - .legacy_cftypes = cpu_legacy_files, -+ .dfl_cftypes = cpu_files, - .early_init = 1, -+#ifdef CONFIG_CGROUP_CPUACCT -+ /* -+ * cpuacct is enabled together with cpu on the unified hierarchy -+ * and its stats are reported through "cpu.stat". -+ */ -+ .depends_on = 1 << cpuacct_cgrp_id, -+#endif - }; - - #endif /* CONFIG_CGROUP_SCHED */ -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index 42b2dd5..b4d32a6 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -224,6 +224,30 @@ static struct cftype files[] = { - { } /* terminate */ - }; - -+/* used to print cpuacct stats in cpu.stat on the unified hierarchy */ -+void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+ struct cgroup_subsys_state *css; -+ u64 usage, user, sys; -+ -+ css = cgroup_get_e_css(seq_css(sf)->cgroup, &cpuacct_cgrp_subsys); -+ -+ usage = cpuusage_read(css, seq_cft(sf)); -+ cpuacct_stats_read(css_ca(css), &user, &sys); -+ -+ user *= TICK_NSEC; -+ sys *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(user, NSEC_PER_USEC); -+ do_div(sys, NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", usage, user, sys); -+ -+ css_put(css); -+} -+ - /* - * charge this task's execution time to its accounting group. - * -diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h -index ed60562..44eace9 100644 ---- a/kernel/sched/cpuacct.h -+++ b/kernel/sched/cpuacct.h -@@ -2,6 +2,7 @@ - - extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); - extern void cpuacct_account_field(struct task_struct *p, int index, u64 val); -+extern void cpuacct_cpu_stats_show(struct seq_file *sf); - - #else - -@@ -14,4 +15,8 @@ cpuacct_account_field(struct task_struct *p, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/crc-regression.patch b/pkgs/os-specific/linux/kernel/crc-regression.patch deleted file mode 100644 index 623713d16a6..00000000000 --- a/pkgs/os-specific/linux/kernel/crc-regression.patch +++ /dev/null @@ -1,24 +0,0 @@ -See https://github.com/NixOS/nixpkgs/issues/6231 - -v3.14.31:crypto/crc32c.c is missing the MODULE_ALIAS_CRYPTO("crc32c"). -That's probably because crypto/crc32c.c was renamed to -crypto/crc32c_generic.c in commit -06e5a1f29819759392239669beb2cad27059c8ec and therefore fell through -the cracks when backporting commit -5d26a105b5a73e5635eae0629b42fa0a90e07b7b. - -So the affected kernels (all that backported the "crypto-" prefix -patches) need this additional patch: - -diff --git a/crypto/crc32c.c b/crypto/crc32c.c -index 06f7018c9d95..aae5829eb681 100644 ---- a/crypto/crc32c.c -+++ b/crypto/crc32c.c -@@ -167,6 +167,7 @@ static void __exit crc32c_mod_fini(void) - module_init(crc32c_mod_init); - module_exit(crc32c_mod_fini); - -+MODULE_ALIAS_CRYPTO("crc32c"); - MODULE_AUTHOR("Clay Haapala "); - MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); - MODULE_LICENSE("GPL"); diff --git a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch b/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch deleted file mode 100644 index 9f5790862b6..00000000000 --- a/pkgs/os-specific/linux/kernel/multithreaded-rsapubkey-asn1.patch +++ /dev/null @@ -1,45 +0,0 @@ - -From Yang Shi <> -Subject [PATCH] crypto: rsa - fix a potential race condition in build -Date Fri, 2 Dec 2016 15:41:04 -0800 - - -When building kernel with RSA enabled with multithreaded, the below -compile failure might be caught: - -| /buildarea/kernel-source/crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory -| #include "rsapubkey-asn1.h" -| ^ -| compilation terminated. -| CC crypto/rsa-pkcs1pad.o -| CC crypto/algboss.o -| CC crypto/testmgr.o -| make[3]: *** [/buildarea/kernel-source/scripts/Makefile.build:289: crypto/rsa_helper.o] Error 1 -| make[3]: *** Waiting for unfinished jobs.... -| make[2]: *** [/buildarea/kernel-source/Makefile:969: crypto] Error 2 -| make[1]: *** [Makefile:150: sub-make] Error 2 -| make: *** [Makefile:24: __sub-make] Error 2 - -The header file is not generated before rsa_helper is compiled, so -adding dependency to avoid such issue. - -Signed-off-by: Yang Shi - ---- - crypto/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/crypto/Makefile b/crypto/Makefile -index 99cc64a..8db39f9 100644 ---- a/crypto/Makefile -+++ b/crypto/Makefile -@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o - - $(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h - $(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h -+$(obj)/rsa_helper.o: $(obj)/rsa_helper.c $(obj)/rsaprivkey-asn1.h - clean-files += rsapubkey-asn1.c rsapubkey-asn1.h - clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h - --- -2.0.2 diff --git a/pkgs/os-specific/linux/kernel/no-xsave.patch b/pkgs/os-specific/linux/kernel/no-xsave.patch deleted file mode 100644 index dde96d7dccd..00000000000 --- a/pkgs/os-specific/linux/kernel/no-xsave.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/arch/x86/xen/enlighten.c -+++ b/arch/x86/xen/enlighten.c -@@ -168,21 +168,23 @@ static void __init xen_banner(void) - xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : ""); - } - -+static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0; -+static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0; -+ - static void xen_cpuid(unsigned int *ax, unsigned int *bx, - unsigned int *cx, unsigned int *dx) - { -+ unsigned maskecx = ~0; - unsigned maskedx = ~0; - - /* - * Mask out inconvenient features, to try and disable as many - * unsupported kernel subsystems as possible. - */ -- if (*ax == 1) -- maskedx = ~((1 << X86_FEATURE_APIC) | /* disable APIC */ -- (1 << X86_FEATURE_ACPI) | /* disable ACPI */ -- (1 << X86_FEATURE_MCE) | /* disable MCE */ -- (1 << X86_FEATURE_MCA) | /* disable MCA */ -- (1 << X86_FEATURE_ACC)); /* thermal monitoring */ -+ if (*ax == 1) { -+ maskecx = cpuid_leaf1_ecx_mask; -+ maskedx = cpuid_leaf1_edx_mask; -+ } - - asm(XEN_EMULATE_PREFIX "cpuid" - : "=a" (*ax), -@@ -190,9 +192,43 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, - "=c" (*cx), - "=d" (*dx) - : "0" (*ax), "2" (*cx)); -+ -+ *cx &= maskecx; - *dx &= maskedx; - } - -+static __init void xen_init_cpuid_mask(void) -+{ -+ unsigned int ax, bx, cx, dx; -+ -+ cpuid_leaf1_edx_mask = -+ ~((1 << X86_FEATURE_MCE) | /* disable MCE */ -+ (1 << X86_FEATURE_MCA) | /* disable MCA */ -+ (1 << X86_FEATURE_ACC)); /* thermal monitoring */ -+ -+ if (!xen_initial_domain()) -+ cpuid_leaf1_edx_mask &= -+ ~((1 << X86_FEATURE_APIC) | /* disable local APIC */ -+ (1 << X86_FEATURE_ACPI)); /* disable ACPI */ -+ -+ ax = 1; -+ xen_cpuid(&ax, &bx, &cx, &dx); -+ -+ /* cpuid claims we support xsave; try enabling it to see what happens */ -+ if (cx & (1 << (X86_FEATURE_XSAVE % 32))) { -+ unsigned long cr4; -+ -+ set_in_cr4(X86_CR4_OSXSAVE); -+ -+ cr4 = read_cr4(); -+ -+ if ((cr4 & X86_CR4_OSXSAVE) == 0) -+ cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_XSAVE % 32)); -+ -+ clear_in_cr4(X86_CR4_OSXSAVE); -+ } -+} -+ - static void xen_set_debugreg(int reg, unsigned long val) - { - HYPERVISOR_set_debugreg(reg, val); -@@ -903,6 +939,8 @@ asmlinkage void __init xen_start_kernel(void) - - xen_init_irq_ops(); - -+ xen_init_cpuid_mask(); -+ - #ifdef CONFIG_X86_LOCAL_APIC - /* - * set up the basic apic ops. diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4c78928a99a..e5f430b4d82 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -21,12 +21,6 @@ in rec { - multithreaded_rsapubkey = - { - name = "multithreaded-rsapubkey-asn1.patch"; - patch = ./multithreaded-rsapubkey-asn1.patch; - }; - bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -37,12 +31,6 @@ rec { patch = ./p9-fixes.patch; }; - no_xsave = - { name = "no-xsave"; - patch = ./no-xsave.patch; - features.noXsave = true; - }; - mips_fpureg_emu = { name = "mips-fpureg-emulation"; patch = ./mips-fpureg-emulation.patch; @@ -63,22 +51,6 @@ rec { patch = ./modinst-arg-list-too-long.patch; }; - ubuntu_fan_4_4 = - { name = "ubuntu-fan"; - patch = ./ubuntu-fan-4.4.patch; - }; - - ubuntu_unprivileged_overlayfs = - { name = "ubuntu-unprivileged-overlayfs"; - patch = ./ubuntu-unprivileged-overlayfs.patch; - }; - - tuxonice_3_10 = makeTuxonicePatch { - version = "2013-11-07"; - kernelVersion = "3.10.18"; - sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; - }; - grsecurity_testing = throw '' Upstream has ceased free support for grsecurity/PaX. @@ -87,11 +59,6 @@ rec { for more information. ''; - crc_regression = - { name = "crc-backport-regression"; - patch = ./crc-regression.patch; - }; - genksyms_fix_segfault = { name = "genksyms-fix-segfault"; patch = ./genksyms-fix-segfault.patch; @@ -107,47 +74,8 @@ rec { patch = ./chromiumos-patches/no-link-restrictions.patch; }; - chromiumos_mfd_fix_dependency = - { name = "mfd_fix_dependency"; - patch = ./chromiumos-patches/mfd-fix-dependency.patch; - }; - - hiddev_CVE_2016_5829 = - { name = "hiddev_CVE_2016_5829"; - patch = fetchpatch { - url = "https://sources.debian.net/data/main/l/linux/4.6.3-1/debian/patches/bugfix/all/HID-hiddev-validate-num_values-for-HIDIOCGUSAGES-HID.patch"; - sha256 = "14rm1qr87p7a5prz8g5fwbpxzdp3ighj095x8rvhm8csm20wspyy"; - }; - }; - cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; - lguest_entry-linkage = - { name = "lguest-asmlinkage.patch"; - patch = fetchpatch { - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git" - + "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52"; - sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc"; - }; - }; - - packet_fix_race_condition_CVE_2016_8655 = - { name = "packet_fix_race_condition_CVE_2016_8655.patch"; - patch = fetchpatch { - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=84ac7260236a49c79eede91617700174c2c19b0c"; - sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki"; - }; - }; - - panic_on_icmp6_frag_CVE_2016_9919 = rec - { name = "panic_on_icmp6_frag_CVE_2016_9919.patch"; - patch = fetchpatch { - inherit name; - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2"; - sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p"; - }; - }; - DCCP_double_free_vulnerability_CVE-2017-6074 = rec { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch"; patch = fetchpatch { diff --git a/pkgs/os-specific/linux/kernel/perf.diff b/pkgs/os-specific/linux/kernel/perf.diff deleted file mode 100644 index 88d0381784f..00000000000 --- a/pkgs/os-specific/linux/kernel/perf.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- perf/config/utilities.mak.orig 2014-01-25 14:55:32.573320370 +0000 -+++ perf/config/utilities.mak 2014-01-25 15:13:34.174337760 +0000 -@@ -186,9 +186,14 @@ - endif - TRY_CC_MSG=echo " CHK $(3)" 1>&2; - -+define newline -+ -+ -+endef -+ - try-cc = $(shell sh -c \ - 'TMP="$(OUTPUT)$(TMPOUT).$$$$"; \ - $(TRY_CC_MSG) \ -- echo "$(1)" | \ -+ echo -e "$(subst $(newline),\\n,$(1))" | tee _test.c | \ - $(CC) -x c - $(2) -o "$$TMP" $(TRY_CC_OUTPUT) && echo y; \ - rm -f "$$TMP"') diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index b6f1f7d9f8a..f01f3928950 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { preConfigure = '' cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile - ${optionalString (versionOlder kernel.version "3.13") "patch -p1 < ${./perf.diff}"} [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion export makeFlags="DESTDIR=$out $makeFlags" ''; diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch deleted file mode 100644 index 39150ad790d..00000000000 --- a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch +++ /dev/null @@ -1,1240 +0,0 @@ -From e64058be3b97c5bd3e034fc4ece21e306ef6f90b Mon Sep 17 00:00:00 2001 -From: Jay Vosburgh -Date: Wed, 1 Apr 2015 16:11:09 -0700 -Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3) - -Switch to a single tunnel for all mappings, this removes the limitations -on how many mappings each tunnel can handle, and therefore how many Fan -slices each local address may hold. - -NOTE: This introduces a new kernel netlink interface which needs updated -iproute2 support. - -BugLink: http://bugs.launchpad.net/bugs/1470091 -Signed-off-by: Jay Vosburgh -Signed-off-by: Andy Whitcroft -Signed-off-by: Tim Gardner - -Conflicts: - include/net/ip_tunnels.h ---- - include/net/ip_tunnels.h | 15 ++++ - include/uapi/linux/if_tunnel.h | 20 +++++ - net/ipv4/ip_tunnel.c | 7 +- - net/ipv4/ipip.c | 186 +++++++++++++++++++++++++++++++++++++++-- - 4 files changed, 222 insertions(+), 6 deletions(-) - -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 62a750a..47fec59 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -91,6 +91,19 @@ struct ip_tunnel_dst { - }; - - struct metadata_dst; -+/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16 -+ * underlay (10.88.0.0/16, for example). Multiple local addresses within -+ * the /16 may be used, but a particular overlay may not span -+ * multiple underlay subnets. -+ * -+ * We store one underlay, indexed by the overlay's high order octet. -+ */ -+#define FAN_OVERLAY_CNT 256 -+ -+struct ip_tunnel_fan { -+/* u32 __rcu *map;*/ -+ u32 map[FAN_OVERLAY_CNT]; -+}; - - struct ip_tunnel { - struct ip_tunnel __rcu *next; -@@ -123,6 +136,7 @@ struct ip_tunnel { - #endif - struct ip_tunnel_prl_entry __rcu *prl; /* potential router list */ - unsigned int prl_count; /* # of entries in PRL */ -+ struct ip_tunnel_fan fan; - int ip_tnl_net_id; - struct gro_cells gro_cells; - bool collect_md; -@@ -143,6 +157,7 @@ struct ip_tunnel { - #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) - - #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) -+#define TUNNEL_FAN __cpu_to_be16(0x4000) - - struct tnl_ptk_info { - __be16 flags; -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index af4de90..85a3e4b 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -57,6 +57,10 @@ enum { - IFLA_IPTUN_ENCAP_FLAGS, - IFLA_IPTUN_ENCAP_SPORT, - IFLA_IPTUN_ENCAP_DPORT, -+ -+ __IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */ -+ IFLA_IPTUN_FAN_MAP = 33, -+ - __IFLA_IPTUN_MAX, - }; - #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) -@@ -132,4 +136,20 @@ enum { - }; - - #define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) -+ -+enum { -+ IFLA_FAN_UNSPEC, -+ IFLA_FAN_MAPPING, -+ __IFLA_FAN_MAX, -+}; -+ -+#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) -+ -+struct ip_tunnel_fan_map { -+ __be32 underlay; -+ __be32 overlay; -+ __u16 underlay_prefix; -+ __u16 overlay_prefix; -+}; -+ - #endif /* _UAPI_IF_TUNNEL_H_ */ -diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index cbb51f3..7a6174b 100644 ---- a/net/ipv4/ip_tunnel.c -+++ b/net/ipv4/ip_tunnel.c -@@ -1110,6 +1110,11 @@ out: - } - EXPORT_SYMBOL_GPL(ip_tunnel_newlink); - -+static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ - int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm *p) - { -@@ -1119,7 +1124,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); - - if (dev == itn->fb_tunnel_dev) -- return -EINVAL; -+ return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; - - t = ip_tunnel_find(itn, p, dev->type); - -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index a09fb0d..56e8984 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -107,6 +107,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -208,6 +209,40 @@ drop: - return 0; - } - -+static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) -+{ -+ return tunnel->parms.i_flags & TUNNEL_FAN; -+} -+ -+/* -+ * Determine fan tunnel endpoint to send packet to, based on the inner IP -+ * address. For an overlay (inner) address Y.A.B.C, the transformation is -+ * F.G.A.B, where "F" and "G" are the first two octets of the underlay -+ * network (the network portion of a /16), "A" and "B" are the low order -+ * two octets of the underlay network host (the host portion of a /16), -+ * and "Y" is a configured first octet of the overlay network. -+ * -+ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -+ * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to -+ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts -+ * overlay network 99.6.7.0/24. -+ */ -+static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) -+{ -+ unsigned int overlay; -+ u32 daddr, underlay; -+ -+ daddr = ntohl(ip_hdr(skb)->daddr); -+ overlay = daddr >> 24; -+ underlay = tunnel->fan.map[overlay]; -+ if (!underlay) -+ return -EINVAL; -+ -+ *iph = tunnel->parms.iph; -+ iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); -+ return 0; -+} -+ - /* - * This function assumes it is being called from dev_queue_xmit() - * and that skb is filled properly by that function. -@@ -215,7 +250,8 @@ drop: - static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - { - struct ip_tunnel *tunnel = netdev_priv(dev); -- const struct iphdr *tiph = &tunnel->parms.iph; -+ const struct iphdr *tiph; -+ struct iphdr fiph; - - if (unlikely(skb->protocol != htons(ETH_P_IP))) - goto tx_error; -@@ -224,6 +260,14 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -+ if (ipip_tunnel_is_fan(tunnel)) { -+ if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) -+ goto tx_error; -+ tiph = &fiph; -+ } else { -+ tiph = &tunnel->parms.iph; -+ } -+ - skb_set_inner_ipproto(skb, IPPROTO_IPIP); - - ip_tunnel_xmit(skb, dev, tiph, tiph->protocol); -@@ -375,21 +419,88 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - -+static void ipip_fan_free_map(struct ip_tunnel *t) -+{ -+ memset(&t->fan.map, 0, sizeof(t->fan.map)); -+} -+ -+static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) -+{ -+ u32 overlay, overlay_mask, underlay, underlay_mask; -+ -+ if ((map->underlay_prefix && map->underlay_prefix != 16) || -+ (map->overlay_prefix && map->overlay_prefix != 8)) -+ return -EINVAL; -+ -+ overlay = ntohl(map->overlay); -+ overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); -+ -+ underlay = ntohl(map->underlay); -+ underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); -+ -+ if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) -+ return -EINVAL; -+ -+ if (!(overlay & overlay_mask) && (underlay & underlay_mask)) -+ return -EINVAL; -+ -+ t->parms.i_flags |= TUNNEL_FAN; -+ -+ /* Special case: overlay 0 and underlay 0 clears all mappings */ -+ if (!overlay && !underlay) { -+ ipip_fan_free_map(t); -+ return 0; -+ } -+ -+ overlay >>= (32 - map->overlay_prefix); -+ t->fan.map[overlay] = underlay; -+ -+ return 0; -+} -+ -+ -+static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, -+ struct ip_tunnel_parm *parms) -+{ -+ struct ip_tunnel_fan_map *map; -+ struct nlattr *attr; -+ int rem, rv; -+ -+ if (!data[IFLA_IPTUN_FAN_MAP]) -+ return 0; -+ -+ if (parms->iph.daddr) -+ return -EINVAL; -+ -+ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { -+ map = nla_data(attr); -+ rv = ipip_fan_set_map(t, map); -+ if (rv) -+ return rv; -+ } -+ -+ return 0; -+} -+ - static int ipip_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - return ip_tunnel_newlink(dev, tb, &p); - } - -@@ -398,16 +509,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[], - { - struct ip_tunnel_parm p; - struct ip_tunnel_encap ipencap; -+ struct ip_tunnel *t = netdev_priv(dev); -+ int err; - - if (ipip_netlink_encap_parms(data, &ipencap)) { -- struct ip_tunnel *t = netdev_priv(dev); -- int err = ip_tunnel_encap_setup(t, &ipencap); -+ err = ip_tunnel_encap_setup(t, &ipencap); - - if (err < 0) - return err; - } - - ipip_netlink_parms(data, &p); -+ err = ipip_netlink_fan(data, t, &p); -+ if (err < 0) -+ return err; - - if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) || - (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr)) -@@ -439,6 +554,8 @@ static size_t ipip_get_size(const struct net_device *dev) - nla_total_size(2) + - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + -+ /* IFLA_IPTUN_FAN_MAP */ -+ nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + - 0; - } - -@@ -466,6 +583,29 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -+ if (tunnel->parms.i_flags & TUNNEL_FAN) { -+ struct nlattr *fan_nest; -+ int i; -+ -+ fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); -+ if (!fan_nest) -+ goto nla_put_failure; -+ for (i = 0; i < 256; i++) { -+ if (tunnel->fan.map[i]) { -+ struct ip_tunnel_fan_map map; -+ -+ map.underlay = htonl(tunnel->fan.map[i]); -+ map.underlay_prefix = 16; -+ map.overlay = htonl(i << 24); -+ map.overlay_prefix = 8; -+ if (nla_put(skb, IFLA_FAN_MAPPING, -+ sizeof(map), &map)) -+ goto nla_put_failure; -+ } -+ } -+ nla_nest_end(skb, fan_nest); -+ } -+ - return 0; - - nla_put_failure: -@@ -483,6 +623,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { - [IFLA_IPTUN_ENCAP_FLAGS] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_SPORT] = { .type = NLA_U16 }, - [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, -+ -+ [__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX] = { .type = NLA_BINARY }, -+ [IFLA_IPTUN_FAN_MAP] = { .type = NLA_NESTED }, - }; - - static struct rtnl_link_ops ipip_link_ops __read_mostly = { -@@ -523,6 +666,23 @@ static struct pernet_operations ipip_net_ops = { - .size = sizeof(struct ip_tunnel_net), - }; - -+#ifdef CONFIG_SYSCTL -+static struct ctl_table_header *ipip_fan_header; -+static unsigned int ipip_fan_version = 3; -+ -+static struct ctl_table ipip_fan_sysctls[] = { -+ { -+ .procname = "version", -+ .data = &ipip_fan_version, -+ .maxlen = sizeof(ipip_fan_version), -+ .mode = 0444, -+ .proc_handler = proc_dointvec, -+ }, -+ {}, -+}; -+ -+#endif /* CONFIG_SYSCTL */ -+ - static int __init ipip_init(void) - { - int err; -@@ -541,9 +701,22 @@ static int __init ipip_init(void) - if (err < 0) - goto rtnl_link_failed; - -+#ifdef CONFIG_SYSCTL -+ ipip_fan_header = register_net_sysctl(&init_net, "net/fan", -+ ipip_fan_sysctls); -+ if (!ipip_fan_header) { -+ err = -ENOMEM; -+ goto sysctl_failed; -+ } -+#endif /* CONFIG_SYSCTL */ -+ - out: - return err; - -+#ifdef CONFIG_SYSCTL -+sysctl_failed: -+ rtnl_link_unregister(&ipip_link_ops); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_failed: - xfrm4_tunnel_deregister(&ipip_handler, AF_INET); - xfrm_tunnel_failed: -@@ -553,6 +726,9 @@ xfrm_tunnel_failed: - - static void __exit ipip_fini(void) - { -+#ifdef CONFIG_SYSCTL -+ unregister_net_sysctl_table(ipip_fan_header); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_unregister(&ipip_link_ops); - if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET)) - pr_info("%s: can't deregister tunnel\n", __func__); --- -2.7.4 - -From 14aba409d044e3a314c09c650e1c42de699700b8 Mon Sep 17 00:00:00 2001 -From: Jay Vosburgh -Date: Wed, 11 Nov 2015 13:04:50 +0000 -Subject: [PATCH] UBUNTU: SAUCE: fan: add VXLAN implementation - -Generify the fan mapping support and utilise that to implement fan -mappings over vxlan transport. - -Expose the existance of this functionality (when the module is loaded) -via an additional sysctl marker. - -Signed-off-by: Jay Vosburgh -[apw@canonical.com: added feature marker for fan over vxlan.] -Signed-off-by: Andy Whitcroft ---- - drivers/net/vxlan.c | 245 +++++++++++++++++++++++++++++++++++++++++ - include/net/ip_tunnels.h | 19 +++- - include/net/vxlan.h | 2 + - include/uapi/linux/if_link.h | 1 + - include/uapi/linux/if_tunnel.h | 2 +- - net/ipv4/ip_tunnel.c | 7 +- - net/ipv4/ipip.c | 242 +++++++++++++++++++++++++++++++--------- - 7 files changed, 453 insertions(+), 65 deletions(-) - -diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c -index 405a7b6..a17cfd0 100644 ---- a/drivers/net/vxlan.c -+++ b/drivers/net/vxlan.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -106,6 +107,167 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs) - ip_tunnel_collect_metadata(); - } - -+static struct ip_fan_map *vxlan_fan_find_map(struct vxlan_dev *vxlan, __be32 daddr) -+{ -+ struct ip_fan_map *fan_map; -+ -+ rcu_read_lock(); -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ if (fan_map->overlay == -+ (daddr & inet_make_mask(fan_map->overlay_prefix))) { -+ rcu_read_unlock(); -+ return fan_map; -+ } -+ } -+ rcu_read_unlock(); -+ -+ return NULL; -+} -+ -+static void vxlan_fan_flush_map(struct vxlan_dev *vxlan) -+{ -+ struct ip_fan_map *fan_map; -+ -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ } -+} -+ -+static int vxlan_fan_del_map(struct vxlan_dev *vxlan, __be32 overlay) -+{ -+ struct ip_fan_map *fan_map; -+ -+ fan_map = vxlan_fan_find_map(vxlan, overlay); -+ if (!fan_map) -+ return -ENOENT; -+ -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ -+ return 0; -+} -+ -+static int vxlan_fan_add_map(struct vxlan_dev *vxlan, struct ifla_fan_map *map) -+{ -+ __be32 overlay_mask, underlay_mask; -+ struct ip_fan_map *fan_map; -+ -+ overlay_mask = inet_make_mask(map->overlay_prefix); -+ underlay_mask = inet_make_mask(map->underlay_prefix); -+ -+ netdev_dbg(vxlan->dev, "vfam: map: o %x/%d u %x/%d om %x um %x\n", -+ map->overlay, map->overlay_prefix, -+ map->underlay, map->underlay_prefix, -+ overlay_mask, underlay_mask); -+ -+ if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask)) -+ return -EINVAL; -+ -+ if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask)) -+ return -EINVAL; -+ -+ /* Special case: overlay 0 and underlay 0: flush all mappings */ -+ if (!map->overlay && !map->underlay) { -+ vxlan_fan_flush_map(vxlan); -+ return 0; -+ } -+ -+ /* Special case: overlay set and underlay 0: clear map for overlay */ -+ if (!map->underlay) -+ return vxlan_fan_del_map(vxlan, map->overlay); -+ -+ if (vxlan_fan_find_map(vxlan, map->overlay)) -+ return -EEXIST; -+ -+ fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL); -+ fan_map->underlay = map->underlay; -+ fan_map->overlay = map->overlay; -+ fan_map->underlay_prefix = map->underlay_prefix; -+ fan_map->overlay_mask = ntohl(overlay_mask); -+ fan_map->overlay_prefix = map->overlay_prefix; -+ -+ list_add_tail_rcu(&fan_map->list, &vxlan->fan.fan_maps); -+ -+ return 0; -+} -+ -+static int vxlan_parse_fan_map(struct nlattr *data[], struct vxlan_dev *vxlan) -+{ -+ struct ifla_fan_map *map; -+ struct nlattr *attr; -+ int rem, rv; -+ -+ nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { -+ map = nla_data(attr); -+ rv = vxlan_fan_add_map(vxlan, map); -+ if (rv) -+ return rv; -+ } -+ -+ return 0; -+} -+ -+static int vxlan_fan_build_rdst(struct vxlan_dev *vxlan, struct sk_buff *skb, -+ struct vxlan_rdst *fan_rdst) -+{ -+ struct ip_fan_map *f_map; -+ union vxlan_addr *va; -+ u32 daddr, underlay; -+ struct arphdr *arp; -+ void *arp_ptr; -+ struct ethhdr *eth; -+ struct iphdr *iph; -+ -+ eth = eth_hdr(skb); -+ switch (eth->h_proto) { -+ case htons(ETH_P_IP): -+ iph = ip_hdr(skb); -+ if (!iph) -+ return -EINVAL; -+ daddr = iph->daddr; -+ break; -+ case htons(ETH_P_ARP): -+ arp = arp_hdr(skb); -+ if (!arp) -+ return -EINVAL; -+ arp_ptr = arp + 1; -+ netdev_dbg(vxlan->dev, -+ "vfbr: arp sha %pM sip %pI4 tha %pM tip %pI4\n", -+ arp_ptr, arp_ptr + skb->dev->addr_len, -+ arp_ptr + skb->dev->addr_len + 4, -+ arp_ptr + (skb->dev->addr_len * 2) + 4); -+ arp_ptr += (skb->dev->addr_len * 2) + 4; -+ memcpy(&daddr, arp_ptr, 4); -+ break; -+ default: -+ netdev_dbg(vxlan->dev, "vfbr: unknown eth p %x\n", eth->h_proto); -+ return -EINVAL; -+ } -+ -+ f_map = vxlan_fan_find_map(vxlan, daddr); -+ if (!f_map) -+ return -EINVAL; -+ -+ daddr = ntohl(daddr); -+ underlay = ntohl(f_map->underlay); -+ if (!underlay) -+ return -EINVAL; -+ -+ memset(fan_rdst, 0, sizeof(*fan_rdst)); -+ va = &fan_rdst->remote_ip; -+ va->sa.sa_family = AF_INET; -+ fan_rdst->remote_vni = vxlan->default_dst.remote_vni; -+ va->sin.sin_addr.s_addr = htonl(underlay | -+ ((daddr & ~f_map->overlay_mask) >> -+ (32 - f_map->overlay_prefix - -+ (32 - f_map->underlay_prefix)))); -+ netdev_dbg(vxlan->dev, "vfbr: daddr %x ul %x dst %x\n", -+ daddr, underlay, va->sin.sin_addr.s_addr); -+ -+ return 0; -+} -+ - #if IS_ENABLED(CONFIG_IPV6) - static inline - bool vxlan_addr_equal(const union vxlan_addr *a, const union vxlan_addr *b) -@@ -2029,6 +2191,13 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, - goto rt_tx_error; - } - -+ if (fan_has_map(&vxlan->fan) && rt->rt_flags & RTCF_LOCAL) { -+ netdev_dbg(dev, "discard fan to localhost %pI4\n", -+ &dst->sin.sin_addr.s_addr); -+ ip_rt_put(rt); -+ goto tx_free; -+ } -+ - /* Bypass encapsulation if the destination is local */ - if (rt->rt_flags & RTCF_LOCAL && - !(rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) { -@@ -2169,6 +2338,20 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) - return NETDEV_TX_OK; - } - -+ if (fan_has_map(&vxlan->fan)) { -+ struct vxlan_rdst fan_rdst; -+ -+ netdev_dbg(vxlan->dev, "vxlan_xmit p %x d %pM\n", -+ eth->h_proto, eth->h_dest); -+ if (vxlan_fan_build_rdst(vxlan, skb, &fan_rdst)) { -+ dev->stats.tx_dropped++; -+ kfree_skb(skb); -+ return NETDEV_TX_OK; -+ } -+ vxlan_xmit_one(skb, dev, &fan_rdst, 0); -+ return NETDEV_TX_OK; -+ } -+ - f = vxlan_find_mac(vxlan, eth->h_dest); - did_rsc = false; - -@@ -2532,6 +2715,8 @@ static void vxlan_setup(struct net_device *dev) - - for (h = 0; h < FDB_HASH_SIZE; ++h) - INIT_HLIST_HEAD(&vxlan->fdb_head[h]); -+ -+ INIT_LIST_HEAD(&vxlan->fan.fan_maps); - } - - static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = { -@@ -2881,6 +3066,7 @@ EXPORT_SYMBOL_GPL(vxlan_dev_create); - static int vxlan_newlink(struct net *src_net, struct net_device *dev, - struct nlattr *tb[], struct nlattr *data[]) - { -+ struct vxlan_dev *vxlan = netdev_priv(dev); - struct vxlan_config conf; - int err; - -@@ -2899,6 +3085,12 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev, - conf.remote_ip.sa.sa_family = AF_INET6; - } - -+ if (data[IFLA_VXLAN_FAN_MAP]) { -+ err = vxlan_parse_fan_map(data, vxlan); -+ if (err) -+ return err; -+ } -+ - if (data[IFLA_VXLAN_LOCAL]) { - conf.saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]); - conf.saddr.sa.sa_family = AF_INET; -@@ -3037,6 +3229,7 @@ static size_t vxlan_get_size(const struct net_device *dev) - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_UDP_ZERO_CSUM6_RX */ - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_TX */ - nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_RX */ -+ nla_total_size(sizeof(struct ip_fan_map) * 256) + - 0; - } - -@@ -3083,6 +3276,26 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev) - } - } - -+ if (fan_has_map(&vxlan->fan)) { -+ struct nlattr *fan_nest; -+ struct ip_fan_map *fan_map; -+ -+ fan_nest = nla_nest_start(skb, IFLA_VXLAN_FAN_MAP); -+ if (!fan_nest) -+ goto nla_put_failure; -+ list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) { -+ struct ifla_fan_map map; -+ -+ map.underlay = fan_map->underlay; -+ map.underlay_prefix = fan_map->underlay_prefix; -+ map.overlay = fan_map->overlay; -+ map.overlay_prefix = fan_map->overlay_prefix; -+ if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map)) -+ goto nla_put_failure; -+ } -+ nla_nest_end(skb, fan_nest); -+ } -+ - if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->cfg.ttl) || - nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan->cfg.tos) || - nla_put_u8(skb, IFLA_VXLAN_LEARNING, -@@ -3201,6 +3414,22 @@ static __net_init int vxlan_init_net(struct net *net) - return 0; - } - -+#ifdef CONFIG_SYSCTL -+static struct ctl_table_header *vxlan_fan_header; -+static unsigned int vxlan_fan_version = 4; -+ -+static struct ctl_table vxlan_fan_sysctls[] = { -+ { -+ .procname = "vxlan", -+ .data = &vxlan_fan_version, -+ .maxlen = sizeof(vxlan_fan_version), -+ .mode = 0444, -+ .proc_handler = proc_dointvec, -+ }, -+ {}, -+}; -+#endif /* CONFIG_SYSCTL */ -+ - static void __net_exit vxlan_exit_net(struct net *net) - { - struct vxlan_net *vn = net_generic(net, vxlan_net_id); -@@ -3256,7 +3485,20 @@ static int __init vxlan_init_module(void) - if (rc) - goto out3; - -+#ifdef CONFIG_SYSCTL -+ vxlan_fan_header = register_net_sysctl(&init_net, "net/fan", -+ vxlan_fan_sysctls); -+ if (!vxlan_fan_header) { -+ rc = -ENOMEM; -+ goto sysctl_failed; -+ } -+#endif /* CONFIG_SYSCTL */ -+ - return 0; -+#ifdef CONFIG_SYSCTL -+sysctl_failed: -+ rtnl_link_unregister(&vxlan_link_ops); -+#endif /* CONFIG_SYSCTL */ - out3: - unregister_netdevice_notifier(&vxlan_notifier_block); - out2: -@@ -3269,6 +3511,9 @@ late_initcall(vxlan_init_module); - - static void __exit vxlan_cleanup_module(void) - { -+#ifdef CONFIG_SYSCTL -+ unregister_net_sysctl_table(vxlan_fan_header); -+#endif /* CONFIG_SYSCTL */ - rtnl_link_unregister(&vxlan_link_ops); - unregister_netdevice_notifier(&vxlan_notifier_block); - destroy_workqueue(vxlan_wq); -diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h -index 47fec59..28a38e5 100644 ---- a/include/net/ip_tunnels.h -+++ b/include/net/ip_tunnels.h -@@ -100,9 +100,18 @@ struct metadata_dst; - */ - #define FAN_OVERLAY_CNT 256 - -+struct ip_fan_map { -+ __be32 underlay; -+ __be32 overlay; -+ u16 underlay_prefix; -+ u16 overlay_prefix; -+ u32 overlay_mask; -+ struct list_head list; -+ struct rcu_head rcu; -+}; -+ - struct ip_tunnel_fan { --/* u32 __rcu *map;*/ -- u32 map[FAN_OVERLAY_CNT]; -+ struct list_head fan_maps; - }; - - struct ip_tunnel { -@@ -157,7 +166,11 @@ struct ip_tunnel { - #define TUNNEL_VXLAN_OPT __cpu_to_be16(0x1000) - - #define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT) --#define TUNNEL_FAN __cpu_to_be16(0x4000) -+ -+static inline int fan_has_map(const struct ip_tunnel_fan *fan) -+{ -+ return !list_empty(&fan->fan_maps); -+} - - struct tnl_ptk_info { - __be16 flags; -diff --git a/include/net/vxlan.h b/include/net/vxlan.h -index e289ada..542f421 100644 ---- a/include/net/vxlan.h -+++ b/include/net/vxlan.h -@@ -161,6 +161,8 @@ struct vxlan_dev { - struct vxlan_rdst default_dst; /* default destination */ - u32 flags; /* VXLAN_F_* in vxlan.h */ - -+ struct ip_tunnel_fan fan; -+ - struct timer_list age_timer; - spinlock_t hash_lock; - unsigned int addrcnt; -diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h -index 5ad5737..6cde3bf 100644 ---- a/include/uapi/linux/if_link.h -+++ b/include/uapi/linux/if_link.h -@@ -443,6 +443,7 @@ enum { - IFLA_VXLAN_GBP, - IFLA_VXLAN_REMCSUM_NOPARTIAL, - IFLA_VXLAN_COLLECT_METADATA, -+ IFLA_VXLAN_FAN_MAP = 33, - __IFLA_VXLAN_MAX - }; - #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index 85a3e4b..d36b150 100644 ---- a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -145,7 +145,7 @@ enum { - - #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1) - --struct ip_tunnel_fan_map { -+struct ifla_fan_map { - __be32 underlay; - __be32 overlay; - __u16 underlay_prefix; -diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c -index 7a6174b..c821bf1 100644 ---- a/net/ipv4/ip_tunnel.c -+++ b/net/ipv4/ip_tunnel.c -@@ -1110,11 +1110,6 @@ out: - } - EXPORT_SYMBOL_GPL(ip_tunnel_newlink); - --static int ip_tunnel_is_fan(struct ip_tunnel *tunnel) --{ -- return tunnel->parms.i_flags & TUNNEL_FAN; --} -- - int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_parm *p) - { -@@ -1124,7 +1119,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[], - struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id); - - if (dev == itn->fb_tunnel_dev) -- return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL; -+ return fan_has_map(&tunnel->fan) ? 0 : -EINVAL; - - t = ip_tunnel_find(itn, p, dev->type); - -diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index 56e8984..3877b0e 100644 ---- a/net/ipv4/ipip.c -+++ b/net/ipv4/ipip.c -@@ -108,6 +108,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -209,37 +210,144 @@ drop: - return 0; - } - --static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel) -+static struct ip_fan_map *ipip_fan_find_map(struct ip_tunnel *t, __be32 daddr) - { -- return tunnel->parms.i_flags & TUNNEL_FAN; -+ struct ip_fan_map *fan_map; -+ -+ rcu_read_lock(); -+ list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) { -+ if (fan_map->overlay == -+ (daddr & inet_make_mask(fan_map->overlay_prefix))) { -+ rcu_read_unlock(); -+ return fan_map; -+ } -+ } -+ rcu_read_unlock(); -+ -+ return NULL; - } - --/* -- * Determine fan tunnel endpoint to send packet to, based on the inner IP -- * address. For an overlay (inner) address Y.A.B.C, the transformation is -- * F.G.A.B, where "F" and "G" are the first two octets of the underlay -- * network (the network portion of a /16), "A" and "B" are the low order -- * two octets of the underlay network host (the host portion of a /16), -- * and "Y" is a configured first octet of the overlay network. -+/* Determine fan tunnel endpoint to send packet to, based on the inner IP -+ * address. -+ * -+ * Given a /8 overlay and /16 underlay, for an overlay (inner) address -+ * Y.A.B.C, the transformation is F.G.A.B, where "F" and "G" are the first -+ * two octets of the underlay network (the network portion of a /16), "A" -+ * and "B" are the low order two octets of the underlay network host (the -+ * host portion of a /16), and "Y" is a configured first octet of the -+ * overlay network. -+ * -+ * E.g., underlay host 10.88.3.4/16 with an overlay of 99.0.0.0/8 would -+ * host overlay subnet 99.3.4.0/24. An overlay network datagram from -+ * 99.3.4.5 to 99.6.7.8, would be directed to underlay host 10.88.6.7, -+ * which hosts overlay network subnet 99.6.7.0/24. This transformation is -+ * described in detail further below. -+ * -+ * Using netmasks for the overlay and underlay other than /8 and /16, as -+ * shown above, can yield larger (or smaller) overlay subnets, with the -+ * trade-off of allowing fewer (or more) underlay hosts to participate. -+ * -+ * The size of each overlay network subnet is defined by the total of the -+ * network mask of the overlay plus the size of host portion of the -+ * underlay network. In the above example, /8 + /16 = /24. -+ * -+ * E.g., consider underlay host 10.99.238.5/20 and overlay 99.0.0.0/8. In -+ * this case, the network portion of the underlay is 10.99.224.0/20, and -+ * the host portion is 0.0.14.5 (12 bits). To determine the overlay -+ * network subnet, the 12 bits of host portion are left shifted 12 bits -+ * (/20 - /8) and ORed with the overlay subnet prefix. This yields an -+ * overlay subnet of 99.224.80/20, composed of 8 bits overlay, followed by -+ * 12 bits underlay. This yields 12 bits in the overlay network portion, -+ * allowing for 4094 addresses in each overlay network subnet. The -+ * trade-off is that fewer hosts may participate in the underlay network, -+ * as its host address size has shrunk from 16 bits (65534 addresses) in -+ * the first example to 12 bits (4094 addresses) here. -+ * -+ * For fewer hosts per overlay subnet (permitting a larger number of -+ * underlay hosts to participate), the underlay netmask may be made -+ * smaller. -+ * -+ * E.g., underlay host 10.111.1.2/12 (network 10.96.0.0/12, host portion -+ * is 0.15.1.2, 20 bits) with an overlay of 33.0.0.0/8 would left shift -+ * the 20 bits of host by 4 (so that it's highest order bit is adjacent to -+ * the lowest order bit of the /8 overlay). This yields an overlay subnet -+ * of 33.240.16.32/28 (8 bits overlay, 20 bits from the host portion of -+ * the underlay). This provides more addresses for the underlay network -+ * (approximately 2^20), but each host's segment of the overlay provides -+ * only 4 bits of addresses (14 usable). -+ * -+ * It is also possible to adjust the overlay subnet. -+ * -+ * For an overlay of 240.0.0.0/5 and underlay of 10.88.0.0/20, consider -+ * underlay host 10.88.129.2; the 12 bits of host, 0.0.1.2, are left -+ * shifted 15 bits (/20 - /5), yielding an overlay network of -+ * 240.129.0.0/17. An underlay host of 10.88.244.215 would yield an -+ * overlay network of 242.107.128.0/17. -+ * -+ * For an overlay of 100.64.0.0/10 and underlay of 10.224.220.0/24, for -+ * underlay host 10.224.220.10, the underlay host portion (.10) is left -+ * shifted 14 bits, yielding an overlay network subnet of 100.66.128.0/18. -+ * This would permit 254 addresses on the underlay, with each overlay -+ * segment providing approximately 2^14 - 2 addresses (16382). -+ * -+ * For packets being encapsulated, the overlay network destination IP -+ * address is deconstructed into its overlay and underlay-derived -+ * portions. The underlay portion (determined by the overlay mask and -+ * overlay subnet mask) is right shifted according to the size of the -+ * underlay network mask. This value is then ORed with the network -+ * portion of the underlay network to produce the underlay network -+ * destination for the encapsulated datagram. -+ * -+ * For example, using the initial example of underlay 10.88.3.4/16 and -+ * overlay 99.0.0.0/8, with underlay host 10.88.3.4/16 providing overlay -+ * subnet 99.3.4.0/24 with specfic host 99.3.4.5. A datagram from -+ * 99.3.4.5 to 99.6.7.8 would first have the underlay host derived portion -+ * of the address extracted. This is a number of bits equal to underlay -+ * network host portion. In the destination address, the highest order of -+ * these bits is one bit lower than the lowest order bit from the overlay -+ * network mask. -+ * -+ * Using the sample value, 99.6.7.8, the overlay mask is /8, and the -+ * underlay mask is /16 (leaving 16 bits for the host portion). The bits -+ * to be shifted are the middle two octets, 0.6.7.0, as this is 99.6.7.8 -+ * ANDed with the mask 0x00ffff00 (which is 16 bits, the highest order of -+ * which is 1 bit lower than the lowest order overlay address bit). - * -- * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay -- * subnet 99.3.4.0/24. An overlay network datagram from 99.3.4.5 to -- * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts -- * overlay network 99.6.7.0/24. -+ * These octets, 0.6.7.0, are then right shifted 8 bits, yielding 0.0.6.7. -+ * This value is then ORed with the underlay network portion, -+ * 10.88.0.0/16, providing 10.88.6.7 as the final underlay destination for -+ * the encapuslated datagram. -+ * -+ * Another transform using the final example: overlay 100.64.0.0/10 and -+ * underlay 10.224.220.0/24. Consider overlay address 100.66.128.1 -+ * sending a datagram to 100.66.200.5. In this case, 8 bits (the host -+ * portion size of 10.224.220.0/24) beginning after the 100.64/10 overlay -+ * prefix are masked off, yielding 0.2.192.0. This is right shifted 14 -+ * (32 - 10 - (32 - 24), i.e., the number of bits between the overlay -+ * network portion and the underlay host portion) bits, yielding 0.0.0.11. -+ * This is ORed with the underlay network portion, 10.224.220.0/24, giving -+ * the underlay destination of 10.224.220.11 for overlay destination -+ * 100.66.200.5. - */ - static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph) - { -- unsigned int overlay; -+ struct ip_fan_map *f_map; - u32 daddr, underlay; - -+ f_map = ipip_fan_find_map(tunnel, ip_hdr(skb)->daddr); -+ if (!f_map) -+ return -ENOENT; -+ - daddr = ntohl(ip_hdr(skb)->daddr); -- overlay = daddr >> 24; -- underlay = tunnel->fan.map[overlay]; -+ underlay = ntohl(f_map->underlay); - if (!underlay) - return -EINVAL; - - *iph = tunnel->parms.iph; -- iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff)); -+ iph->daddr = htonl(underlay | -+ ((daddr & ~f_map->overlay_mask) >> -+ (32 - f_map->overlay_prefix - -+ (32 - f_map->underlay_prefix)))); - return 0; - } - -@@ -260,7 +368,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) - if (IS_ERR(skb)) - goto out; - -- if (ipip_tunnel_is_fan(tunnel)) { -+ if (fan_has_map(&tunnel->fan)) { - if (ipip_build_fan_iphdr(tunnel, skb, &fiph)) - goto tx_error; - tiph = &fiph; -@@ -325,6 +433,8 @@ static const struct net_device_ops ipip_netdev_ops = { - - static void ipip_tunnel_setup(struct net_device *dev) - { -+ struct ip_tunnel *t = netdev_priv(dev); -+ - dev->netdev_ops = &ipip_netdev_ops; - - dev->type = ARPHRD_TUNNEL; -@@ -336,6 +446,7 @@ static void ipip_tunnel_setup(struct net_device *dev) - dev->features |= IPIP_FEATURES; - dev->hw_features |= IPIP_FEATURES; - ip_tunnel_setup(dev, ipip_net_id); -+ INIT_LIST_HEAD(&t->fan.fan_maps); - } - - static int ipip_tunnel_init(struct net_device *dev) -@@ -419,41 +530,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[], - return ret; - } - --static void ipip_fan_free_map(struct ip_tunnel *t) -+static void ipip_fan_flush_map(struct ip_tunnel *t) - { -- memset(&t->fan.map, 0, sizeof(t->fan.map)); -+ struct ip_fan_map *fan_map; -+ -+ list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) { -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); -+ } - } - --static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) -+static int ipip_fan_del_map(struct ip_tunnel *t, __be32 overlay) - { -- u32 overlay, overlay_mask, underlay, underlay_mask; -+ struct ip_fan_map *fan_map; - -- if ((map->underlay_prefix && map->underlay_prefix != 16) || -- (map->overlay_prefix && map->overlay_prefix != 8)) -- return -EINVAL; -+ fan_map = ipip_fan_find_map(t, overlay); -+ if (!fan_map) -+ return -ENOENT; -+ -+ list_del_rcu(&fan_map->list); -+ kfree_rcu(fan_map, rcu); - -- overlay = ntohl(map->overlay); -- overlay_mask = ntohl(inet_make_mask(map->overlay_prefix)); -+ return 0; -+} - -- underlay = ntohl(map->underlay); -- underlay_mask = ntohl(inet_make_mask(map->underlay_prefix)); -+static int ipip_fan_add_map(struct ip_tunnel *t, struct ifla_fan_map *map) -+{ -+ __be32 overlay_mask, underlay_mask; -+ struct ip_fan_map *fan_map; - -- if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask)) -- return -EINVAL; -+ overlay_mask = inet_make_mask(map->overlay_prefix); -+ underlay_mask = inet_make_mask(map->underlay_prefix); - -- if (!(overlay & overlay_mask) && (underlay & underlay_mask)) -+ if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask)) - return -EINVAL; - -- t->parms.i_flags |= TUNNEL_FAN; -+ if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask)) -+ return -EINVAL; - -- /* Special case: overlay 0 and underlay 0 clears all mappings */ -- if (!overlay && !underlay) { -- ipip_fan_free_map(t); -+ /* Special case: overlay 0 and underlay 0: flush all mappings */ -+ if (!map->overlay && !map->underlay) { -+ ipip_fan_flush_map(t); - return 0; - } -+ -+ /* Special case: overlay set and underlay 0: clear map for overlay */ -+ if (!map->underlay) -+ return ipip_fan_del_map(t, map->overlay); -+ -+ if (ipip_fan_find_map(t, map->overlay)) -+ return -EEXIST; -+ -+ fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL); -+ fan_map->underlay = map->underlay; -+ fan_map->overlay = map->overlay; -+ fan_map->underlay_prefix = map->underlay_prefix; -+ fan_map->overlay_mask = ntohl(overlay_mask); -+ fan_map->overlay_prefix = map->overlay_prefix; - -- overlay >>= (32 - map->overlay_prefix); -- t->fan.map[overlay] = underlay; -+ list_add_tail_rcu(&fan_map->list, &t->fan.fan_maps); - - return 0; - } -@@ -462,7 +597,7 @@ static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map) - static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, - struct ip_tunnel_parm *parms) - { -- struct ip_tunnel_fan_map *map; -+ struct ifla_fan_map *map; - struct nlattr *attr; - int rem, rv; - -@@ -474,7 +609,7 @@ static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t, - - nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) { - map = nla_data(attr); -- rv = ipip_fan_set_map(t, map); -+ rv = ipip_fan_add_map(t, map); - if (rv) - return rv; - } -@@ -555,7 +690,7 @@ static size_t ipip_get_size(const struct net_device *dev) - /* IFLA_IPTUN_ENCAP_DPORT */ - nla_total_size(2) + - /* IFLA_IPTUN_FAN_MAP */ -- nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 + -+ nla_total_size(sizeof(struct ifla_fan_map)) * 256 + - 0; - } - -@@ -583,25 +718,22 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev) - tunnel->encap.flags)) - goto nla_put_failure; - -- if (tunnel->parms.i_flags & TUNNEL_FAN) { -+ if (fan_has_map(&tunnel->fan)) { - struct nlattr *fan_nest; -- int i; -+ struct ip_fan_map *fan_map; - - fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP); - if (!fan_nest) - goto nla_put_failure; -- for (i = 0; i < 256; i++) { -- if (tunnel->fan.map[i]) { -- struct ip_tunnel_fan_map map; -- -- map.underlay = htonl(tunnel->fan.map[i]); -- map.underlay_prefix = 16; -- map.overlay = htonl(i << 24); -- map.overlay_prefix = 8; -- if (nla_put(skb, IFLA_FAN_MAPPING, -- sizeof(map), &map)) -- goto nla_put_failure; -- } -+ list_for_each_entry_rcu(fan_map, &tunnel->fan.fan_maps, list) { -+ struct ifla_fan_map map; -+ -+ map.underlay = fan_map->underlay; -+ map.underlay_prefix = fan_map->underlay_prefix; -+ map.overlay = fan_map->overlay; -+ map.overlay_prefix = fan_map->overlay_prefix; -+ if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map)) -+ goto nla_put_failure; - } - nla_nest_end(skb, fan_nest); - } --- -2.7.4 - diff --git a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch b/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch deleted file mode 100644 index cfa8009e71e..00000000000 --- a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 7415cb7b31569e9266229d4ebc79ccec4841ab04 Mon Sep 17 00:00:00 2001 -From: Serge Hallyn -Date: Fri, 7 Feb 2014 09:32:46 -0600 -Subject: [PATCH] UBUNTU: SAUCE: Overlayfs: allow unprivileged mounts - -Unprivileged mounting, here, refers to root in a non-initial user -namespace performing the mount. In particular, it requires -CAP_SYS_ADMIN toward the task's mounts namespace, alleviating -the concerns of manipulating mount environment for setuid-root -binaries on the host. - -We refuse unprivileged mounting of most filesystem types because -we do not trust the in-kernel superblock parsers to correctly -handle malicious input. - -However, overlayfs does not parse any user-provided data other -than the pathnames passed in. Therefore unprivileged mounting -of overlayfs should be safe. - -Allowing unprivileged mounting of overlayfs filesystems would -allow Ubuntu Trusty users to create overlayfs-based container -snapshots, which would be a huge usability improvement. - -This patch enables unprivileged mounting of overlayfs. - -I tested a few simple combinations, and found that, when -doing (the equivalent of) - -mount -t overlayfs -oupperdir=u,lowerdir=l l t - -(u for upper, l for lower, t for target), - -1. overlayfs mount is always allowed, regardless of ownership -of u, l, or t. However - -2. Creation of new files is allowed so long as u is owned by - T. Otherwise, regardless of ownerships of l and t it is - denied. (This is expected; t was the mountpoint and - 'disapears', so its ownership is irrelevant) - -3. modification of a file 'hithere' which is in l but not yet - in u, and which is not owned by T, is not allowed, even if - writes to u are allowed. This may be a bug in overlayfs, - but it is safe behavior. It also will not cause a problem - for lxc since lxc will ensure that files are mapped into T's - namespace. - -Signed-off-by: Serge Hallyn -Signed-off-by: Tim Gardner -Signed-off-by: Andy Whitcroft ---- - fs/overlayfs/super.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c -index 9473e79..50890c2 100644 ---- a/fs/overlayfs/super.c -+++ b/fs/overlayfs/super.c -@@ -668,6 +668,7 @@ static struct file_system_type ovl_fs_type = { - .name = "overlayfs", - .mount = ovl_mount, - .kill_sb = kill_anon_super, -+ .fs_flags = FS_USERNS_MOUNT, - }; - MODULE_ALIAS_FS("overlayfs"); - --- -2.1.0.rc1 - From 897eec7d7965f87bf859066e21affd6f2fa6b828 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 19:12:14 +0200 Subject: [PATCH 124/213] linuxHeaders_2_{4,6}: remove --- pkgs/os-specific/linux/kernel-headers/2.4.nix | 54 ------------------- pkgs/top-level/all-packages.nix | 10 ---- 2 files changed, 64 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.4.nix diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix deleted file mode 100644 index 9457769f5ef..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/2.4.nix +++ /dev/null @@ -1,54 +0,0 @@ -{stdenv, fetchurl, perl, cross ? null}: - -assert cross == null -> stdenv.isLinux; - -let - version = "2.4.37.9"; - kernelHeadersBaseConfig = if cross == null then - stdenv.platform.kernelHeadersBaseConfig - else - cross.platform.kernelHeadersBaseConfig; -in - -stdenv.mkDerivation { - name = "linux-headers-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.4/linux-${version}.tar.bz2"; - sha256 = "08rca9lcb5l5w483hgaqk8pi2njd7cmwpkifjqxwlb3g8liz4r5g"; - }; - - targetConfig = if cross != null then cross.config else null; - - platform = - if cross != null then cross.platform.kernelArch else - if stdenv.system == "i686-linux" then "i386" else - if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.isArm then "arm" else - abort "don't know what the kernel include directory is called for this platform"; - - buildInputs = [perl]; - - patchPhase = '' - sed -i s,/bin/pwd,pwd, Makefile - ''; - - extraIncludeDirs = - if cross != null then - (if cross.arch == "powerpc" then ["ppc"] else []) - else if stdenv.system == "powerpc-linux" then ["ppc"] else []; - - buildPhase = '' - cp arch/$platform/${kernelHeadersBaseConfig} .config - make mrproper symlinks include/linux/{version,compile}.h \ - ARCH=$platform - yes "" | make oldconfig ARCH=$platform - ''; - - installPhase = '' - mkdir -p $out/include - cp -a include/{asm,asm-$platform,acpi,linux,pcmcia,scsi,video} \ - $out/include - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f06493f5741..7a8453e86fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12007,14 +12007,6 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; - linuxHeaders_2_4 = callPackage ../os-specific/linux/kernel-headers/2.4.nix { - cross = if targetPlatform != hostPlatform then targetPlatform else null; - }; - - linuxHeaders_2_6 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { - cross = if targetPlatform != hostPlatform then targetPlatform else null; - }; - linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { cross = if targetPlatform != hostPlatform then targetPlatform else null; }; @@ -12024,8 +12016,6 @@ with pkgs; if targetPlatform != hostPlatform then { # switch - "2.4" = linuxHeaders_2_4; - "2.6" = linuxHeaders_2_6; "4.4" = linuxHeaders_4_4; }.${targetPlatform.platform.kernelMajor} or (throw "Unknown linux kernel version") From f77825618f5407689ee348c17c8eea5edeed1d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 11 Aug 2017 19:09:38 +0200 Subject: [PATCH 125/213] ipfsapi: 0.4.5-pre -> 0.4.2.post1 This is not a downgrade, 0.4.5-pre was a unofficial version. --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ad10d47867..baf7d52cd16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6648,14 +6648,14 @@ in { ipfsapi = buildPythonPackage rec { name = "ipfsapi-${version}"; - version = "0.4.5-pre"; + version = "0.4.2.post1"; disabled = isPy26 || isPy27; src = pkgs.fetchFromGitHub { owner = "ipfs"; repo = "py-ipfs-api"; - rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f"; - sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126"; + rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61"; + sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; }; propagatedBuildInputs = with self; [ six requests ]; From e34ce9d1c551fb43742aada6bb43ccb1a52e64a1 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 10 Aug 2017 11:43:48 +0200 Subject: [PATCH 126/213] gnupg: 2.1.22 -> 2.1.23 This release in a RC for gnupg-2.2. The main difference as far as nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and `gpgv2` is called `gpgv`. This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs, but there might be some packaged software that internally use `gpg2` not handeled by this commit. See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html for full release information --- pkgs/applications/misc/gpg-mdp/default.nix | 4 ++-- .../networking/browsers/firefox-bin/update.nix | 4 ++-- .../networking/mailreaders/notmuch/default.nix | 8 ++++---- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- pkgs/os-specific/linux/tomb/default.nix | 3 +-- pkgs/tools/misc/debian-devscripts/default.nix | 4 ++-- pkgs/tools/misc/pipelight/default.nix | 2 +- pkgs/tools/misc/pipelight/pipelight.patch | 2 +- pkgs/tools/security/gnupg/1compat.nix | 4 ---- pkgs/tools/security/gnupg/21.nix | 4 ++-- pkgs/tools/security/gnupg/gpgkey2ssh-20.patch | 2 +- pkgs/tools/security/pius/default.nix | 2 +- 12 files changed, 18 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index fe58fa92d07..4143f6fde55 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -19,11 +19,11 @@ in stdenv.mkDerivation { --replace "alias echo=/bin/echo" "" substituteInPlace ./src/config.c \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" \ + --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \ --replace "/usr/bin/vi" "vi" substituteInPlace ./mdp.1 \ - --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" + --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" ''; # we add symlinks to the binary and man page with the name 'gpg-mdp', in case # the completely unrelated program also named 'mdp' is already installed. diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 3bcc2ab003c..ac3f7d1380c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -22,7 +22,7 @@ in writeScript "update-${name}" '' pushd ${basePath} HOME=`mktemp -d` - cat ${./firefox.key} | gpg2 --import + cat ${./firefox.key} | gpg --import tmpfile=`mktemp` url=${baseUrl} @@ -47,7 +47,7 @@ in writeScript "update-${name}" '' curl --silent -o $HOME/shasums "$url$version/SHA512SUMS" curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc" - gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums + gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums # this is a list of sha512 and tarballs for both arches shasums=`cat $HOME/shasums` diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index c53383b954e..606e5593593 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { find test -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ - -e "s|gpg |${gnupg}/bin/gpg2 |" \ - -e "s| gpg| ${gnupg}/bin/gpg2|" \ + -e "s|gpg |${gnupg}/bin/gpg |" \ + -e "s| gpg| ${gnupg}/bin/gpg|" \ -e "s|gpgsm |${gnupg}/bin/gpgsm |" \ -e "s| gpgsm| ${gnupg}/bin/gpgsm|" \ - -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg2|" \ + -e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \ "{}" ";" for src in \ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { emacs/notmuch-crypto.el do substituteInPlace "$src" \ - --replace \"gpg\" \"${gnupg}/bin/gpg2\" + --replace \"gpg\" \"${gnupg}/bin/gpg\" done ''; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 204c7443600..90e72b16802 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -242,7 +242,7 @@ in substituteInPlace lib/sup/crypto.rb \ --replace 'which gpg2' \ - '${which}/bin/which gpg2' + '${which}/bin/which gpg' ''; }; diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index f1347c197bf..2ef5d53b066 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { install -Dm755 tomb $out/bin/tomb install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1 - # it works fine with gnupg v2, but it looks for an executable named gpg - ln -s ${gnupg}/bin/gpg2 $out/bin/gpg + ln -s ${gnupg}/bin/gpg $out/bin/gpg wrapProgram $out/bin/tomb \ --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]} diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index cbc7a2e7e46..810bf06527b 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -27,10 +27,10 @@ in stdenv.mkDerivation rec { mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" find po4a scripts -type f -exec sed -r \ - -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \ + -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@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@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \ -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \ -i {} + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 16f50436990..c68d41532c2 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { --prefix=$out \ --moz-plugin-path=$out/${mozillaPluginPath} \ --wine-path=${wine_custom} \ - --gpg-exec=${gnupg}/bin/gpg2 \ + --gpg-exec=${gnupg}/bin/gpg \ --bash-interp=${bash}/bin/bash \ --downloader=${curl.bin}/bin/curl $configureFlags diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch index 66dd0fdab4c..fc6666f8f12 100644 --- a/pkgs/tools/misc/pipelight/pipelight.patch +++ b/pkgs/tools/misc/pipelight/pipelight.patch @@ -62,7 +62,7 @@ diff -urN pipelight.old/configure pipelight.new/configure - gpg_exec="/usr/bin/gpg" -fi +bash_interp=bash -+gpg_exec=gpg2 ++gpg_exec=gpg moz_plugin_path="" gcc_runtime_dlls="" so_mode="0644" diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index da700fe9f22..eadfbe230b3 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation { ${coreutils}/bin/rm $out/bin ${coreutils}/bin/mkdir -p $out/bin ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin - - # Add gpg->gpg2 and gpgv->gpgv2 symlinks - ${coreutils}/bin/ln -s gpg2 $out/bin/gpg - ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv ''; meta = gnupg.meta // { diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 2d43d3e977a..1523f3e159c 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.22"; + version = "2.1.23"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6"; + sha256 = "0xqd5nm4j3w9lwk35vg57gl2i8bfkmx7d24i44gkbscm2lwpci59"; }; buildInputs = [ diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch index 4bfdc13ef59..65804bac764 100644 --- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch +++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch @@ -7,7 +7,7 @@ index 903fb5b..d5611dc 100644 ret = asprintf (&command, - "gpg --list-keys --with-colons --with-key-data '%s'", -+ "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'", ++ "@out@/bin/gpg --list-keys --with-colons --with-key-data '%s'", keyid); assert (ret > 0); diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index c81a01ef896..af27fb6cd01 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ python ]; patchPhase = '' - sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g' + sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg|g' ''; dontBuild = true; From 60da71407a060b1738b0acf787bff0b10fc86cad Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 11 Aug 2017 12:33:53 -0400 Subject: [PATCH 127/213] pythonPackages.paramz: init at 0.7.4 --- .../python-modules/paramz/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/paramz/default.nix diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix new file mode 100644 index 00000000000..97d4d6de404 --- /dev/null +++ b/pkgs/development/python-modules/paramz/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator }: + +buildPythonPackage rec { + pname = "paramz"; + version = "0.7.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1r4mayzp7cb5w1kz45sw65is9j3p60h0yyp8hdhsx393rr4n82nn"; + }; + + propagatedBuildInputs = [ numpy scipy six decorator ]; + + meta = with stdenv.lib; { + description = "Parameterization framework for parameterized model creation and handling"; + homepage = https://github.com/sodz/paramz; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e87630212ce..6c5fe359981 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16463,6 +16463,8 @@ in { }; }; + paramz = callPackage ../development/python-modules/paramz { }; + parsel = buildPythonPackage rec { name = "parsel-${version}"; version = "1.1.0"; From bc755f39d2022e8faaca38f17efa95e4e8db3e75 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 10 Aug 2017 20:42:08 +0000 Subject: [PATCH 128/213] Update all-packages.nix --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a8453e86fb..55ee8f34be6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13095,7 +13095,7 @@ with pkgs; stix-two = callPackage ../data/fonts/stix-two { }; inherit (callPackages ../data/fonts/gdouros { }) - symbola aegyptus akkadian anatolian maya unidings musica analecta; + symbola aegyptus akkadian anatolian maya unidings musica analecta textfonts aegan abydos; iana-etc = callPackage ../data/misc/iana-etc { }; From 443ac233364b68903b7eaf342ba9fe6f53a3271a Mon Sep 17 00:00:00 2001 From: "pe@pijul.org" Date: Thu, 3 Aug 2017 08:32:49 +0200 Subject: [PATCH 129/213] Gwyddion: init at 2.48 --- .../science/chemistry/gwyddion/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/chemistry/gwyddion/default.nix diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix new file mode 100644 index 00000000000..b98af36604a --- /dev/null +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, gtk2, pkgconfig }: + +with stdenv.lib; + +stdenv.mkDerivation { + name = "gwyddion"; + version = "2.48"; + src = fetchurl { + url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; + sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; + }; + buildInputs = [ gtk2 pkgconfig ]; + meta = { + homepage = http://gwyddion.net/; + + description = "Scanning probe microscopy data visualization and analysis"; + + longDescription = '' + A modular program for SPM (scanning probe microscopy) data + visualization and analysis. Primarily it is intended for the + analysis of height fields obtained by scanning probe microscopy + techniques (AFM, MFM, STM, SNOM/NSOM) and it supports a lot of + SPM data formats. However, it can be used for general height + field and (greyscale) image processing, for instance for the + analysis of profilometry data or thickness maps from imaging + spectrophotometry. + ''; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a8453e86fb..664019fd6f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2384,6 +2384,8 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; + gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; From decbc7d50ed0cd769c86f6a9de5fc32aab439589 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 11 Aug 2017 21:04:17 +0200 Subject: [PATCH 130/213] wireguard: 0.0.20170726 -> 0.0.20170810 --- pkgs/os-specific/linux/wireguard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index ef6a538af79..277c6d19f5b 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,15 +6,15 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170726"; + version = "0.0.20170810"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1nq1h9k1kf6p28ykids5mmdq50q6zpj0ylhsf94q1hjydcmlb4fv"; + sha256 = "ab96230390625aad6f4816fa23aef6e9f7fee130f083d838919129ff12089bf7"; }; meta = with stdenv.lib; { - homepage = https://www.wireguard.io/; + homepage = https://www.wireguard.com/; downloadPage = https://git.zx2c4.com/WireGuard/refs/; description = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security"; maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ]; From 0611be740ecf223bab89390ad8052881234ad79e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 21:06:48 +0200 Subject: [PATCH 131/213] firefox: fix on i686 --- pkgs/applications/networking/browsers/firefox/packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 70b938bc5de..a5256e19e1b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchFromGitHub }: +{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch }: let common = opts: callPackage (import ./common.nix opts); in @@ -12,6 +12,11 @@ rec { sha512 = "2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47"; }; + patches = lib.optional stdenv.isi686 (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; + sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; + }); + meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; From 83cc65a39f220d58340cae31f5667d3f1c922418 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 Aug 2017 21:45:04 +0200 Subject: [PATCH 132/213] gollum: 4.1.1 -> 4.1.2 --- pkgs/applications/misc/gollum/Gemfile.lock | 26 +++++++------- pkgs/applications/misc/gollum/gemset.nix | 41 +++++++++++++--------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 4322b408843..7315c0a8d72 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -3,43 +3,43 @@ GEM specs: charlock_holmes (0.7.3) diff-lcs (1.3) - gemojione (3.2.0) + gemojione (3.3.0) json - github-markup (1.6.0) + github-markup (1.6.1) gitlab-grit (2.8.1) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gollum (4.1.1) + gollum (4.1.2) gemojione (~> 3.2) - gollum-lib (~> 4.0, >= 4.0.1) + gollum-lib (>= 4.2.7) kramdown (~> 1.9.0) mustache (>= 0.99.5, < 1.0.0) sinatra (~> 1.4, >= 1.4.4) useragent (~> 0.16.2) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.2.5) + gollum-lib (4.2.7) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 2.0) + nokogiri (>= 1.6.1, < 2.0) + rouge (~> 2.1) sanitize (~> 2.1) stringex (~> 2.6) json (2.1.0) kramdown (1.9.0) mime-types (2.99.3) - mini_portile2 (2.1.0) + mini_portile2 (2.2.0) mustache (0.99.8) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) posix-spawn (0.3.13) rack (1.6.8) rack-protection (1.5.3) rack - rouge (2.0.7) + rouge (2.1.1) sanitize (2.1.0) nokogiri (>= 1.4.4) sinatra (1.4.8) @@ -47,7 +47,7 @@ GEM rack-protection (~> 1.4) tilt (>= 1.3, < 3) stringex (2.7.1) - tilt (2.0.7) + tilt (2.0.8) useragent (0.16.8) PLATFORMS @@ -57,4 +57,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.15.0 + 1.15.3 diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 2ad724b2bc7..cff774d7daa 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -16,22 +16,24 @@ version = "1.3"; }; gemojione = { + dependencies = ["json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik"; + sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; github-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9"; + sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; gitlab-grit = { + dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; @@ -40,14 +42,16 @@ version = "2.8.1"; }; gollum = { + dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s"; + sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a"; type = "gem"; }; - version = "4.1.1"; + version = "4.1.2"; }; gollum-grit_adapter = { + dependencies = ["gitlab-grit"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; @@ -56,12 +60,13 @@ version = "1.0.1"; }; gollum-lib = { + dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z"; + sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq"; type = "gem"; }; - version = "4.2.5"; + version = "4.2.7"; }; json = { source = { @@ -90,10 +95,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; + sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; mustache = { source = { @@ -104,12 +109,13 @@ version = "0.99.8"; }; nokogiri = { + dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj"; + sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn"; type = "gem"; }; - version = "1.6.8.1"; + version = "1.8.0"; }; posix-spawn = { source = { @@ -128,6 +134,7 @@ version = "1.6.8"; }; rack-protection = { + dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; @@ -138,12 +145,13 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p"; type = "gem"; }; - version = "2.0.7"; + version = "2.1.1"; }; sanitize = { + dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3"; @@ -152,6 +160,7 @@ version = "2.1.0"; }; sinatra = { + dependencies = ["rack" "rack-protection" "tilt"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -170,10 +179,10 @@ tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.8"; }; useragent = { source = { From 350a6c3726beee36c8939fff7b98c1a6659fc4d4 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 21:53:01 +0200 Subject: [PATCH 133/213] tests.plasma5: fix eval --- nixos/tests/plasma5.nix | 15 ++++----------- .../data/fonts/fontconfig-penultimate/default.nix | 9 +++++---- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index f97544b5ea5..8b49b26c24a 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -16,17 +16,10 @@ import ./make-test.nix ({ pkgs, ...} : # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why. nixpkgs.config.packageOverrides = superPkgs: { - fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs - (_attrs: rec { - version = "0.3.3"; - name = "fontconfig-penultimate-${version}"; - src = pkgs.fetchFromGitHub { - owner = "ttuegel"; - repo = "fontconfig-penultimate"; - rev = version; - sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9"; - }; - }); + fontconfig-penultimate = superPkgs.fontconfig-penultimate.override { + version = "0.3.3"; + sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9"; + }; }; }; diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix index da1c4467036..e1be0da428a 100644 --- a/pkgs/data/fonts/fontconfig-penultimate/default.nix +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchzip +, version ? "0.3.5" +, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk" +}: -let version = "0.3.5"; in fetchzip { name = "fontconfig-penultimate-${version}"; url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip"; + inherit sha256; postFetch = '' mkdir -p $out/etc/fonts/conf.d unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d ''; - sha256 = "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk"; - meta = with stdenv.lib; { homepage = https://github.com/ttuegel/fontconfig-penultimate; description = "Sensible defaults for Fontconfig"; From f9204b97623d75c0c9d90488a112767d8166b5fd Mon Sep 17 00:00:00 2001 From: Keith Amidon Date: Fri, 11 Aug 2017 13:13:33 -0700 Subject: [PATCH 134/213] nixos/samba: fix pam service name typo (#28049) The PAM service name used before this commit was "sambda", with an extra 'd'. For some reason I don't quite fully understand this typo prevents GDM from starting. This change fixes that as tested in VMs built using "nixos-rebuild -I nixpkgs= build-vm". --- nixos/modules/services/network-filesystems/samba.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 87c4f7a8ebc..b3b4d0c915a 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -243,7 +243,7 @@ in }; }; - security.pam.services.sambda = {}; + security.pam.services.samba = {}; }) ]; From d06ab41c857e7acaa28a7e66d36d8d271e72e11a Mon Sep 17 00:00:00 2001 From: rybern Date: Fri, 11 Aug 2017 16:32:59 -0400 Subject: [PATCH 135/213] moon-buggy: init at 1.0.51 (#28165) --- lib/maintainers.nix | 1 + pkgs/games/moon-buggy/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/games/moon-buggy/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index fcfe2556043..0f4e6fe2261 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -508,6 +508,7 @@ ryanartecona = "Ryan Artecona "; ryansydnor = "Ryan Sydnor "; ryantm = "Ryan Mulligan "; + rybern = "Ryan Bernstein "; rycee = "Robert Helgesson "; ryneeverett = "Ryne Everett "; rzetterberg = "Richard Zetterberg "; diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix new file mode 100644 index 00000000000..8ea8dfccb16 --- /dev/null +++ b/pkgs/games/moon-buggy/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, ncurses}: + +stdenv.mkDerivation rec { + baseName = "moon-buggy"; + version = "1.0.51"; + name = "${baseName}-${version}"; + + buildInputs = [ + ncurses + ]; + + src = fetchurl { + url = "http://m.seehuhn.de/programs/${name}.tar.gz"; + sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m"; + }; + + meta = { + description = ''A simple character graphics game where you drive some kind of car across the moon's surface''; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.rybern]; + platforms = stdenv.lib.platforms.linux; + homepage = http://www.seehuhn.de/pages/moon-buggy; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 664019fd6f6..00d56ee2be6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17300,6 +17300,8 @@ with pkgs; minecraft-server = callPackage ../games/minecraft-server { }; + moon-buggy = callPackage ../games/moon-buggy {}; + multimc = libsForQt5.callPackage ../games/multimc { }; minetest = callPackage ../games/minetest { From 51092fd0c34544f5759ab3e6d951cd5f2e95589e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 22:40:12 +0200 Subject: [PATCH 136/213] tlspool: don't create unused directories --- pkgs/tools/networking/tlspool/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 4a1e91f7f59..53465a0242d 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -39,9 +39,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/lib $out/sbin $out/man $out/etc/tlspool/ $out/include/${pname}/pulleyback - mkdir -p $out/${python.sitePackages}/tlspool - mkdir -p $out/bdb + mkdir -p $out/bin $out/lib $out/sbin $out/etc/tlspool/ $out/include/${pname}/pulleyback make DESTDIR=$out PREFIX=/ install cp -R etc/* $out/etc/tlspool/ cp include/tlspool/*.h $out/include/${pname} From 519c254a41a72d1fbfc270552d25e94701f277dc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 22:42:10 +0200 Subject: [PATCH 137/213] screenfetch: fix man path --- pkgs/tools/misc/screenfetch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index a781ff91027..352fee14fa6 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { installPhase = '' install -Dm 0755 screenfetch-dev $out/bin/screenfetch - install -Dm 0644 screenfetch.1 $out/man/man1/screenfetch.1 + install -Dm 0644 screenfetch.1 $out/share/man/man1/screenfetch.1 # Fix all of the depedencies of screenfetch patchShebangs $out/bin/screenfetch From 3a078da8dc4cb73baae55f8f50f8a94a453e5e3d Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 11 Aug 2017 13:34:20 -0400 Subject: [PATCH 138/213] rtags: 2.11 -> 2.12 --- pkgs/development/tools/rtags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 85d14835a25..39ee3179e9c 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.11"; + version = "2.12"; buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "0965jn8zk3mh07yzw6jmwwp56xly1sihkn0vhv07izkh41mdkrvv"; + sha256 = "0bgjcvyvkpqcgw4571iz39sqydmcaz6ymx7kxcmq6j7rffs6qs7l"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' From 723bd8b9c541acf546c825beffa1b241098f74d3 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Tue, 25 Jul 2017 13:44:05 -0700 Subject: [PATCH 139/213] go: support for aarch64 via binary bootstrap --- pkgs/development/compilers/go/1.6.nix | 1 + pkgs/development/compilers/go/1.7.nix | 1 + pkgs/development/compilers/go/1.8.nix | 1 + pkgs/top-level/all-packages.nix | 15 ++++++++++++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 61408c0ebb3..0eebc92ee59 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index d7a824239b8..b1230da5a14 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 8e0b1c7360f..8a675b1b776 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00d56ee2be6..0869c46849a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5596,9 +5596,18 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_bootstrap = callPackage ../development/compilers/go/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + go_bootstrap = if stdenv.isAarch64 then + srcOnly { + name = "go-1.8-linux-arm64-bootstrap"; + src = fetchurl { + url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; + sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; + }; + } + else + callPackage ../development/compilers/go/1.4.nix { + inherit (darwin.apple_sdk.frameworks) Security; + }; go_1_6 = callPackage ../development/compilers/go/1.6.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; From 345e0e679457d839bb2e23b5ed64947372d94fea Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 11 Aug 2017 23:25:30 +0200 Subject: [PATCH 140/213] hardened-config: enable read-only LSM hooks Implies that SELinux can no longer be disabled at runtime (only at boot time, via selinux=0). See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=dd0859dccbe291cf8179a96390f5c0e45cb9af1d --- pkgs/os-specific/linux/kernel/hardened-config.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 579fb2947ec..5711779eb86 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -46,6 +46,14 @@ ${optionalString (versionOlder version "4.11") '' DEBUG_SET_MODULE_RONX y ''} +# Mark LSM hooks read-only after init. Conflicts with SECURITY_SELINUX_DISABLE +# (disabling SELinux at runtime); hence, SELinux can only be disabled at boot +# via the selinux=0 boot parameter. +${optionalString (versionAtLeast version "4.12") '' + SECURITY_SELINUX_DISABLE n + SECURITY_WRITABLE_HOOKS n +''} + DEBUG_WX y # boot-time warning on RWX mappings # Stricter /dev/mem From f48109387ab1179fa66e3ea0362f6755a3bb9006 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 11 Aug 2017 23:13:53 +0200 Subject: [PATCH 141/213] mergeAttrsByVersion, versionedDerivation: remove obsolete and ancient --- lib/deprecated.nix | 42 --------------------------------- pkgs/misc/misc.nix | 5 ---- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 48 deletions(-) diff --git a/lib/deprecated.nix b/lib/deprecated.nix index d4e78c39250..8cdfab381ba 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -309,48 +309,6 @@ rec { mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"]; - # merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults - # - # This function is best explained by an example: - # - # {version ? "2.x"}: - # - # mkDerivation (mergeAttrsByVersion "package-name" version - # { # version specific settings - # "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; }; - # "2.x" = { src = ..; }; - # } - # { // shared settings - # buildInputs = [ common build inputs ]; - # meta = { .. } - # } - # ) - # - # Please note that e.g. Eelco Dolstra usually prefers having one file for - # each version. On the other hand there are valuable additional design goals - # - readability - # - do it once only - # - try to avoid duplication - # - # Marc Weber and Michael Raskin sometimes prefer keeping older - # versions around for testing and regression tests - as long as its cheap to - # do so. - # - # Very often it just happens that the "shared" code is the bigger part. - # Then using this function might be appropriate. - # - # Be aware that its easy to cause recompilations in all versions when using - # this function - also if derivations get too complex splitting into multiple - # files is the way to go. - # - # See misc.nix -> versionedDerivation - # discussion: nixpkgs: pull/310 - mergeAttrsByVersion = name: version: attrsByVersion: base: - mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } - base - (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion) - ]; - # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } listToAttrs (map (n: nameValuePair n lib.concat) diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix index a3c293beab3..cb4765957f1 100644 --- a/pkgs/misc/misc.nix +++ b/pkgs/misc/misc.nix @@ -5,11 +5,6 @@ let inherit (pkgs) stdenv runCommand perl lib; in { - - # description see mergeAttrsByVersion in lib/misc.nix - versionedDerivation = name: version: attrsByVersion: base: - pkgs.stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion name version attrsByVersion base); - /* Usage example creating a derivation installing ruby, sup and a lib: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0869c46849a..890d7225e30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -50,7 +50,6 @@ with pkgs; inherit lib config; inherit (lib) lowPrio hiPrio appendToName makeOverridable; - inherit (misc) versionedDerivation; # Applying this to an attribute set will cause nix-env to look # inside the set for derivations. From 7f139a2a6bde6898b29b03942634e20d1f5b113c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 Aug 2017 23:39:55 +0200 Subject: [PATCH 142/213] android-studio-preview: 3.0.0.9 -> 3.0.0.10 --- pkgs/applications/editors/android-studio/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 1a324b544dc..471f78f0c07 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.9"; # This is actually "Android Studio 3.0 Beta 1" - build = "171.4243858"; - sha256Hash = "137jd4146srjigyzcfds8pf7b185q1qdkb0zp2yqc8g6bv4ccb22"; + version = "3.0.0.10"; # "Android Studio 3.0 Beta 2" + build = "171.4263559"; + sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; From b4d2cd6f6a8f004c1ea4ec7f84d9f7f6a93418ce Mon Sep 17 00:00:00 2001 From: Phil Date: Fri, 11 Aug 2017 23:59:52 +0200 Subject: [PATCH 143/213] nixos/tor: add tor hidden service options (#28081) * nixos/tor: add hiddenServices option This change allows to configure hidden services more conveniently. * nixos/tor: fix default/example mixup * nixos/tor: use docbook in documentation Also use more elegant optionalString for optional strings. * tor: seperate hidden service port by newline * tor: better example for hidden service path a path below /var/lib/tor is usually used for hidden services --- nixos/modules/services/security/tor.nix | 104 +++++++++++++++++++++--- 1 file changed, 92 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 10596d6431d..3f1450ebfbd 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -46,8 +46,20 @@ let ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed ''} '' + + hiddenServices + cfg.extraConfig; + hiddenServices = concatStrings (mapAttrsToList (hiddenServiceDir: hs: + let + hsports = concatStringsSep "\n" (map mkHiddenServicePort hs.hiddenServicePorts); + in + "HiddenServiceDir ${hiddenServiceDir}\n${hsports}\n${hs.extraConfig}\n" + ) cfg.hiddenServices); + + mkHiddenServicePort = hsport: let + trgt = optionalString (hsport.target != null) (" " + hsport.target); + in "HiddenServicePort ${toString hsport.virtualPort}${trgt}"; + torRcFile = pkgs.writeText "torrc" torRc; in { @@ -229,11 +241,11 @@ in default = null; example = "450 GBytes"; description = '' - Specify maximum bandwidth allowed during an accounting - period. This allows you to limit overall tor bandwidth - over some time period. See the - AccountingMax option by looking at the - tor manual (man tor) for more. + Specify maximum bandwidth allowed during an accounting period. This + allows you to limit overall tor bandwidth over some time period. + See the AccountingMax option by looking at the + tor manual tor + 1 for more. Note this limit applies individually to upload and download; if you specify "500 GBytes" @@ -247,10 +259,11 @@ in default = null; example = "month 1 1:00"; description = '' - Specify length of an accounting period. This allows you to - limit overall tor bandwidth over some time period. See the - AccountingStart option by looking at - the tor manual (man tor) for more. + Specify length of an accounting period. This allows you to limit + overall tor bandwidth over some time period. See the + AccountingStart option by looking at the tor + manual tor + 1 for more. ''; }; @@ -279,9 +292,10 @@ in type = types.str; example = "143"; description = '' - What port to advertise for Tor connections. This corresponds - to the ORPort section in the Tor manual; see - man tor for more details. + What port to advertise for Tor connections. This corresponds to the + ORPort section in the Tor manual; see + tor + 1 for more details. At a minimum, you should just specify the port for the relay to listen on; a common one like 143, 22, 80, or 443 @@ -314,6 +328,72 @@ in ''; }; }; + + hiddenServices = mkOption { + type = types.attrsOf (types.submodule ({ + options = { + hiddenServicePorts = mkOption { + type = types.listOf (types.submodule { + options = { + virtualPort = mkOption { + type = types.int; + example = 80; + description = "Virtual port."; + }; + target = mkOption { + type = types.nullOr types.str; + default = null; + example = "127.0.0.1:8080"; + description = '' + Target virtual Port shall be mapped to. + + You may override the target port, address, or both by + specifying a target of addr, port, addr:port, or + unix:path. (You can specify an IPv6 target as + [addr]:port. Unix paths may be quoted, and may use + standard C escapes.) + ''; + }; + }; + }); + example = [ { virtualPort = 80; target = "127.0.0.1:8080"; } { virtualPort = 6667; } ]; + description = '' + If target is null the virtual port is mapped + to the same port on 127.0.0.1 over TCP. You may use + target to overwrite this behaviour (see + description of target). + + This corresponds to the HiddenServicePort VIRTPORT + [TARGET] option by looking at the tor manual + tor + 1 for more information. + ''; + }; + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Extra configuration. Contents will be added in the current + hidden service context. + ''; + }; + }; + })); + default = {}; + example = { + "/var/lib/tor/webserver" = { + hiddenServicePorts = [ { virtualPort = 80; } ]; + }; + }; + description = '' + Configure hidden services. + + Please consult the tor manual + tor + 1 for a more detailed + explanation. (search for 'HIDDEN'). + ''; + }; }; }; From 44f9be70c66145cb5e28fcb146de4c47df10f15c Mon Sep 17 00:00:00 2001 From: Willi Butz Date: Sat, 12 Aug 2017 00:37:53 +0200 Subject: [PATCH 144/213] freicoin: fix build --- pkgs/applications/altcoins/freicoin.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix index e8a26365361..a44dbbd62ce 100644 --- a/pkgs/applications/altcoins/freicoin.nix +++ b/pkgs/applications/altcoins/freicoin.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { # I think that openssl and zlib are required, but come through other # packages + preBuild = "unset AR"; + installPhase = '' mkdir -p $out/bin cp freicoin-qt $out/bin From 2bea8873c3f9a6ba3c5fc2b83cdc25de7b8cd7d8 Mon Sep 17 00:00:00 2001 From: Willi Butz Date: Sat, 12 Aug 2017 00:38:13 +0200 Subject: [PATCH 145/213] memorycoin: fix build --- pkgs/applications/altcoins/memorycoin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index b653ce82a67..9efab9a8bab 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + preBuild = "unset AR;" + + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); installPhase = if withGui From 3584f1d6d4ec665d8e6572e1706761612777dc71 Mon Sep 17 00:00:00 2001 From: Willi Butz Date: Sat, 12 Aug 2017 00:38:32 +0200 Subject: [PATCH 146/213] primecoin: fix build --- pkgs/applications/altcoins/primecoin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 31183670212..e6ed05dd27f 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec{ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; - preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; + preBuild = "unset AR;" + + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile")); installPhase = if withGui From a3103fb406be5769b630fa0d86d3e74812255e8d Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Fri, 11 Aug 2017 15:49:05 -0700 Subject: [PATCH 147/213] mpDris2: add mutagen for cover art support (#28063) * mpDris2: add mutagen for cover art support * mpdris2: move mutagen to `pythonPath` --- pkgs/tools/audio/mpdris2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index fd9cf2bacbf..c326533ece1 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; - pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify ]; + propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; + pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ]; postInstall = "wrapPythonPrograms"; meta = with stdenv.lib; { From 59fa868b01c6f22b9072508cebbecdc4930034e5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 12 Aug 2017 00:55:32 +0200 Subject: [PATCH 148/213] tests.plasma5: fix hash --- nixos/tests/plasma5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 8b49b26c24a..f3bd4c5915b 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : nixpkgs.config.packageOverrides = superPkgs: { fontconfig-penultimate = superPkgs.fontconfig-penultimate.override { version = "0.3.3"; - sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9"; + sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9"; }; }; }; From aa7627310cef0c4201d45f9dc22a34effa23c0b3 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 11 Aug 2017 23:01:10 -0400 Subject: [PATCH 149/213] pythonPackages.paramz: fix URL --- pkgs/development/python-modules/paramz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 97d4d6de404..5137485a58f 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parameterization framework for parameterized model creation and handling"; - homepage = https://github.com/sodz/paramz; + homepage = https://github.com/sods/paramz; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; From afa9031062c40ef75d95c2c91c3c0d6e4925f3e7 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 11 Aug 2017 23:31:08 -0400 Subject: [PATCH 150/213] rtl8812au: Fix comment typo The commit 5d693c84d2e492080e982bf7429d6e923229d721 cleaned up the substitute() function in stdenv and caused this line to fail. --- pkgs/os-specific/linux/rtl8812au/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 34fc7b5c759..6528614f32d 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" - substituteInPlace ./Makefile --replace /sbin/depmod # + substituteInPlace ./Makefile --replace /sbin/depmod \# substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; From c08ceb1df86cc5a434632c45dd2a32b66f9f3687 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Wed, 9 Aug 2017 22:47:53 -0400 Subject: [PATCH 151/213] rtl8812au: Fixes for newer linux kernels This includes the patches from the pull requests #42, #43, and #46 submitted to Grawp/rtl8812au_rtl8821au --- pkgs/os-specific/linux/rtl8812au/default.nix | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 6528614f32d..4ea6b35e377 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, fetchFromGitHub, fetchpatch, kernel }: stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; @@ -11,11 +11,29 @@ stdenv.mkDerivation rec { sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry"; }; + patches = [ + (fetchpatch { # From PR # 42 + name = "rtl8812au-4.11.x-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/3224e74ad9c230b74a658e80dad66ab95c9e2ef5.patch; + sha256 = "12g4yvivg4d0qm5cgxs7k54p3y7h1dc2jw6rp1xbppwf3j1z6xks"; + }) + (fetchpatch { # From PR #46 + name = "rtl8812au-4.11.9-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/58fc45a4511b8b9d6b52813168e3eee657517b1f.patch; + sha256 = "18bag2mif5112lap2xvx2bb0wxrd13f9y9cwqv1qzp5nyqiniziz"; + }) + (fetchpatch { # From PR #43 + name = "rtl8812au-4.12-fix.patch"; + url = https://github.com/Grawp/rtl8812au_rtl8821au/commit/a5475c9f1f54099ca35c8680f2dedee11fa9edec.patch; + sha256 = "01xa51whq1xa0sh3y2bhm65f0cryzmv46v530axqjrpnd924432d"; + }) + ]; + hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; - patchPhase = '' + prePatch = '' substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" substituteInPlace ./Makefile --replace /sbin/depmod \# From 87151128f15f3b2e83ecaaf957d442c562322356 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Fri, 11 Aug 2017 23:32:15 -0700 Subject: [PATCH 152/213] hugo: 0.25.1 -> 0.26 --- pkgs/applications/misc/hugo/default.nix | 4 +- pkgs/applications/misc/hugo/deps.nix | 127 ++++++++++-------------- 2 files changed, 52 insertions(+), 79 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 27757e4e31a..2b0be1c9030 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.25.1"; + version = "0.26"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz"; + sha256 = "1g2brxhc6lyl2qa41lrqw2hadl601inmshsxlpmv99ax67sa19d1"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index ff832d4961f..240983b3c71 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab"; - sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg"; + rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; + sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; }; } { @@ -35,15 +35,6 @@ sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami"; }; } - { - goPackagePath = "github.com/bep/inflect"; - fetch = { - type = "git"; - url = "https://github.com/bep/inflect"; - rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; - sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; - }; - } { goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { @@ -76,8 +67,8 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5"; - sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq"; + rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448"; + sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a"; }; } { @@ -85,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/fortytw2/leaktest"; - rev = "7dad53304f9614c1c365755c1176a8e876fee3e8"; - sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m"; + rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513"; + sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz"; }; } { @@ -103,8 +94,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; - sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; + rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf"; + sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi"; }; } { @@ -112,8 +103,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc"; - sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb"; + rev = "8aac2701530899b64bdea735a1de8da899815220"; + sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6"; }; } { @@ -143,6 +134,15 @@ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } + { + goPackagePath = "github.com/jdkato/prose"; + fetch = { + type = "git"; + url = "https://github.com/jdkato/prose"; + rev = "c24611cae00c16858e611ef77226dd2f7502759f"; + sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1"; + }; + } { goPackagePath = "github.com/kardianos/osext"; fetch = { @@ -152,15 +152,6 @@ sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; }; } - { - goPackagePath = "github.com/kr/fs"; - fetch = { - type = "git"; - url = "https://github.com/kr/fs"; - rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; - sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; - }; - } { goPackagePath = "github.com/kyokomi/emoji"; fetch = { @@ -175,8 +166,17 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "51463bfca2576e06c62a8504b5c0f06d61312647"; - sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288"; + rev = "be5ece7dd465ab0765a9682137865547526d1dfb"; + sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8"; + }; + } + { + goPackagePath = "github.com/markbates/inflect"; + fetch = { + type = "git"; + url = "https://github.com/markbates/inflect"; + rev = "6cacb66d100482ef7cc366289ccb156020e57e76"; + sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2"; }; } { @@ -184,8 +184,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "f809cc9d384e2f7f3985a28a899237b892f35719"; - sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd"; + rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"; + sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; }; } { @@ -220,26 +220,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286"; - sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "c605e284fe17294bda444b34710735b29d1a9d90"; - sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; - }; - } - { - goPackagePath = "github.com/pkg/sftp"; - fetch = { - type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "a5f8514e29e90a859e93871b1582e5c81f466f82"; - sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd"; + rev = "69d355db5304c0f7f809a2edc054553e7142f016"; + sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm"; }; } { @@ -247,8 +229,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae"; - sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137"; + rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; + sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; }; } { @@ -283,8 +265,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37"; - sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx"; + rev = "34594c771f2c18301dc152640ad40ece28795373"; + sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38"; }; } { @@ -328,8 +310,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "c1de95864d73a5465492829d7cb2dd422b19ac96"; - sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm"; + rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7"; + sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3"; }; } { @@ -337,8 +319,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; - sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; + rev = "05e8a0eda380579888eb53c394909df027f06991"; + sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv"; }; } { @@ -350,15 +332,6 @@ sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; }; } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "850760c427c516be930bc91280636328f1a62286"; - sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz"; - }; - } { goPackagePath = "golang.org/x/image"; fetch = { @@ -373,8 +346,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd"; - sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8"; + rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"; + sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k"; }; } { @@ -382,8 +355,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; - sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; + rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695"; + sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n"; }; } { @@ -391,8 +364,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735"; - sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh"; + rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; + sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; }; } { @@ -400,8 +373,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; + rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; + sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; }; } ] From 8cd83cde50721ba6953512b2bab81dda4c5271ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 12 Aug 2017 07:45:29 +0100 Subject: [PATCH 153/213] pcmanfm: add defaultIconTheme to fix missing icons --- pkgs/applications/misc/pcmanfm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 8251c07206d..148dd427fbc 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig -, withGtk3 ? true, gtk2, gtk3 }: +, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: let libfm' = libfm.override { inherit withGtk3; }; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"; }; - buildInputs = [ glib gtk intltool libfm' libX11 pango pkgconfig ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; From 026b60e49e933d2093dab105734b38817ba8e93e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Aug 2017 08:55:59 +0200 Subject: [PATCH 154/213] python.pkgs.sphinx: move expression --- .../python-modules/sphinx/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 45 +------------ 2 files changed, 67 insertions(+), 43 deletions(-) create mode 100644 pkgs/development/python-modules/sphinx/default.nix diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix new file mode 100644 index 00000000000..ae08db31b2a --- /dev/null +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, simplejson +, mock +, glibcLocales +, html5lib +, pythonOlder +, enum34 +, python +, docutils +, jinja2 +, pygments +, alabaster +, Babel +, snowballstemmer +, six +, sqlalchemy +, whoosh +, imagesize +, requests +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Sphinx"; + version = "1.5.2"; + src = fetchPypi { + inherit pname version; + sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722"; + }; + LC_ALL = "en_US.UTF-8"; + buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34; + # Disable two tests that require network access. + checkPhase = '' + cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' + ''; + propagatedBuildInputs = [ + docutils + jinja2 + pygments + alabaster + Babel + snowballstemmer + six + sqlalchemy + whoosh + imagesize + requests + ]; + + # https://github.com/NixOS/nixpkgs/issues/22501 + # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. + postPatch = '' + substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" + ''; + + meta = { + description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; + homepage = http://sphinx.pocoo.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nand0p ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2f0c195dfe..835118b0f20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22202,50 +22202,9 @@ in { }; }); - sphinx = buildPythonPackage (rec { - name = "${pname}-${version}"; - pname = "Sphinx"; - version = "1.5.2"; - src = fetchPypi { - inherit pname version; - sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722"; - }; - LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ pytest simplejson mock pkgs.glibcLocales html5lib ] ++ optional (pythonOlder "3.4") self.enum34; - # Disable two tests that require network access. - checkPhase = '' - cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored' - ''; - propagatedBuildInputs = with self; [ - docutils - jinja2 - pygments - alabaster - Babel - snowballstemmer - six - sqlalchemy - whoosh - imagesize - requests - ]; + sphinx = callPackage ../development/python-modules/sphinx { }; - # https://github.com/NixOS/nixpkgs/issues/22501 - # Do not run `python sphinx-build arguments` but `sphinx-build arguments`. - postPatch = '' - substituteInPlace sphinx/make_mode.py --replace "sys.executable, " "" - ''; - - meta = { - description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = http://sphinx.pocoo.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - }); - - sphinx_1_2 = self.sphinx.override rec { + sphinx_1_2 = self.sphinx.overridePythonPackage rec { name = "sphinx-1.2.3"; src = pkgs.fetchurl { url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz"; From abdb58e407d0351894ea1ee32c3484a89f1e53cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Aug 2017 08:58:06 +0200 Subject: [PATCH 155/213] Python: overridePythonPackage -> overridePythonAttrs to better fit the existing naming scheme. https://github.com/NixOS/nixpkgs/pull/26155#issuecomment-321279629 --- doc/languages-frameworks/python.md | 6 +++--- pkgs/top-level/python-packages.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index c8add96a148..c100c9d0c20 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -547,7 +547,7 @@ All parameters from `mkDerivation` function are still supported. ##### Overriding Python packages -The `buildPythonPackage` function has a `overridePythonPackage` method that +The `buildPythonPackage` function has a `overridePythonAttrs` method that can be used to override the package. In the following example we create an environment where we have the `blaze` package using an older version of `pandas`. We override first the Python interpreter and pass @@ -559,7 +559,7 @@ with import {}; (let python = let packageOverrides = self: super: { - pandas = super.pandas.overridePythonPackage(old: rec { + pandas = super.pandas.overridePythonAttrs(old: rec { version = "0.19.1"; name = "pandas-${version}"; src = super.fetchPypi { @@ -786,7 +786,7 @@ with import {}; (let python = let packageOverrides = self: super: { - pandas = super.pandas.overridePythonPackage(old: {name="foo";}); + pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); }; in pkgs.python35.override {inherit packageOverrides;}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 835118b0f20..2884f39bc87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -37,17 +37,17 @@ let }); # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`. - # This function introduces `overridePythonPackage` and it overrides the call to `buildPythonPackage`. + # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. makeOverridablePythonPackage = f: origArgs: let ff = f origArgs; overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); in if builtins.isAttrs ff then (ff // { - overridePythonPackage = newArgs: makeOverridable f (overrideWith newArgs); + overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs); }) else if builtins.isFunction ff then { - overridePythonPackage = newArgs: makeOverridable f (overrideWith newArgs); + overridePythonAttrs = newArgs: makeOverridable f (overrideWith newArgs); __functor = self: ff; } else ff; @@ -22204,7 +22204,7 @@ in { sphinx = callPackage ../development/python-modules/sphinx { }; - sphinx_1_2 = self.sphinx.overridePythonPackage rec { + sphinx_1_2 = self.sphinx.overridePythonAttrs rec { name = "sphinx-1.2.3"; src = pkgs.fetchurl { url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz"; From a25e324e063ca3e8b3036964af16259453734823 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Aug 2017 09:04:44 +0200 Subject: [PATCH 156/213] python.pkgs.audioread: move expression --- .../python-modules/audioread/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/audioread/default.nix diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix new file mode 100644 index 00000000000..bf71cf8cfbd --- /dev/null +++ b/pkgs/development/python-modules/audioread/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "audioread"; + name = "${pname}-${version}"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e"; + }; + + # No tests, need to disable or py3k breaks + doCheck = false; + + meta = { + description = "Cross-platform audio decoding"; + homepage = "https://github.com/sampsyo/audioread"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2884f39bc87..0e308a2f64b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -709,24 +709,7 @@ in { }; }); - audioread = buildPythonPackage rec { - name = "audioread-${version}"; - version = "2.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/audioread/${name}.tar.gz"; - sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e"; - }; - - # No tests, need to disable or py3k breaks - doCheck = false; - - meta = { - description = "Cross-platform audio decoding"; - homepage = "https://github.com/sampsyo/audioread"; - license = licenses.mit; - }; - }; + audioread = callPackage ../development/python-modules/audioread { }; audiotools = buildPythonPackage rec { name = "audiotools-${version}"; From 66ce84b61976f533251a1bd6a5f032efc8741fa1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Aug 2017 09:10:32 +0200 Subject: [PATCH 157/213] python.pkgs.bottleneck: move expression --- .../python-modules/bottleneck/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/bottleneck/default.nix diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix new file mode 100644 index 00000000000..2c1850b86ab --- /dev/null +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, numpy +, python +}: + +buildPythonPackage rec { + pname = "Bottleneck"; + name = "Bottleneck-${version}"; + version = "1.2.0"; + src = fetchPypi { + inherit pname version; + sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ numpy ]; + checkPhase = '' + nosetests -v $out/${python.sitePackages} + ''; + postPatch = '' + substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" + ''; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e308a2f64b..54cc59be09a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16015,23 +16015,7 @@ in { }; - bottleneck = buildPythonPackage rec { - name = "Bottleneck-${version}"; - version = "1.2.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz"; - sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = [self.numpy]; - checkPhase = '' - nosetests -v $out/${python.sitePackages} - ''; - postPatch = '' - substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" - ''; - }; + bottleneck = callPackage ../development/python-modules/bottleneck { }; paho-mqtt = buildPythonPackage rec { name = "paho-mqtt-${version}"; From 025222ec799a460bb4aa29d82ab63703e6a960a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 12 Aug 2017 09:23:08 +0100 Subject: [PATCH 158/213] pluma: also add default icon theme --- pkgs/desktops/mate/pluma/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 29df4fc475a..a290c404469 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { python gnome3.gtksourceview gnome3.libpeas + gnome3.defaultIconTheme mate.mate-desktop ]; From 73e01c549e23c915945e006162e8005525457e8c Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 12 Aug 2017 10:27:42 +0200 Subject: [PATCH 159/213] sonarr: 2.0.0.4753 -> 2.0.0.4928 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 3c096a0d52e..20fb74924d3 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4753"; + version = "2.0.0.4928"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1rhdnd37fd5a4wbnrd817bf7ln4095kzmv283kmm8fz93nmmc19c"; + sha256 = "0wggh8z5dmkkcgbb1hzikia55djdqmbqz2dpzx1iyvgys7y5n8xm"; }; buildInputs = [ From 3292d801c031fa3c7b01629e38f5490abf5f2c9f Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 12 Aug 2017 10:48:37 +0200 Subject: [PATCH 160/213] pythonPackages.phonenumbers: 8.5.1 -> 8.7.1 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index aba0631a536..18cd9f021fe 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.5.1"; + version = "8.7.1"; name = "${pname}-${version}"; meta = { @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/p/phonenumbers/${name}.tar.gz"; - sha256 = "b7d1a5832650fad633d1e4159873788ebfb15e053292c20ab9f5119a574f3a67"; + sha256 = "1zmi2xvh6v4iyfxmrqhj2byfac9xk733w663a7phib7y6wkvqlgr"; }; } From 7bcce71b8f5477280582512f9b70bcab16aa66e3 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 12 Aug 2017 10:58:54 +0200 Subject: [PATCH 161/213] SystemdJournal2Gelf: 20160414 -> 20170413 --- pkgs/tools/system/systemd-journal2gelf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 59df5ee90a4..bfbe217c269 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "SystemdJournal2Gelf-${version}"; - version = "20160414"; + version = "20170413"; goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; src = fetchFromGitHub { - rev = "aba2f24e59f190ab8830bf40f92f890e62a9ec9f"; + rev = "862b1d60d2ba12cd8480304ca95041066cc8bdd0"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "012fmnb44681dgz21n1dlb6vh923bpk5lkqir1q40kfz6pacq64n"; + sha256 = "0xvvc7w2sxkhb33nkq5v626l673d5j2z0yc75wvmqzncwfkkv94v"; }; goDeps = ./deps.nix; From 94cadf33baa05d4c2a5ee48354eaf1ef5dd43a60 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 12 Aug 2017 01:17:28 +0200 Subject: [PATCH 162/213] nmap: 7.50 -> 7.60 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 6495634da33..cce737af9c1 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.50"; + version = "7.60"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "1ckl2qxqxkrfa2qxdrqyaa4k1hhj273aqckrc46fijdz0a76mag9"; + sha256 = "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8"; }; patches = ./zenmap.patch; From 9ac5525f877d879b060fdbe929c6a7e3d2a441d3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 12 Aug 2017 01:17:47 +0200 Subject: [PATCH 163/213] virtmanager: 1.4.1 -> 1.4.2 --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index dad16ffb0f0..13dbf544c92 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,12 +9,12 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.1"; + version = "1.4.2"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6"; + sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23"; }; nativeBuildInputs = [ wrapGAppsHook intltool file ]; From 5d2764eb68f99574c6b6e0efc2d85a6cdaad2c9d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 12 Aug 2017 11:04:42 +0200 Subject: [PATCH 164/213] prometheus-blackbox-exporter: 0.5.0 -> 0.8.1 --- .../services/monitoring/prometheus/blackbox-exporter.nix | 4 ++-- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix index 388e4d4ac01..ce2e1cf2d74 100644 --- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix @@ -57,8 +57,8 @@ in { AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes ExecStart = '' ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ - -web.listen-address :${toString cfg.port} \ - -config.file ${cfg.configFile} \ + --web.listen-address :${toString cfg.port} \ + --config.file ${cfg.configFile} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index ccbcce26033..27e6dea01ec 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.5.0"; + version = "0.8.1"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1q719q7xslksj9m5c5d8jmap9380nsrdc71yjyn70rimv8xmzfj1"; + sha256 = "1bnn1xa11593m66ihdnyka0ck8zmg4abvwdyy5fpnyx29g3ym4sd"; }; meta = with stdenv.lib; { From b2353e60420fca037fa99bceca8bf065399f16c2 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Mon, 7 Aug 2017 22:30:31 +0100 Subject: [PATCH 165/213] umemcache: fix build; remove broken status --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1764b4b743b..be5b4233ea7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23908,11 +23908,12 @@ in { sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; }; + hardeningDisable = [ "format" ]; + meta = { description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; homepage = https://github.com/esnme/ultramemcache; license = licenses.bsdOriginal; - broken = true; }; }; From 1844dfc491d187429a6a2bbc81c04362a96a1a46 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Mon, 7 Aug 2017 22:32:54 +0100 Subject: [PATCH 166/213] konfig: 0.9 -> 1.1 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1764b4b743b..bc1cc902173 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12014,7 +12014,7 @@ in { konfig = buildPythonPackage rec { name = "konfig-${version}"; - version = "0.9"; + version = "1.1"; # konfig unconditionaly depend on configparser, even if it is part of # the standard library in python 3.2 or above. @@ -12023,10 +12023,10 @@ in { src = pkgs.fetchgit { url = https://github.com/mozilla-services/konfig.git; rev = "refs/tags/${version}"; - sha256 = "1kc5iy61ckbmf65d9ssyqiyb25lnxjvr7c2vcsdl9wx4n6fhwzx3"; + sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c"; }; - propagatedBuildInputs = with self; [ configparser argparse ]; + propagatedBuildInputs = with self; [ configparser argparse six ]; meta = { description = "Yet Another Config Parser"; From 5acb1b2d0fa5bf291cef88165c7e68b96a07f71a Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Mon, 7 Aug 2017 22:33:53 +0100 Subject: [PATCH 167/213] konfig: remove obsolete argparse dependency; fixes build failure --- pkgs/top-level/python-packages.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc1cc902173..3c7d841821e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12026,7 +12026,23 @@ in { sha256 = "1h780fbrv275dcik4cs3rincza805z6q726b48r4a0qmh5d8160c"; }; - propagatedBuildInputs = with self; [ configparser argparse six ]; + propagatedBuildInputs = with self; [ configparser six ]; + + patches = [ (pkgs.writeText "konfig.patch" '' + diff --git a/setup.py b/setup.py + index 96fd858..bb4db06 100644 + --- a/setup.py + +++ b/setup.py + @@ -20,7 +20,7 @@ setup(name='konfig', + author_email="tarek@mozilla.com", + include_package_data=True, + install_requires = [ + - 'configparser', 'argparse', 'six' + + 'configparser', 'six' + ], + zip_safe=False, + classifiers=classifiers, + '') ]; meta = { description = "Yet Another Config Parser"; From 9074440f11c49134f65be9fd08a89848a894eaa0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 12 Aug 2017 09:46:59 +0000 Subject: [PATCH 168/213] ocamlPackages.configurator: 0.9.0 -> 0.9.1 --- pkgs/development/ocaml-modules/janestreet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index d6acbaa7142..07422f8cc80 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -289,7 +289,8 @@ rec { configurator = janePackage { name = "configurator"; - hash = "1ll90pnprc5nah621ckvqi1gwagvglzx2mzjpkppddw1kr320w80"; + version = "0.9.1"; + hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix"; propagatedBuildInputs = [ ppx_base ]; meta.description = "Helper library for gathering system configuration"; }; From 9b92af99420d644f1574955200112f1d52284eae Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 12 Aug 2017 11:20:53 +0100 Subject: [PATCH 169/213] pythonPackages.pasteScript: fix typo in name --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 54cc59be09a..62a228a165e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16266,7 +16266,7 @@ in { pasteScript = buildPythonPackage rec { version = "1.7.5"; - name = "PasterScript-${version}"; + name = "PasteScript-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/P/PasteScript/${name}.tar.gz"; From c0fc1670f5a889a991c8ab7b035d30e3d7dbf98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 12 Aug 2017 11:17:35 +0100 Subject: [PATCH 170/213] pythonPackages.umemcache: move expression out of python-packages.nix --- .../python-modules/umemcache/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------------- 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/umemcache/default.nix diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix new file mode 100644 index 00000000000..4d09fda83da --- /dev/null +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchurl }: + +buildPythonPackage rec { + name = "umemcache-${version}"; + version = "1.6.3"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/u/umemcache/${name}.zip"; + sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; + }; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; + homepage = https://github.com/esnme/ultramemcache; + license = licenses.bsdOriginal; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de64b64bed7..cbf654b9890 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23658,24 +23658,7 @@ in { }; - umemcache = buildPythonPackage rec { - name = "umemcache-${version}"; - version = "1.6.3"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/umemcache/${name}.zip"; - sha256 = "211031a03576b7796bf277dbc9c9e3e754ba066bbb7fb601ab5c6291b8ec1918"; - }; - - hardeningDisable = [ "format" ]; - - meta = { - description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; - homepage = https://github.com/esnme/ultramemcache; - license = licenses.bsdOriginal; - }; - }; + umemcache = callPackage ../development/python-modules/umemcache {}; unicodecsv = buildPythonPackage rec { version = "0.14.1"; From fb36d9edb30102a5bd041940fb438241735788fa Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Sat, 12 Aug 2017 12:28:46 +0200 Subject: [PATCH 171/213] vivaldi: 1.10.867.48-1 -> 1.11.917.39-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d5006eec3ab..a1238cb5964 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.10.867.48-1"; + version = "1.11.917.39-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "1han45swvv0y2i2kg7xhml1wj5zyrf2c2hc5b07kqsjkfg9iz1lc"; + sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index fb10e2b6c83..1a1b7ae142c 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "59.0.3071.104"; + version = "60.0.3112.90"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf"; + sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5"; }; buildInputs = [ ]; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { python2 xdg_utils ]; + patches = [ + ../chromium/patches/chromium-gn-bootstrap-r8.patch + ]; + configurePhase = '' runHook preConfigure From e93fe9a1bde82b2d9892ea44be9b62d09ddc756f Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Fri, 7 Apr 2017 23:28:33 -0700 Subject: [PATCH 172/213] bitcoinarmory: init at 0.96.1 --- .../misc/bitcoinarmory/default.nix | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 89 insertions(+) create mode 100644 pkgs/applications/misc/bitcoinarmory/default.nix diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix new file mode 100644 index 00000000000..78ac55088a4 --- /dev/null +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchFromGitHub, pythonPackages +, pkgconfig, autoreconfHook, rsync +, swig, qt4, fcgi +, bitcoin, procps, utillinux +}: +let + + version = "0.96.1"; + sitePackages = pythonPackages.python.sitePackages; + inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted; + +in mkPythonDerivation { + + name = "bitcoinarmory-${version}"; + + src = fetchFromGitHub { + owner = "goatpig"; + repo = "BitcoinArmory"; + rev = "v${version}"; + #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2"; + sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; + }; + + # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. + #patches = [ ./shutdown-fix.patch ]; + + buildInputs = [ + pkgconfig + autoreconfHook + swig + qt4 + fcgi + rsync # used by silly install script (TODO patch upstream) + ]; + + propagatedBuildInputs = [ + pyqt4 + psutil + twisted + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + makeWrapperArgs = [ + "--prefix PATH : ${bitcoin}/bin" # for `bitcoind` + "--prefix PATH : ${procps}/bin" # for `free` + "--prefix PATH : ${utillinux}/bin" # for `whereis` + "--suffix LD_LIBRARY_PATH : $out/lib" # for python bindings built as .so files + "--run cd\\ $out/lib/armory" # so that GUI resources can be loaded + ]; + + # auditTmpdir runs during fixupPhase, so patchelf before that + preFixup = '' + newRpath=$(patchelf --print-rpath $out/bin/ArmoryDB | sed -r 's|(.*)(/tmp/nix-build-.*libfcgi/.libs:?)(.*)|\1\3|') + patchelf --set-rpath $out/lib:$newRpath $out/bin/ArmoryDB + ''; + + # fixupPhase of mkPythonDerivation wraps $out/bin/*, so this needs to come after + postFixup = '' + wrapPythonProgramsIn $out/lib/armory "$out $pythonPath" + ln -sf $out/lib/armory/ArmoryQt.py $out/bin/armory + ''; + + meta = { + description = "Bitcoin wallet with cold storage and multi-signature support"; + longDescription = '' + Armory is the most secure and full featured solution available for users + and institutions to generate and store Bitcoin private keys. This means + users never have to trust the Armory team and can use it with the Glacier + Protocol. Satoshi would be proud! + + Users are empowered with multiple encrypted Bitcoin wallets and permanent + one-time ‘paper backups’. Armory pioneered cold storage and distributed + multi-signature. Bitcoin cold storage is a system for securely storing + Bitcoins on a completely air-gapped offline computer. + + Maintainer's note: The original authors at https://bitcoinarmory.com/ + discontinued development. I elected instead to package GitHub user + @goatpig's fork, as it's the most active, at time of this writing. + ''; + homepage = https://github.com/goatpig/BitcoinArmory; + license = stdenv.lib.licenses.agpl3Plus; + maintainers = with stdenv.lib.maintainers; [ elitak ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c783b3cb916..c324ad38251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13401,6 +13401,8 @@ with pkgs; bibletime = callPackage ../applications/misc/bibletime { }; + bitcoinarmory = callPackage ../applications/misc/bitcoinarmory { pythonPackages = python2Packages; }; + bitkeeper = callPackage ../applications/version-management/bitkeeper { gperf = gperf_3_0; }; From b80b54fbfb1d046f0f86565f6836666f751cf2ce Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sat, 12 Aug 2017 11:05:14 +0200 Subject: [PATCH 173/213] gti: 2016-12-07 -> 1.6.1 --- pkgs/tools/misc/gti/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index 726c7a115ee..a66b32c789c 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gti-${version}"; - version = "2016-12-07"; + version = "1.6.1"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; - rev = "d78001bd5b4b6f6ad853b4ec810e9a1ecde1ee32"; - sha256 = "0449h9m16x542fy6gmhqqkvkg7z7brxw5vmb85nkk1gdlr9pl1mr"; + rev = "v${version}"; + sha256 = "19q3r4v22z2q1j4njap356f3mcq6kwh6v8nbbq2rw4x3cdxwdv51"; }; installPhase = '' From 71615c19af23a630515e001186cbfcabe7e68b1a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 12 Aug 2017 13:22:04 +0200 Subject: [PATCH 174/213] python35: add no-ldconfig.patch again after it was accidentally removed in d6c510927651edefc5d5a5ef7070a39dfc94144e --- pkgs/development/interpreters/python/cpython/3.5/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 82db26960bc..32bc0e22d1d 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -64,6 +64,10 @@ in stdenv.mkDerivation { substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' ''; + patches = [ + ./no-ldconfig.patch + ]; + postPatch = '' # Determinism substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])" From a726fcf153756e9936c8e55671bf2fe8d80e38dc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 13:27:41 +0200 Subject: [PATCH 175/213] freestyle: remove marked as broken and integrated in blender: http://freestyle.sourceforge.net/ --- pkgs/misc/freestyle/default.nix | 54 ---------- pkgs/misc/freestyle/patch | 182 -------------------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 238 deletions(-) delete mode 100644 pkgs/misc/freestyle/default.nix delete mode 100644 pkgs/misc/freestyle/patch diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix deleted file mode 100644 index 6d022220794..00000000000 --- a/pkgs/misc/freestyle/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer -, swig, python }: - -stdenv.mkDerivation { - name = "freestyle-2.2.0"; - - src = fetchurl { - url = mirror://sourceforge/freestyle/freestyle.2.2.0-src.tar.bz2; - sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga"; - }; - - buildInputs = [ qt4 libpng lib3ds freeglut libXi libqglviewer swig ]; - - inherit python freeglut libqglviewer lib3ds; # if you want to use another adopt patch and Config.pri - - buildPhase = '' - export PYTHON_VERSION=2.5 - cd src/system && qmake -makefile PREFIX=\$out && cd .. - cd rendering && qmake -makefile PREFIX=\$out && cd .. - qmake -makefile PREFIX=\$out && make - cd swig && make -f Makefile - cd ../.. - - hide=$out/nix-support/hide - moddir=$out/share/freestyle - mkdir -p $out/bin $moddir $hide - cp -r style_modules $moddir - cp build/lib/*.so* $hide - cp build/Freestyle $hide - cp -r build/linux-g++/debug/lib/python $hide/pylib - cat > $out/bin/Freestyle << EOF - #!/bin/sh - echo use export PYTHONPATH to add your py files to the search path - echo the style modules can be loded from directory $moddir - echo starting Freestyle know - have fun - echo -e "\n\n\n\n" - export PYTHONPATH=$PYTHONPATH:$moddir/style_modules:$hide/pylib - LD_LIBRARY_PATH=$hide - $hide/Freestyle - EOF - chmod +x $out/bin/Freestyle - ''; - - patches = ./patch; - - installPhase = ":"; - - meta = { - description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; - homepage = http://freestyle.sourceforge.net; - license = stdenv.lib.licenses.gpl2; - broken = true; - }; -} diff --git a/pkgs/misc/freestyle/patch b/pkgs/misc/freestyle/patch deleted file mode 100644 index dae1b66f9bb..00000000000 --- a/pkgs/misc/freestyle/patch +++ /dev/null @@ -1,182 +0,0 @@ -diff -U3 -r a/src/Config.pri b/src/Config.pri ---- a/src/Config.pri 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/Config.pri 2008-06-08 03:50:16.000000000 +0200 -@@ -80,11 +80,11 @@ - win32:QMAKE_CXXFLAGS *= /GR /GX - win32:QMAKE_CFLAGS *= /GR /GX - irix-n32:QMAKE_CFLAGS *= -LANG:std --irix-n32:QMAKE_CXXFLAGS *= -LANG:std --linux-g++:QMAKE_CFLAGS *= -Wno-deprecated --linux-g++:QMAKE_CXXFLAGS *= -Wno-deprecated --cygwin-g++:QMAKE_CFLAGS *= -Wno-deprecated --cygwin-g++:QMAKE_CXXFLAGS *= -Wno-deprecated -mno-win32 -+QMAKE_CXXFLAGS *= -LANG:std -+QMAKE_CFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CFLAGS *= -Wno-deprecated -fPIC -+QMAKE_CXXFLAGS *= -Wno-deprecated -fPIC - mac:QMAKE_CFLAGS *= -Wno-deprecated - mac:QMAKE_CXXFLAGS *= -Wno-deprecated - -diff -U3 -r a/src/geometry/Grid.h b/src/geometry/Grid.h ---- a/src/geometry/Grid.h 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/geometry/Grid.h 2008-06-06 22:05:52.000000000 +0200 -@@ -321,7 +321,7 @@ - for (OccludersSet::iterator it = occluders.begin(); - it != occluders.end(); - it++) { -- if ((unsigned)(*it)->userdata2 != _timestamp) { -+ if ((unsigned long)(*it)->userdata2 != _timestamp) { - (*it)->userdata2 = (void*)_timestamp; - visitor.examineOccluder(*it); - } -diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri ---- a/src/libconfig.pri 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/libconfig.pri 2008-06-07 22:23:44.000000000 +0200 -@@ -1,110 +1,32 @@ - # This file should be viewed as a -*- mode: Makefile -*- - --contains( CONFIG, 3ds1.20 ) { - message ("Using 3ds 1.2.0 module") -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds -- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.2.0 -- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.2.0/lib3ds -l3ds -- mac:INCLUDEPATH *= /usr/local/include -- mac:LIBS *= -l3ds -- mac:QMAKE_LIBDIR *= /usr/local/lib -- win32: INCLUDEPATH *= C:\include\lib3ds\1.2.0 -- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.2.0 -- win32:debug: LIBS *= lib3ds-120sd.lib -- win32:release: LIBS *= lib3ds-120s.lib --} -- --contains( CONFIG, 3ds1.30 ) { -- message ("Using 3ds 1.3.0 module") -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE/LINUX -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -l3ds -- cygwin-g++:INCLUDEPATH *= /usr/lib/lib3ds-1.3.0 -- cygwin-g++:LIBS *= -L/usr/lib/lib3ds-1.3.0/lib3ds -l3ds -- mac:INCLUDEPATH *= /usr/local/include -- mac:LIBS *= -l3ds -- mac:QMAKE_LIBDIR *= /usr/local/lib -- win32: INCLUDEPATH *= C:\include\lib3ds\1.3.0 -- win32: QMAKE_LIBDIR *= C:\lib\lib3ds\1.3.0 -- win32:debug: LIBS *= lib3ds-1_3d.lib -- win32:release: LIBS *= lib3ds-1_3.lib --} -+ INCLUDEPATH *= $(lib3ds)/include -+ LIBS *= -L$(lib3ds)/lib -l3ds - - contains( CONFIG, qglviewer ) { - message ("Using QGLViewer module") - CONFIG *= qt thread opengl glut -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer -- cygwin-g++:LIBS *= -lQGLViewer -- win32: INCLUDEPATH *= $(HOME)\INCLUDE -- win32: QMAKE_LIBDIR *= $(HOME)\LIB -- win32: LIBS *= QGLViewer.lib -+ INCLUDEPATH *= $(mesa)/include -+ LIBS *= -L$(mesa)/lib -lQGLViewer -+ LIBS *= -lQGLViewer - } - --contains( CONFIG, python2.3) { -- message ("Using python 2.3 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.3 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.3 -L$(HOME)/LIB/LINUX -- win32: INCLUDEPATH *= C:\python23\include -- win32: QMAKE_LIBDIR *= C:\python23\libs -- win32: LIBS *= python23.lib --} -- --contains( CONFIG, python2.4) { -- message ("Using python 2.4 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.4 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.4 -L$(HOME)/LIB/LINUX -- cygwin-g++:INCLUDEPATH *= /usr/include/python2.4 -- cygwin-g++:LIBS *= -lpthread -lm -lutil -- cygwin-g++:LIBS *= -L/usr/lib/python2.4/config -lpython2.4 -- win32: INCLUDEPATH *= C:\python24\include -- win32: QMAKE_LIBDIR *= C:\python24\libs -- win32: LIBS *= python24.lib --} -- --contains( CONFIG, python2.5) { -- message ("Using python 2.5 module") -- linux-g++:INCLUDEPATH *= /usr/include/python2.5 -- linux-g++:LIBS *= -lpthread -lm -lutil -- linux-g++:LIBS *= -L/usr/local/lib/ -lpython2.5 -L$(HOME)/LIB/LINUX -- mac: INCLUDEPATH *= /usr/include/python2.5 -- mac: LIBS *= -L/usr/lib/python2.5/config -lpython2.5 -- cygwin-g++:INCLUDEPATH *= /usr/include/python2.5 -- cygwin-g++:LIBS *= -lpthread -lm -lutil -- cygwin-g++:LIBS *= -L/usr/lib/python2.5/config -lpython2.5 -- win32: INCLUDEPATH *= C:\python25\include -- win32: QMAKE_LIBDIR *= C:\python25\libs -- win32: LIBS *= python25.lib --} -+message ("Using python ${PYTHON_VERSION} module") -+INCLUDEPATH *= ${python}/include/python${PYTHON_VERSION} -+LIBS *= -lpthread -lm -lutil -+LIBS *= -L${python}/lib -lpython${PYTHON_VERSION} -L$(HOME)/LIB/LINUX - - - contains( CONFIG, glut) { - message ("Using glut module") -- linux-g++:LIBS *= -lglut -lXi -- cygwin-g++:LIBS *= -lglut -lXi -- mac: LIBS *= -framework Glut -- win32:INCLUDEPATH *= C:\include -- win32: QMAKE_LIBDIR *= C:\lib\glut -- win32: LIBS *= glut32.lib -+ INCLUDEPATH *= ${freeglut}/include -+ LIBS *= -lglut -lXi -L{freeglut}/lib - } - - contains( CONFIG, qglviewer2 ) { -- message ("Using QGLViewer module") -+ MESSAGE ("Using QGLViewer module") - CONFIG *= qt thread opengl glut -- linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE -- linux-g++:LIBS *= -L$(HOME)/LIB/LINUX -lQGLViewer -- mac: LIBS *= -lQGLViewer -- cygwin-g++:LIBS *= -lQGLViewer2 -- win32: INCLUDEPATH *= C:\include\QGLViewer\2.2.5 -- win32{ -- release{ -- QMAKE_LIBDIR *= C:\lib\QGLViewer\release -- } -- debug{ -- QMAKE_LIBDIR *= C:\lib\QGLViewer\debug -- } -- } -- win32: LIBS *= QGLViewer2.lib -+ INCLUDEPATH *= $(libqglviewer)/include -+ LIBS *= -L$(libqglviewer)/lib -lQGLViewer - } -diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile ---- a/src/swig/Makefile 2008-06-06 22:08:06.000000000 +0200 -+++ b/src/swig/Makefile 2008-06-08 01:17:31.000000000 +0200 -@@ -19,14 +19,15 @@ - LIBDIR = ../../build/${PLATEFORM}/${BUILD}/lib/python - IPATH = -I../geometry -I../image -I../scene_graph -I../stroke \ - -I../system -I../view_map -I../winged_edge \ -- -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN} -+ -I${python}/include/python${PYTHON_VERSION} - # options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic - #OPTI = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686 - DBUG = #-ggdb #-pg - WARN = -w #-W -Wall #-pedantic -ansi - --CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} --LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} -+CFLAGS = ${OPTI} ${DBUG} ${WARN} ${IPATH} -fPIC -+LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} -L${python}/lib -+ - - SWIG_SRC = Freestyle.i - PY_SRC = ${SWIG_SRC:.i=.py} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72682f2170c..9a9bef20075 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18596,8 +18596,6 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - freestyle = callPackage ../misc/freestyle { }; - gajim = callPackage ../applications/networking/instant-messengers/gajim { }; gammu = callPackage ../applications/misc/gammu { }; From c39fec56a8428b4692a8b545386905d6c3bcca83 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 13:33:34 +0200 Subject: [PATCH 176/213] restund: remove marked as broken for several years and no new release fixing the build --- pkgs/servers/restund/default.nix | 33 -------------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/servers/restund/default.nix diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix deleted file mode 100644 index f5b939d85bd..00000000000 --- a/pkgs/servers/restund/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, zlib, openssl, libre, librem, mysql }: -stdenv.mkDerivation rec { - version = "0.4.2"; - name = "restund-${version}"; - src=fetchurl { - url = "http://www.creytiv.com/pub/restund-${version}.tar.gz"; - sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2"; - }; - buildInputs = [ zlib openssl libre librem mysql.lib ]; - makeFlags = [ - "LIBRE_MK=${libre}/share/re/re.mk" - "LIBRE_INC=${libre}/include/re" - "LIBRE_SO=${libre}/lib" - "LIBREM_PATH=${librem}" - ''PREFIX=$(out)'' - "USE_MYSQL=1" - ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" - ; - NIX_LDFLAGS='' -L${stdenv.lib.getLib mysql.client}/lib/mysql ''; - meta = { - homepage = http://www.creytiv.com/restund.html; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; - inherit version; - downloadPage = "http://www.creytiv.com/pub/"; - updateWalker = true; - downloadURLRegexp = "/restund-.*[.]tar[.]"; - broken = true; # probably due to glibc-2.20 - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a9bef20075..89ccc094e01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11488,8 +11488,6 @@ with pkgs; restic = callPackage ../tools/backup/restic { }; - restund = callPackage ../servers/restund {}; - rethinkdb = callPackage ../servers/nosql/rethinkdb { libtool = darwin.cctools; }; From 79ac09ea06da73281140afbd46e1464675d7285b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 13:38:32 +0200 Subject: [PATCH 177/213] ripple-rest: remove marked as broken for > 1 yr, development is frozen and author recommends moving to https://github.com/ripple/ripple-lib --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/misc/ripple-rest.nix | 110 -------------------- pkgs/servers/rippled/ripple-rest.nix | 27 ----- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 nixos/modules/services/misc/ripple-rest.nix delete mode 100644 pkgs/servers/rippled/ripple-rest.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 84d89510679..6ec3c1a112d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -214,7 +214,7 @@ plex = 193; grafana = 196; skydns = 197; - ripple-rest = 198; + # ripple-rest = 198; # unused, removed 2017-08-12 nix-serve = 199; tvheadend = 200; uwsgi = 201; @@ -489,7 +489,7 @@ sabnzbd = 194; #grafana = 196; #unused #skydns = 197; #unused - #ripple-rest = 198; #unused + # ripple-rest = 198; # unused, removed 2017-08-12 #nix-serve = 199; #unused #tvheadend = 200; #unused uwsgi = 201; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6062bf623e7..1da1ea5ae11 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -323,7 +323,6 @@ ./services/misc/radarr.nix ./services/misc/redmine.nix ./services/misc/rippled.nix - ./services/misc/ripple-rest.nix ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix diff --git a/nixos/modules/services/misc/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix deleted file mode 100644 index 49520f68a50..00000000000 --- a/nixos/modules/services/misc/ripple-rest.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.rippleRest; - - configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON { - config_version = "2.0.3"; - debug = cfg.debug; - port = cfg.port; - host = cfg.host; - ssl_enabled = cfg.ssl.enable; - ssl = { - key_path = cfg.ssl.keyPath; - cert_path = cfg.ssl.certPath; - reject_unathorized = cfg.ssl.rejectUnathorized; - }; - db_path = cfg.dbPath; - max_transaction_fee = cfg.maxTransactionFee; - rippled_servers = cfg.rippleds; - }); - -in { - options.services.rippleRest = { - enable = mkEnableOption "ripple rest"; - - debug = mkEnableOption "debug for ripple-rest"; - - host = mkOption { - description = "Ripple rest host."; - default = "localhost"; - type = types.str; - }; - - port = mkOption { - description = "Ripple rest port."; - default = 5990; - type = types.int; - }; - - ssl = { - enable = mkEnableOption "ssl"; - - keyPath = mkOption { - description = "Path to the ripple rest key file."; - default = null; - type = types.nullOr types.path; - }; - - - certPath = mkOption { - description = "Path to the ripple rest cert file."; - default = null; - type = types.nullOr types.path; - }; - - rejectUnathorized = mkOption { - description = "Whether to reject unatohroized."; - default = true; - type = types.bool; - }; - }; - - dbPath = mkOption { - description = "Ripple rest database path."; - default = "${cfg.dataDir}/ripple-rest.db"; - type = types.path; - }; - - maxTransactionFee = mkOption { - description = "Ripple rest max transaction fee."; - default = 1000000; - type = types.int; - }; - - rippleds = mkOption { - description = "List of rippled servers."; - default = [ - "wss://s1.ripple.com:443" - ]; - type = types.listOf types.str; - }; - - dataDir = mkOption { - description = "Ripple rest data directory."; - default = "/var/lib/ripple-rest"; - type = types.path; - }; - }; - - config = mkIf (cfg.enable) { - systemd.services.ripple-rest = { - wantedBy = [ "multi-user.target"]; - after = ["network.target" ]; - environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules"; - serviceConfig = { - ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}"; - User = "ripple-rest"; - }; - }; - - users.extraUsers.postgres = { - name = "ripple-rest"; - uid = config.ids.uids.ripple-rest; - createHome = true; - home = cfg.dataDir; - }; - }; -} diff --git a/pkgs/servers/rippled/ripple-rest.nix b/pkgs/servers/rippled/ripple-rest.nix deleted file mode 100644 index 3449645f185..00000000000 --- a/pkgs/servers/rippled/ripple-rest.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, nodePackages }: - -with lib; - -let - np = nodePackages.override { generated = ./package.nix; self = np; }; -in nodePackages.buildNodePackage rec { - name = "ripple-rest-${version}"; - version = "1.7.0-rc1"; - - src = fetchFromGitHub { - repo = "ripple-rest"; - owner = "ripple"; - rev = version; - sha256 = "19ixgrz40iawd927jan0g1ac8w56wxh2vy3n3sa3dn9cmjd4k2r3"; - }; - - deps = (filter (v: nixType v == "derivation") (attrValues np)); - - meta = { - description = " RESTful API for submitting payments and monitoring accounts on the Ripple Network"; - homepage = https://github.com/ripple/ripple-rest; - maintainers = with maintainers; [ offline ]; - license = [ licenses.mit ]; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89ccc094e01..34e46b2885d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11496,8 +11496,6 @@ with pkgs; boost = boost159; }; - #ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; - s6 = callPackage ../tools/system/s6 { }; s6-rc = callPackage ../tools/system/s6-rc { }; From a33dfc86f3c63b377951a41efdfea8e1a4d3aafe Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 14:01:08 +0200 Subject: [PATCH 178/213] ultrastardx: 1.1, 1.3-beta -> 2017.8.0 --- pkgs/games/ultrastardx/1.1.nix | 32 ------------------- .../ultrastardx/{1.3-beta.nix => default.nix} | 10 +++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 9 +----- 4 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 pkgs/games/ultrastardx/1.1.nix rename pkgs/games/ultrastardx/{1.3-beta.nix => default.nix} (86%) diff --git a/pkgs/games/ultrastardx/1.1.nix b/pkgs/games/ultrastardx/1.1.nix deleted file mode 100644 index 9810d5186b0..00000000000 --- a/pkgs/games/ultrastardx/1.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, pkgconfig, lua, fpc, pcre, portaudio, freetype, libpng -, SDL, SDL_image, ffmpeg, sqlite, zlib, libX11 }: - -stdenv.mkDerivation rec { - name = "ultrastardx-1.1"; - src = fetchurl { - url = "mirror://sourceforge/ultrastardx/${name}-src.tar.gz"; - sha256 = "0sfj5rfgj302avcp6gj5hiypcxms1wc6h3qzjaf5i2a9kcvnibcd"; - }; - - buildInputs = [ pkgconfig fpc pcre portaudio freetype libpng SDL SDL_image ffmpeg - sqlite lua ]; - - - # The fpc is not properly wrapped to add -rpath. I add this manually. - # I even do a trick on lib/lib64 for libgcc, that I expect it will work. - preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL.out}/lib -rpath ${SDL_image}/lib -rpath ${libpng.out}/lib -rpath ${freetype.out}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg.out}/lib -rpath ${zlib.out}/lib -rpath ${sqlite.out}/lib -rpath ${libX11.out}/lib -rpath ${pcre.out}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc.out}/lib64 -rpath ${stdenv.cc.cc.out}/lib" - - sed -i 414,424d Makefile - ''; - - # dlopened libgcc requires the rpath not to be shrinked - dontPatchELF = true; - - meta = { - homepage = http://ultrastardx.sourceforge.net/; - description = "Free and open source karaoke game"; - license = stdenv.lib.licenses.gpl2Plus; - broken = true; - }; -} diff --git a/pkgs/games/ultrastardx/1.3-beta.nix b/pkgs/games/ultrastardx/default.nix similarity index 86% rename from pkgs/games/ultrastardx/1.3-beta.nix rename to pkgs/games/ultrastardx/default.nix index ca7d6b35a21..ce68f190992 100644 --- a/pkgs/games/ultrastardx/1.3-beta.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -12,18 +12,16 @@ let in stdenv.mkDerivation rec { name = "ultrastardx-${version}"; - version = "1.3.5-beta"; + version = "2017.8.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn"; + sha256 = "1zp0xfwzci3cjmwx3cprcxvm60cik5cvhvrz9n4d6yb8dv38nqzm"; }; - buildInputs = [ - pkgconfig autoreconfHook - fpc libpng - ] ++ sharedLibs; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ fpc libpng ] ++ sharedLibs; postPatch = '' # autoconf substitutes strange things otherwise diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 49ba2d0ccdf..5c9ae26c77b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -139,6 +139,7 @@ mapAliases (rec { telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 ucsFonts = ucs-fonts; # added 2016-07-15 + ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 vimbWrapper = vimb; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34e46b2885d..f372524008b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17569,14 +17569,7 @@ with pkgs; ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; - ultrastardx = callPackage ../games/ultrastardx/1.1.nix { - ffmpeg = ffmpeg_0; - lua = lua5; - }; - ultrastardx-beta = callPackage ../games/ultrastardx/1.3-beta.nix { - ffmpeg = ffmpeg_0; - lua = lua5; - }; + ultrastardx = callPackage ../games/ultrastardx/default.nix { }; unnethack = callPackage ../games/unnethack { }; From f7e4531979d4beb889b52663efbff2c718c70335 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 12 Aug 2017 13:49:21 +0100 Subject: [PATCH 179/213] syncserver: fix dependency conflict with webtest --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1764b4b743b..a4f7520c86c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8146,7 +8146,8 @@ in { sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; }; - propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib webtest ]; + propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib ]; + buildInputs = with self; [ webtest ]; }; pyroute2 = callPackage ../development/python-modules/pyroute2 { }; @@ -26681,7 +26682,7 @@ EOF pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid ]; - buildInputs = with self; [ testfixtures unittest2 ]; + buildInputs = with self; [ testfixtures unittest2 webtest ]; #doCheck = false; # lazy packager }; From d6c1d2f793473d25838433cc882753982067496b Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Mon, 7 Aug 2017 23:45:25 +0100 Subject: [PATCH 180/213] firefox syncserver service: fix PYTHONPATH --- .../modules/services/networking/firefox/sync-server.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix index 3a95b9c4ec9..c1a14931429 100644 --- a/nixos/modules/services/networking/firefox/sync-server.nix +++ b/nixos/modules/services/networking/firefox/sync-server.nix @@ -119,12 +119,13 @@ in config = mkIf cfg.enable { - systemd.services.syncserver = { + systemd.services.syncserver = let + syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]); + in { after = [ "network.target" ]; description = "Firefox Sync Server"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.pythonPackages.pasteScript pkgs.coreutils ]; - environment.PYTHONPATH = "${pkgs.pythonPackages.syncserver}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages"; + path = [ pkgs.coreutils syncServerEnv ]; preStart = '' if ! test -e ${cfg.privateConfig}; then umask u=rwx,g=x,o=x @@ -133,7 +134,7 @@ in echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')" fi ''; - serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}"; + serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}"; }; }; From 02d168e13057d4b07577ae2a3cab159a485804a7 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 12 Aug 2017 15:17:39 +0100 Subject: [PATCH 181/213] Pull request template: comment out instructions --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e847c73a889..7e7c2418712 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,7 +3,7 @@ ###### Things done -Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. + - [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, From cdb7197d3e980d72b31ffa1a4a1ff2b17568d6db Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 14:11:14 +0200 Subject: [PATCH 182/213] glestae: remove Has been broken for years --- pkgs/games/glestae/default.nix | 34 --------------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/games/glestae/default.nix diff --git a/pkgs/games/glestae/default.nix b/pkgs/games/glestae/default.nix deleted file mode 100644 index 2a2809cc805..00000000000 --- a/pkgs/games/glestae/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl -, mesa, cmake, lua5, SDL, openal, libvorbis, libogg, zlib, physfs -, freetype, libpng, libjpeg, glew, wxGTK28, libxml2, libpthreadstubs -}: - -stdenv.mkDerivation rec { - name = "glestae-${version}"; - version = "0.3.2"; - - src = fetchurl { - url = "mirror://sourceforge/project/glestae/${version}/glestae-src-${version}.tar.bz2"; - sha256 = "1k02vf88mms0zbprvy1b1qdwjzmdag5rd1p43f0gpk1sms6isn94"; - }; - - buildInputs = - [ mesa cmake lua5 SDL openal libvorbis libogg zlib physfs - freetype libpng libjpeg glew wxGTK28 libxml2 libpthreadstubs - ]; - - cmakeFlags = [ - "-DLUA_LIBRARIES=-llua" - "-DGAE_DATA_DIR=$out/share/glestae" - ]; - - meta = { - description = "A 3D RTS - fork of inactive Glest project"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - # Note that some data seems to be under separate redistributable licenses - license = stdenv.lib.licenses.gpl2Plus; - broken = true; - downloadPage = "http://sourceforge.net/projects/glestae/files/0.3.2/"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f372524008b..4ca0dcbc9f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17227,8 +17227,6 @@ with pkgs; gl117 = callPackage ../games/gl-117 {}; - glestae = callPackage ../games/glestae {}; - globulation2 = callPackage ../games/globulation { boost = boost155; }; From 9b3f95498b20eee43594b17510d6a6b17ac23b0a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 14:16:12 +0200 Subject: [PATCH 183/213] soi: is not broken --- pkgs/games/soi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 7c4b2fe823c..9fcab8b1ec9 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin nckx ]; platforms = platforms.linux; license = licenses.free; - broken = true; downloadPage = http://sourceforge.net/projects/soi/files/; }; } From 0376ccb7045401248dcd2b84f5fb4b8f1df61cb3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 16:54:11 +0200 Subject: [PATCH 184/213] phpPackages.composer: 1.4.2 -> 1.5.1 --- pkgs/top-level/php-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cec9674c8b5..1d07acb8e77 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -235,14 +235,14 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1x467ngxb976ba2r9kqba7jpvm95a0db8nwaa2z14zs7xv1la6bb"; + sha256 = "107v8hdgmi2s15zsd9ffrr3jyw01qkwv174y9gw9fbpdrjwffi97"; }; + unpackPhase = ":"; - phases = [ "installPhase" ]; buildInputs = [ pkgs.makeWrapper ]; installPhase = '' From 7eca5a73885b6a764283909ccc71408a7346ce63 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 12 Aug 2017 17:03:31 +0200 Subject: [PATCH 185/213] zsh: 5.3.1 -> 5.4.1 --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 8299bef691a..50481dd941b 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.3.1"; + version = "5.4.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0hbqn1zg3x5i9klqfzhizk88jzy8pkg65r9k41b3cn42lg3ncsy1"; + sha256 = "17qg4iqhvkxsmk1p04brkjq20vb7zx6d8qx1r2q8v6cy4qvqjbjr"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "03h42gjqx7yb7qggi7ha0ndsggnnav1qm9vx737jwmiwzy8ab51x"; + sha256 = "1qhw00y0gnr66bil48hj4wjm0cbjxfdkz5hyb82garp8r8rbhiy4"; }; buildInputs = [ ncurses pcre ]; From db6a966868ecbccae4cd75a9a48d5483f052434e Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 12 Aug 2017 17:34:08 +0200 Subject: [PATCH 186/213] zynaddsubfx: 3.0.1 -> 3.0.2 --- pkgs/applications/audio/zynaddsubfx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 42fe3e34cd4..52b9a57c00b 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8"; + sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm"; }; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; From a9e463bc9d97fcc3a909014594f99590d3198a18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Aug 2017 03:00:33 +0200 Subject: [PATCH 187/213] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.4.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/3ff230318aca571c2953011d5119a7801279152d. --- .../haskell-modules/hackage-packages.nix | 1346 +++++++++++++---- 1 file changed, 1061 insertions(+), 285 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c08e246e5f1..1db281b39cd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3970,23 +3970,21 @@ self: { }) {}; "DeepDarkFantasy" = callPackage - ({ mkDerivation, base, bimap, constraint-unions, constraints - , containers, mtl, QuickCheck, random, recursion-schemes - , template-haskell + ({ mkDerivation, base, bimap, constraints, containers, mtl + , QuickCheck, random, recursion-schemes, template-haskell }: mkDerivation { pname = "DeepDarkFantasy"; - version = "0.2017.8.7"; - sha256 = "0b3p7yk3brcif92d442c8alp9vlcifxm0m0srk56zcf82sn6sxhh"; + version = "0.2017.8.11"; + sha256 = "14ibpvqy8awv6mcdm7ywybq5pk6wf6hwqq18mq8l116jgi7c9vvr"; libraryHaskellDepends = [ - base bimap constraint-unions constraints containers mtl random - recursion-schemes template-haskell + base bimap constraints containers mtl random recursion-schemes + template-haskell ]; testHaskellDepends = [ base constraints mtl QuickCheck random ]; description = "A DSL for creating neural network"; license = stdenv.lib.licenses.asl20; - broken = true; - }) {constraint-unions = null;}; + }) {}; "DefendTheKing" = callPackage ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP @@ -4809,6 +4807,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "EntrezHTTP_1_0_4" = callPackage + ({ mkDerivation, base, biocore, bytestring, conduit, HTTP + , http-conduit, hxt, mtl, network, Taxonomy, text, transformers + }: + mkDerivation { + pname = "EntrezHTTP"; + version = "1.0.4"; + sha256 = "1gp5g3r05rwayk1gdb9dfzjmywwlr5d236dygryzmga9q13gwvxq"; + libraryHaskellDepends = [ + base biocore bytestring conduit HTTP http-conduit hxt mtl network + Taxonomy text transformers + ]; + homepage = "https://github.com/eggzilla/EntrezHTTP"; + description = "Libary to interface with the NCBI Entrez REST service"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "EnumContainers" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -17430,6 +17446,22 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "Taxonomy_1_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl + , graphviz, parsec, text, vector + }: + mkDerivation { + pname = "Taxonomy"; + version = "1.0.3"; + sha256 = "0w4j1v2l7c8a8x0rpvq1gxbvjcw83kj84m5bw6bwx3x6gc997xxn"; + libraryHaskellDepends = [ + aeson base bytestring either-unwrap fgl graphviz parsec text vector + ]; + description = "Libary for parsing, processing and vizualization of taxonomy data"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "TaxonomyTools" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, cmdargs , directory, either-unwrap, EntrezHTTP, fgl, hxt, parsec, process @@ -18301,23 +18333,25 @@ self: { }) {}; "Villefort" = callPackage - ({ mkDerivation, base, FindBin, HDBC, HDBC-sqlite3, mtl, random - , scotty, split, text, time + ({ mkDerivation, base, directory, filepath, FindBin, HDBC + , HDBC-sqlite3, mtl, process, QuickCheck, random, scotty, split + , strict, text, time, transformers, unix }: mkDerivation { pname = "Villefort"; - version = "0.1.0.8"; - sha256 = "0974k5adxxa0jpi99wqq13lnav2rdb7qr40snvycsazk5mx1fd35"; + version = "0.1.1.1"; + sha256 = "0zba13j6va4bnyxgkp7yq5y7mvyw94x0932kf75b33bw3pan04hz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base FindBin HDBC HDBC-sqlite3 mtl random split time + base directory filepath FindBin HDBC HDBC-sqlite3 mtl process + random scotty split strict text time transformers unix ]; executableHaskellDepends = [ - base HDBC HDBC-sqlite3 scotty split text time + base HDBC HDBC-sqlite3 random scotty split text time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base HDBC HDBC-sqlite3 QuickCheck ]; homepage = "https://github.com/Chrisr850/Villefort#readme"; description = "Villefort is a task manager and time tracker written in haskell"; license = stdenv.lib.licenses.bsd3; @@ -18712,6 +18746,8 @@ self: { pname = "Win32-extras"; version = "0.2.0.1"; sha256 = "00lrqvsa74mqv0k4yz00j2jdpmchkyhcicqv24z9a53iv1i0xp7h"; + revision = "1"; + editedCabalFile = "0gxp1a5sk9jb7x1mvz5jk68n8npvh8b9nlqcw9s2dn4wlyicm4mp"; libraryHaskellDepends = [ base Win32 ]; librarySystemDepends = [ imm32 msimg32 ]; homepage = "http://hub.darcs.net/shelarcy/Win32-extras/"; @@ -25525,12 +25561,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-wl-pprint_0_6_8" = callPackage + "ansi-wl-pprint_0_6_8_1" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; - version = "0.6.8"; - sha256 = "114ga28xa2wkdf4azyhffwjh94zxa62q2z0cn58xhnca1y2b3xjx"; + version = "0.6.8.1"; + sha256 = "0qxk0iibbyqk7fmrq5cbkr1269bd6vqbdmj2n8s5bvds0836mnnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; @@ -27223,8 +27259,8 @@ self: { }: mkDerivation { pname = "array-primops"; - version = "0.2.0.0"; - sha256 = "02ln59zhkgi1l1zbci2zxyyidhlxmz22csky1y0zdx119nsnhsza"; + version = "0.2.0.1"; + sha256 = "0kdf88xs6aplxah90pl2r94fgfl58a4fmpxjcbvb9996823q54qg"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim QuickCheck tasty tasty-quickcheck @@ -29257,8 +29293,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "14"; - editedCabalFile = "1xmpf1r6lm3j577svyg43520f3sv838p711s46xh7f6ch4qgdx0i"; + revision = "15"; + editedCabalFile = "06vhxs4172liq6ayf2cg3b45hk3jkcxbgz1ilwqrw9bbn8lfgq6s"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -33911,8 +33947,8 @@ self: { }: mkDerivation { pname = "bit-stream"; - version = "0.1.0.1"; - sha256 = "0qza9w01qwrbfa35dzhfzxxd8ss1aww332s48sbpdjq3ywkjgk81"; + version = "0.1.0.2"; + sha256 = "1x4vcg2y2il540syqdzk2wdixs8g672lhzjm46y40x4299yjw7w1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim vector ]; @@ -35933,6 +35969,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "boomerang_1_4_5_3" = callPackage + ({ mkDerivation, base, mtl, template-haskell, text }: + mkDerivation { + pname = "boomerang"; + version = "1.4.5.3"; + sha256 = "124k13x5wzjy2qlbdgixncgr5l7cxw4glq1hjb8hyk8vfvgs6qfl"; + libraryHaskellDepends = [ base mtl template-haskell text ]; + description = "Library for invertible parsing and printing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "boomslang" = callPackage ({ mkDerivation, base, containers, data-accessor , data-accessor-template, font-opengl-basic4x6, GLFW-b, MonadRandom @@ -36309,8 +36357,8 @@ self: { }: mkDerivation { pname = "brainheck"; - version = "0.1.0.3"; - sha256 = "0b153bjibqm6qicnh3r42fcv4w2c4qagllg0f1k5gxg903954xma"; + version = "0.1.0.4"; + sha256 = "0jar6jlid339k9rimlawah9800nqdybbr3l2k44y6i7q5pb656by"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44408,8 +44456,8 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.1.1"; - sha256 = "1v3f4ms6q4sb3fkkby03xikkkbip55lgwpmlay9c9jfs4mybpmxd"; + version = "0.1.3"; + sha256 = "1fkisbrydmdx5h8yad09fzk8h1b1j53r02g7vb81izgdwj9b673k"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -44451,6 +44499,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-patterns" = callPackage + ({ mkDerivation, base, cmark }: + mkDerivation { + pname = "cmark-patterns"; + version = "0.1.0.0"; + sha256 = "15pdlcc0ak1pbx7qz6w5xfv4g9wkapx0flxqqkhcksa4k1h3hr1f"; + libraryHaskellDepends = [ base cmark ]; + homepage = "http://github.com/aelve/cmark-patterns"; + description = "Pattern synonyms for cmark"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmark-sections" = callPackage ({ mkDerivation, base, base-prelude, cmark, containers, hspec , microlens, QuickCheck, split, text @@ -45181,8 +45241,8 @@ self: { }: mkDerivation { pname = "collection-json"; - version = "1.0.0.0"; - sha256 = "0v068wayi1f22infgccflpfg78zcwqdga3q6980jxs7irng9xsjv"; + version = "1.0.1.0"; + sha256 = "1vq21mjc0zfn1q1mwscq3m5j3dls8dsfcanc9n8kp3sz4lz2f3zw"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ aeson base network-uri QuickCheck quickcheck-instances @@ -46357,6 +46417,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-prelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "composition-prelude"; + version = "0.1.0.1"; + sha256 = "0a020wl2i84f30y21yywdb4qhr3a1lrjmmcw25kfjg011gdxggf4"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/composition-prelude#readme"; + description = "Higher-order function combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composition-tree" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { @@ -46654,8 +46726,8 @@ self: { }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.13"; - sha256 = "1vhwph94v6wspfk4bxafv9zq0l6x5s3lz7rrz9xc99pqwz3dhj2l"; + version = "0.1.0.14"; + sha256 = "1qmnmwdk1gz6kn35j150xgdz3fiz895l3qn1km11i6g3ns46rjvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47095,8 +47167,8 @@ self: { }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.1.0"; - sha256 = "1i9jhnlq09shb9l3i0p09di6vrbwnpv1jsa4dkmrvy4z347jxq7n"; + version = "0.0.2.0"; + sha256 = "17b2j4pm6d2r80q0f33sa1iyfxszmk5lgf94qdw9hbwhs6g7rfjb"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators conduit-extra containers deepseq directory filepath mtl resourcet @@ -47324,6 +47396,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conduit-iconv_0_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, mtl + , QuickCheck, test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "conduit-iconv"; + version = "0.1.1.2"; + sha256 = "02s5jyr6mii45q4nar5fzqr4hsf7b6rw9fyc6g1jrqjr76xk6vsw"; + libraryHaskellDepends = [ base bytestring conduit ]; + testHaskellDepends = [ + base bytestring conduit mtl QuickCheck test-framework + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion mtl text + ]; + homepage = "https://github.com/sdroege/conduit-iconv"; + description = "Conduit for character encoding conversion"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-merge" = callPackage ({ mkDerivation, base, conduit, mtl }: mkDerivation { @@ -50019,8 +50113,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.18"; - sha256 = "0w0vrgqiwpy3s3saqjwqy15vky3y1vvhb3ncq1sy52y4csszzmh5"; + version = "5.9.19"; + sha256 = "1ar2zbjan63bcwinp3vxxgbpvlr2vffk26b3vr479gdw0mngwa91"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl @@ -55439,8 +55533,8 @@ self: { }: mkDerivation { pname = "debug-me"; - version = "1.20170510"; - sha256 = "0lxzy58a1qyl3vwhn9faiibsfrkaqxylvsdxhfki1x03amwzwnyw"; + version = "1.20170810"; + sha256 = "11lbqp7j8wi1r7wkh2fg0rvgkf9icwq306g8h1fz0mkqwcsxmiyq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -55913,6 +56007,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_0_7_1_0" = callPackage + ({ mkDerivation, base, concurrency, containers, deepseq, exceptions + , leancheck, mtl, random, ref-fd, semigroups, transformers + , transformers-base + }: + mkDerivation { + pname = "dejafu"; + version = "0.7.1.0"; + sha256 = "058vdwsjjh5pbjbnsr8jfx7n84d4w79r7fkavlzy0a9a2cvb3nia"; + libraryHaskellDepends = [ + base concurrency containers deepseq exceptions leancheck mtl random + ref-fd semigroups transformers transformers-base + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Systematic testing for Haskell concurrency"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -60903,6 +61016,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "drifter_0_2_3" = callPackage + ({ mkDerivation, base, containers, fgl, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "drifter"; + version = "0.2.3"; + sha256 = "0f16v4v0ff27qk71a6fsrcwy02nc53g9q1qrfscn8q3swi3rslyz"; + libraryHaskellDepends = [ base containers fgl text ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/AndrewRademacher/drifter"; + description = "Simple schema management for arbitrary databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "drifter-postgresql" = callPackage ({ mkDerivation, base, containers, drifter, either, mtl , postgresql-simple, tasty, tasty-hunit, text, time @@ -64893,8 +65024,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "error-util"; - version = "0.0.1.1"; - sha256 = "14z1yffg0lxyjqf5zpfcz493zh8y4p9d2abmdzvf56qx47r37lb8"; + version = "0.0.1.2"; + sha256 = "01jfbq43ps6wjl9z5l1g8zfdi225mfn3xy59n6vrfxh0vsi1c6fz"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/pmlodawski/error-util"; description = "Set of utils and operators for error handling"; @@ -67201,8 +67332,8 @@ self: { ({ mkDerivation, base, leancheck, speculate, template-haskell }: mkDerivation { pname = "extrapolate"; - version = "0.1.0"; - sha256 = "1y9mk8g9sfvp8cyjqfy91qrhkn76clx2lp5kbaa3q2kyhiqifg63"; + version = "0.2.1"; + sha256 = "0bb02q5pb3lx5ass9265qb25fn0g30drv0b5250njagc1gi69nrl"; libraryHaskellDepends = [ base leancheck speculate template-haskell ]; @@ -68207,13 +68338,19 @@ self: { }) {}; "feature-flipper" = callPackage - ({ mkDerivation, base, containers, hspec, mtl, text }: + ({ mkDerivation, base, bytestring, containers, digest, hspec, mtl + , text + }: mkDerivation { pname = "feature-flipper"; - version = "0.2.0.1"; - sha256 = "16d9cx3cm5ljbi6f5xmnm654hfi8kkw5wrv077k0zv41wzkpn5md"; - libraryHaskellDepends = [ base containers mtl text ]; - testHaskellDepends = [ base containers hspec mtl ]; + version = "0.2.1.2"; + sha256 = "18g90xvbgxzj2in8v3y7s6p305h0rg5p5163262vi9cdi7lrvvc8"; + libraryHaskellDepends = [ + base bytestring containers digest mtl text + ]; + testHaskellDepends = [ + base bytestring containers digest hspec mtl text + ]; homepage = "https://github.com/toddmohney/flipper#readme"; description = "A minimally obtrusive feature flag library"; license = stdenv.lib.licenses.mit; @@ -68226,8 +68363,8 @@ self: { }: mkDerivation { pname = "feature-flipper-postgres"; - version = "0.1.0.1"; - sha256 = "1mhwdqpy3l0dx7cwmxi67yp9mp223ang5vpawsh27ms0p8qbgp95"; + version = "0.1.1.1"; + sha256 = "186khsn3gqxqhxlah6m8fgl4qlwf3pgmqagvr8rnfv44vzynw8by"; libraryHaskellDepends = [ base bytestring containers feature-flipper monad-logger mtl persistent persistent-postgresql persistent-template text time @@ -68757,6 +68894,8 @@ self: { pname = "fgl"; version = "5.5.3.1"; sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy"; + revision = "1"; + editedCabalFile = "00bw87y97ym844ir4mdq0vx5kfb0brzlqmrbqa0iq35lkwsd4k3g"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -68766,6 +68905,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fgl_5_6_0_0" = callPackage + ({ mkDerivation, array, base, containers, deepseq, hspec + , microbench, QuickCheck, transformers + }: + mkDerivation { + pname = "fgl"; + version = "5.6.0.0"; + sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll"; + libraryHaskellDepends = [ + array base containers deepseq transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base deepseq microbench ]; + description = "Martin Erwig's Functional Graph Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fgl-arbitrary" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { @@ -69366,6 +69523,31 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "find-clumpiness_0_2_2_0" = callPackage + ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness + , containers, listsafe, mtl, optparse-applicative, text, text-show + , tree-fun, unordered-containers, vector + }: + mkDerivation { + pname = "find-clumpiness"; + version = "0.2.2.0"; + sha256 = "174i1yhd7z884xfci8ml9kbcm0qpnsbryj8vchrd7rwi63ya0rbw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base BiobaseNewick bytestring clumpiness containers listsafe + mtl text text-show tree-fun unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base BiobaseNewick bytestring clumpiness containers + optparse-applicative text tree-fun unordered-containers + ]; + homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; + description = "Find the clumpiness of labels in a tree"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "find-conduit" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -69592,8 +69774,8 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.1"; - sha256 = "0smv851kg4p4qfp29h85zm87x5y3qmqd3hxmznnf7cdp7arxgc74"; + version = "0.4.3"; + sha256 = "0kbv2bz4cf8bvv8i5ypcldcyxd6l7f6wwsb85vfmjqrq7kn2apr2"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -70619,8 +70801,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.3.8"; - sha256 = "018ikrd5w5h1sd0adf0ybla7a9vfw9lz06nrppspv2n3i2i55zrb"; + version = "0.5.3.9"; + sha256 = "1cvrknfg6h9w6njyx7w87qw19nd3n5615qxaf25fygd5yggydb19"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -70806,6 +70988,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmt_0_4_0_0" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, containers, criterion, deepseq, formatting, hspec + , interpolate, microlens, neat-interpolation, text, text-format + , time, time-locale-compat, vector + }: + mkDerivation { + pname = "fmt"; + version = "0.4.0.0"; + sha256 = "0ksc8nx3v26y7k25a4x0knbmy9f5c9sa7j54b6fp4xb93bcdn76h"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring containers + microlens text text-format time time-locale-compat + ]; + testHaskellDepends = [ + base bytestring containers hspec neat-interpolation text vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq formatting interpolate + text text-format vector + ]; + homepage = "http://github.com/aelve/fmt"; + description = "A new formatting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai @@ -72921,8 +73130,8 @@ self: { }: mkDerivation { pname = "ftp-client"; - version = "0.4.0.1"; - sha256 = "0k0vyyaqkpmz4znc6gvdjk3g5qfximgdac9qh252icz30fhr3bn4"; + version = "0.5.0.0"; + sha256 = "17i6jml4v88wy456p3gjzc93db1sr0p5q19vb3jw61648nmswvgb"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers @@ -72939,8 +73148,8 @@ self: { }: mkDerivation { pname = "ftp-client-conduit"; - version = "0.4.0.1"; - sha256 = "17rrirya6bk17qprzrjl6ndsyszqvwz5bya7l68wyqr4715gbaxs"; + version = "0.5.0.0"; + sha256 = "16g1j2a8kikva08bi6n22sw0limlwj8r53acrlq6licg2sdlzp06"; libraryHaskellDepends = [ base bytestring conduit-combinators connection exceptions ftp-client resourcet @@ -79761,16 +79970,16 @@ self: { }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage - ({ mkDerivation, base, basic-prelude, binary, binary-conduit - , bytestring, conduit, conduit-extra, exceptions, extra - , HUnit-approx, lens, monad-control, mtl, resourcet, rtcm, sbp - , tasty, tasty-hunit, text, time, transformers-base + ({ mkDerivation, aeson, aeson-pretty, base, basic-prelude, binary + , binary-conduit, bytestring, conduit, conduit-extra, exceptions + , extra, lens, monad-control, mtl, resourcet, rtcm, sbp, tasty + , tasty-golden, tasty-hunit, text, time, transformers-base , unordered-containers, vector }: mkDerivation { pname = "gnss-converters"; - version = "0.3.8"; - sha256 = "1l9f7vfyzikakz8lnp373l2fz4zqrisnmqdryfn3v7pdd06a21dv"; + version = "0.3.11"; + sha256 = "0f6953pp35rgy2x51db3faawmnr7lsbrdihyi16kcqbffdwcni9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79778,12 +79987,12 @@ self: { resourcet rtcm sbp time transformers-base vector ]; executableHaskellDepends = [ - base basic-prelude binary-conduit conduit conduit-extra resourcet + base basic-prelude binary-conduit conduit conduit-extra ]; testHaskellDepends = [ - base basic-prelude binary binary-conduit bytestring conduit - conduit-extra HUnit-approx lens resourcet rtcm sbp tasty - tasty-hunit text unordered-containers + aeson aeson-pretty base basic-prelude binary binary-conduit + bytestring conduit conduit-extra lens resourcet rtcm sbp tasty + tasty-golden tasty-hunit text unordered-containers ]; homepage = "http://github.com/swift-nav/gnss-converters"; description = "GNSS Converters"; @@ -81898,16 +82107,17 @@ self: { }) {}; "gotta-go-fast" = callPackage - ({ mkDerivation, base, brick, cmdargs, directory, random, time, vty + ({ mkDerivation, base, brick, cmdargs, directory, random, text + , time, vty, word-wrap }: mkDerivation { pname = "gotta-go-fast"; - version = "0.1.3.1"; - sha256 = "1fid0xshpimxq0n73741ywm4a34vscw289bw93jd4gmnihyp9bgs"; + version = "0.1.4.0"; + sha256 = "15gip4nggw3wxa3k546sqqbiqzhkw5acxwmwy3iv911d61s89gvb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick cmdargs directory random time vty + base brick cmdargs directory random text time vty word-wrap ]; homepage = "https://github.com/hot-leaf-juice/gotta-go-fast"; description = "A command line utility for practicing typing"; @@ -87225,6 +87435,8 @@ self: { pname = "hapistrano"; version = "0.3.2.2"; sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7"; + revision = "1"; + editedCabalFile = "0rx3hs8z717cmx3l97fjmyz94i0n25f69x2rk3nvgnldskvjxswv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -87242,6 +87454,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_2_4" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath, hspec + , mtl, optparse-applicative, path, path-io, process, stm, temporary + , time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.2.4"; + sha256 = "08p1060m9wjxgxai5zxhzv40c0h9xsdvcbdg33b20hzyapzgq6kl"; + revision = "1"; + editedCabalFile = "0cvbn9a7jhq8nr1cwfij5bm030d662s5hn287q5w5wx5xmmzsn9m"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base optparse-applicative path path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -87580,8 +87821,8 @@ self: { }: mkDerivation { pname = "happstack-foundation"; - version = "0.5.9"; - sha256 = "0xn176m65wjvbfqcjhwvvm7imq01iiixap4jay1wn6qzk0qn5w5n"; + version = "0.5.9.1"; + sha256 = "05fcvwa25x993ba8h034877di4y1m3yp5f5fvx4jxdybpf868jnn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state base happstack-hsp happstack-server hsp lifted-base @@ -87797,7 +88038,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "happstack-server_7_5_0" = callPackage + "happstack-server_7_5_0_1" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network @@ -87808,8 +88049,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.5.0"; - sha256 = "0ybwzb9w6mzw9mjr10rpih9hh1cs4v0wdaizl7p5l34xk441qaxw"; + version = "7.5.0.1"; + sha256 = "05cb20rj4qys7r5kkbvjnm4bknfzwanf4r4yk1jq7a71x2sgcxc0"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -87846,6 +88087,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "happstack-server-tls_7_1_6_4" = callPackage + ({ mkDerivation, base, bytestring, extensible-exceptions + , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile + , time, unix + }: + mkDerivation { + pname = "happstack-server-tls"; + version = "7.1.6.4"; + sha256 = "1wn0yv4x619sl70fy3ffby78lfjiq9d73d4rsp3mkgr6d3kn45wj"; + libraryHaskellDepends = [ + base bytestring extensible-exceptions happstack-server hslogger + HsOpenSSL network sendfile time unix + ]; + librarySystemDepends = [ openssl ]; + homepage = "http://www.happstack.com/"; + description = "extend happstack-server with https:// support (TLS/SSL)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "happstack-server-tls-cryptonite" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , extensible-exceptions, happstack-server, hslogger, network @@ -89016,6 +89277,32 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "haskell-abci" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, conduit + , conduit-combinators, conduit-extra, foundation, lens + , network-conduit, proto-lens, proto-lens-arbitrary + , proto-lens-protoc, text + }: + mkDerivation { + pname = "haskell-abci"; + version = "0.1.0.0"; + sha256 = "15d4hqld9f00vmc3cvjvhamfkcl60dfdmkkrd9yrqj044ml93kaf"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base binary bytestring conduit conduit-combinators conduit-extra + foundation lens network-conduit proto-lens proto-lens-arbitrary + proto-lens-protoc + ]; + executableHaskellDepends = [ + base binary bytestring foundation lens text + ]; + homepage = "https://github.com/cwgoes/haskell-abci#readme"; + description = "Haskell Application BlockChain Interface (ABCI) Server Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-aliyun" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, basic-prelude , blaze-builder, bytestring, case-insensitive, conduit, Crypto @@ -91849,7 +92136,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hasmin_0_3_2_3" = callPackage + "hasmin_0_3_2_4" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, directory, doctest, doctest-discover, gitrev, hopfli , hspec, hspec-attoparsec, matrix, mtl, numbers @@ -91857,8 +92144,8 @@ self: { }: mkDerivation { pname = "hasmin"; - version = "0.3.2.3"; - sha256 = "0qk551j27rc36gmrfdhlvz3kzn8yj8alzc2n86jgyx480gj354gg"; + version = "0.3.2.4"; + sha256 = "0xbc5pihr9izms94idc3bmapfs58pg2smn3ym3wnsxs69bah8xfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94999,14 +95286,14 @@ self: { }: mkDerivation { pname = "hexml-lens"; - version = "0.1.0.0"; - sha256 = "11v137m91asl52srb82xfvxjl3cyiw2213mjyy1lbqzdriz6k9lc"; + version = "0.2.0"; + sha256 = "1rj45rghjzcgdllrcz2qm1sixjl73ncij5bh5qnkdb65b5hkfhfp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring foundation hexml lens text ]; - testHaskellDepends = [ - base bytestring doctest foundation hexml lens QuickCheck text - ]; + testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/pepeiborra/hexml-lens#readme"; description = "Lenses for the hexml package"; license = stdenv.lib.licenses.bsd3; @@ -97125,8 +97412,8 @@ self: { }: mkDerivation { pname = "hjugement"; - version = "1.0.0.20170804"; - sha256 = "1liq8iq40011lnixr49fx9lm091s7y18y9f1ym19iqj07qprc3x7"; + version = "1.0.0.20170808"; + sha256 = "1za90csf836zc4iv2gn5m4049zknzp5ydham0axga13987bs2j1w"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -100404,8 +100691,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.2"; - sha256 = "085imrvkxvw06sg8wcgzba9jw8hficizjf6lmqk4ai6ahpgmml6s"; + version = "2.4.3"; + sha256 = "1qdk5s1dv3v9pvf8hrr2cwgqsvk7pfiy1k3vvdqcv5cfnknqx0y1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103543,6 +103830,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hspec-multicheck" = callPackage + ({ mkDerivation, base, hspec, hspec-smallcheck, QuickCheck + , smallcheck + }: + mkDerivation { + pname = "hspec-multicheck"; + version = "0.1"; + sha256 = "1x4c3fsvxacwh5jlfjmasxm8bznqv9b6hsd7fr0vqp6q9a2hrx8k"; + libraryHaskellDepends = [ + base hspec hspec-smallcheck QuickCheck smallcheck + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/marcellussiegburg/hspec-multicheck"; + description = "A testing framework for Haskell using Hspec"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "hspec-pg-transact" = callPackage ({ mkDerivation, base, bytestring, hspec, pg-transact , postgresql-simple, resource-pool, text, tmp-postgres @@ -104599,6 +104903,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsx2hs_0_14_1_1" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string + }: + mkDerivation { + pname = "hsx2hs"; + version = "0.14.1.1"; + sha256 = "0hymdradb2vsx7gpdwrlmkv1qg4p2r5l6pfiqc4ijyn152jrgr7b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + homepage = "https://github.com/seereason/hsx2hs"; + description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsyscall" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -104894,14 +105218,21 @@ self: { }) {}; "html-parse" = callPackage - ({ mkDerivation, attoparsec, base, criterion, deepseq, tagsoup - , text + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , hspec, hspec-discover, QuickCheck, quickcheck-instances + , string-conversions, tagsoup, text }: mkDerivation { pname = "html-parse"; - version = "0.2.0.0"; - sha256 = "14jap2xx030hzb0qs2rz30q92zivl0qd9h5z2ab3msl6vh0q97ww"; - libraryHaskellDepends = [ attoparsec base deepseq text ]; + version = "0.2.0.1"; + sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw"; + libraryHaskellDepends = [ + attoparsec base containers deepseq text + ]; + testHaskellDepends = [ + base containers hspec hspec-discover QuickCheck + quickcheck-instances string-conversions text + ]; benchmarkHaskellDepends = [ attoparsec base criterion deepseq tagsoup text ]; @@ -106393,6 +106724,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_0_7_0_0" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "0.7.0.0"; + sha256 = "0pp3rxzb00glkc9fn45hik7rn4dwampdbh7va0gdlzh1jma6wpgw"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -106748,6 +107092,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-balancedparens_0_2_0_0" = callPackage + ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess + , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.2.0.0"; + sha256 = "1yd7s4n93rparg99x3kjsfiyk1si8kfg2ibfz5da1dlnzpffvmfq"; + libraryHaskellDepends = [ + base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple + vector + ]; + testHaskellDepends = [ + base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector + ]; + benchmarkHaskellDepends = [ + base criterion hw-bits hw-prim vector + ]; + homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-int , hw-prim, hw-string-parse, QuickCheck, safe, vector @@ -106859,6 +107227,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-excess_0_2_0_0" = callPackage + ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base + , QuickCheck, safe, storable-record, vector + }: + mkDerivation { + pname = "hw-excess"; + version = "0.2.0.0"; + sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi"; + libraryHaskellDepends = [ + base hw-bits hw-prim hw-rankselect-base safe storable-record vector + ]; + testHaskellDepends = [ + base hspec hw-bits hw-prim QuickCheck vector + ]; + homepage = "http://github.com/haskell-works/hw-excess#readme"; + description = "Excess"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, vector }: mkDerivation { @@ -107146,7 +107534,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_10_0_0" = callPackage + "hw-rankselect_0_10_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, hedgehog, hspec, hw-balancedparens, hw-bits , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap @@ -107154,8 +107542,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.10.0.0"; - sha256 = "09lnxig3z7792f24jlijm76psa5ihjzdb4g1ilg8iria9h825q1n"; + version = "0.10.0.1"; + sha256 = "0xpgm2r05cshsn7ddkx6pxfj80y5fgpvi1r11iqxvdgnfdhpv780"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112424,15 +112812,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-client_0_4_4_3" = callPackage + "irc-client_0_4_4_4" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text , time, tls, transformers, x509, x509-store, x509-validation }: mkDerivation { pname = "irc-client"; - version = "0.4.4.3"; - sha256 = "0m85swb00hkpj13rk413vd7zxwsqps20kqnjwzwi14288awigjd1"; + version = "0.4.4.4"; + sha256 = "0y858xsjl16vlb9ifvw7akw727zmg06i5ald78r8828c8piqa259"; libraryHaskellDepends = [ base bytestring conduit connection irc-conduit irc-ctcp network-conduit-tls old-locale stm stm-conduit text time tls @@ -112474,15 +112862,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-conduit_0_2_2_2" = callPackage + "irc-conduit_0_2_2_3" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.2"; - sha256 = "0glgq9wbx0i42ry7ribp8r54lsx39qjvvd9dhx1cnv5bb5jwihas"; + version = "0.2.2.3"; + sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -113213,15 +113601,15 @@ self: { "ivory" = callPackage ({ mkDerivation, alex, array, base, base-compat, containers, dlist , filepath, happy, monadLib, pretty, template-haskell, text - , th-lift + , th-abstraction, th-lift }: mkDerivation { pname = "ivory"; - version = "0.1.0.6"; - sha256 = "13akncp29sqidkqxfbv6k2gadipdzvnk6svgwm1p29xr5wxfizca"; + version = "0.1.0.7"; + sha256 = "1qf0kp863ivb57mrc27kh1vm5a7ikfiz1hk32pm3jq8h7i2znh1s"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty - template-haskell text th-lift + template-haskell text th-abstraction th-lift ]; libraryToolDepends = [ alex happy ]; homepage = "http://ivorylang.org"; @@ -113253,10 +113641,8 @@ self: { }: mkDerivation { pname = "ivory-backend-c"; - version = "0.1.0.5"; - sha256 = "0dg5408il1s9z1v69k8vw80ypmkbanvqfsw8a5gi8l3b9xinjzg0"; - revision = "3"; - editedCabalFile = "09r09jbbj6a3qm07gj64pbszs72kpvab0320flg6rq9ng2pswv49"; + version = "0.1.0.7"; + sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory @@ -116875,8 +117261,8 @@ self: { }: mkDerivation { pname = "keysafe"; - version = "0.20170303"; - sha256 = "0nmlm6izhg0nh4wh6vrdl8sm6w447x3jnx4nxxwxxz4mfy4yx18p"; + version = "0.20170811"; + sha256 = "12akw0r3m4pz8gb1sxa8azm17jq8564300wwh3c5f47dy29p23py"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119022,6 +119408,8 @@ self: { pname = "language-lua"; version = "0.10.0"; sha256 = "0qiwzprwj7kfppa0a3h1ir1bxwwfq48wl31hv1c724p5vyv1480c"; + revision = "1"; + editedCabalFile = "0l90w79xn0k1wqhz7gb2ih33nja3w9m8pp11d9dxdg5am05fyhm2"; libraryHaskellDepends = [ array base bytestring deepseq text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -124246,8 +124634,8 @@ self: { }: mkDerivation { pname = "lmdb-simple"; - version = "0.3.0.0"; - sha256 = "1sin30ddq206f86br9snidskn02m4s6wwaaylvpmxzhay40b2f6i"; + version = "0.3.1.0"; + sha256 = "1d43gss6ri05rnjsjfmaxpzb91gfvnjhz41ls7rjmqa1x8ym2lsn"; libraryHaskellDepends = [ base bytestring lmdb serialise ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -124587,6 +124975,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-base_0_7_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, mmorph, monad-control, monad-time, mtl, semigroups + , stm, text, time, transformers-base, unordered-containers + }: + mkDerivation { + pname = "log-base"; + version = "0.7.2.0"; + sha256 = "1lxlm76n1yhdkqmi44m4h460sc3a6lmscaz2daci16vvl4kzilds"; + revision = "1"; + editedCabalFile = "0x11xxfvlak8p7p544gknm2k7nqh1wq01bg800gdgppxcpv3m4li"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq exceptions mmorph + monad-control monad-time mtl semigroups stm text time + transformers-base unordered-containers + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (base package)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving @@ -124673,6 +125083,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-elasticsearch_0_9_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bloodhound, bytestring, deepseq, http-client, http-client-tls + , log-base, semigroups, text, text-show, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "log-elasticsearch"; + version = "0.9.1.0"; + sha256 = "0i6mpdh1g25wa9yk9p5isg7idjqh3z0zd2mm43707z4s36pfr9m5"; + revision = "1"; + editedCabalFile = "1c2245z8ajy11n033my5wzj9q79vbj4jlysy477syr6h5840wd6x"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bloodhound bytestring + deepseq http-client http-client-tls log-base semigroups text + text-show time transformers unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (Elasticsearch back end)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-postgres" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base @@ -124694,6 +125127,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-postgres_0_7_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base + , mtl, semigroups, split, text, text-show, time + , unordered-containers, vector + }: + mkDerivation { + pname = "log-postgres"; + version = "0.7.0.2"; + sha256 = "16v3wli0jll5j24pdzmya90lyawqv3rcvsfd4z88kgcchds07iji"; + revision = "1"; + editedCabalFile = "1f18nzrh3bxnb58cmd3zyqpwaw2jyfl92dg6qd30zhlvlnkz1q7q"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring deepseq + hpqtypes http-client lifted-base log-base mtl semigroups split text + text-show time unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (PostgreSQL back end)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-utils" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default , exceptions, hpqtypes, http-types, invariant, kontra-config @@ -125514,8 +125970,8 @@ self: { }: mkDerivation { pname = "loup"; - version = "0.0.14"; - sha256 = "0j700rms8g1k8lz2anwh9j6pq8f4yqxmcvkn1ssxx2k5dvbq7q80"; + version = "0.0.15"; + sha256 = "1pb2ka69vpv9x318b80dcgk72g6r4s24j9n8dcjg0ibw6cxsn5fg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126654,8 +127110,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "2.4.0.1"; - sha256 = "1qldc05017i1dy1mcl79r0ynxx66qqnsyp8f3y5lk4jdgrfz9mb1"; + version = "2.4.0.2"; + sha256 = "0jc86l0cz9nnp11fdn10qyb78g1klaq6qlipqrzrq5vil419vdss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129178,7 +129634,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_6_0_2" = callPackage + "megaparsec_6_1_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -129186,8 +129642,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "6.0.2"; - sha256 = "0j056smq8k0pal765vanjzg51aw7wxv0qihsipirb6d7ik03didf"; + version = "6.1.0"; + sha256 = "1096frlw1q7mgr87ndbwbg26dcmj1yv8a88xwwwy4p2f5m4df0fd"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -129858,7 +130314,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "metrics_0_4_1_0" = callPackage + "metrics_0_4_1_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , HUnit, lens, mwc-random, primitive, QuickCheck, text, time , transformers, transformers-base, unix-compat @@ -129866,8 +130322,8 @@ self: { }: mkDerivation { pname = "metrics"; - version = "0.4.1.0"; - sha256 = "0d4pp1f2ag7bmsxb57p1h6c2qxf1svda9vdlrg8p8111nim5miar"; + version = "0.4.1.1"; + sha256 = "1f2vqwldp457956bx839r9v3xpmp95q42insn2xcdw669rq6wpym"; libraryHaskellDepends = [ ansi-terminal base bytestring containers lens mwc-random primitive text time transformers transformers-base unix-compat @@ -130066,6 +130522,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens_0_4_8_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.8.1"; + sha256 = "0iqagqc3c6b6ihydhc6s7dlibwwf7pr1k9gixls3jikj6hfxzf0p"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/aelve/microlens"; + description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers @@ -131118,14 +131587,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_6_0_0" = callPackage + "miso_0_7_0_0" = callPackage ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers , lucid, servant, servant-lucid, text, vector }: mkDerivation { pname = "miso"; - version = "0.6.0.0"; - sha256 = "14pzfqzrakiw1xfmzkynjjg2h1d1ab4ndwy4fyl1wffrb0dnjqxg"; + version = "0.7.0.0"; + sha256 = "0zakd08mfrzhdi9wqzj7vs62wlnhzkakbx0yqa9qgzfz4x6pi1j8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138797,8 +139266,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.5.0.1"; - sha256 = "0j3wxzf8p5ck3dxfb6bmv3g8xpknsdalgjgp39i47g4qf27prqgx"; + version = "0.6.0.0"; + sha256 = "0bs0jxxgrq29b14mcslyqa29znbhlx6kwq93jzr995alhn7g92px"; libraryHaskellDepends = [ async base binary bytestring template-haskell unix ]; @@ -139782,6 +140251,8 @@ self: { pname = "np-extras"; version = "0.3.1.1"; sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; + revision = "1"; + editedCabalFile = "1m4sfcpb9dcawckfk6nb2qib402s958zjgspd4svxrzdyaqqg4i3"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -141035,8 +141506,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.3.0.0"; - sha256 = "0k5gknbp54pqbk66cx900lqdrxn0fzfpcpafpfmvz4r49parrj7w"; + version = "0.3.0.1"; + sha256 = "0wk1lx3kqgza9dah89p10bza1iasdj4bnbax5x66h2a7imn7c4sk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141044,7 +141515,8 @@ self: { http-client-tls jose-jwt network network-uri text time tls ]; testHaskellDepends = [ - base bytestring hspec http-client http-client-tls http-types text + aeson base bytestring exceptions hspec http-client http-client-tls + http-types jose-jwt network-uri text time ]; homepage = "https://github.com/krdlab/haskell-oidc-client"; description = "OpenID Connect 1.0 library for RP"; @@ -143902,10 +144374,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.5.0"; - sha256 = "14c4nbibx4qbi7pvycaf3q12hpj4s02wdg5pl23z2b4f8jz3pnfl"; - revision = "1"; - editedCabalFile = "1l1nbijrw2brj9b849agm9cyzn9iwn25kmj1m2xyyyyd1bk95nqr"; + version = "0.2.6.0"; + sha256 = "1mbv2840l6kjc878f6miar3vfbgx2mwllxaryjlj9y6s6001185b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -144270,26 +144740,26 @@ self: { "papa" = callPackage ({ mkDerivation, base, directory, doctest, filepath, papa-base , papa-base-export, papa-base-implement, papa-bifunctors - , papa-bifunctors-export, papa-bifunctors-implement, papa-export - , papa-implement, papa-lens, papa-lens-export, papa-lens-implement - , papa-semigroupoids, papa-semigroupoids-export - , papa-semigroupoids-implement, QuickCheck, template-haskell + , papa-bifunctors-export, papa-bifunctors-implement, papa-lens + , papa-lens-export, papa-lens-implement, papa-semigroupoids + , papa-semigroupoids-export, papa-semigroupoids-implement, papa-x + , papa-x-export, papa-x-implement, QuickCheck, template-haskell }: mkDerivation { pname = "papa"; - version = "0.2.1"; - sha256 = "11jklw09xgsd75q85yivsgdab82kg0s98nnarlbid5q433gszs8v"; + version = "0.3.0"; + sha256 = "0rqk37yv5z0fmk5ksmfp5gsx0fvhb9vgzxf699dfzcyjhr2wza4i"; libraryHaskellDepends = [ base papa-base papa-base-export papa-base-implement papa-bifunctors - papa-bifunctors-export papa-bifunctors-implement papa-export - papa-implement papa-lens papa-lens-export papa-lens-implement - papa-semigroupoids papa-semigroupoids-export - papa-semigroupoids-implement + papa-bifunctors-export papa-bifunctors-implement papa-lens + papa-lens-export papa-lens-implement papa-semigroupoids + papa-semigroupoids-export papa-semigroupoids-implement papa-x + papa-x-export papa-x-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa"; + homepage = "https://github.com/qfpl/papa"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144301,53 +144771,49 @@ self: { }: mkDerivation { pname = "papa-base"; - version = "0.2.0"; - sha256 = "1hvkjjjwh1m3d3mck5z1szr2f2g4agj20hvrcxwm3iig3nqz04cb"; + version = "0.3.0"; + sha256 = "1mj70lipn90jpnadwzs2sl36q72x0z47bhhnmzdcpr79irqf1fx2"; libraryHaskellDepends = [ base papa-base-export papa-base-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-export" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + , semigroups, template-haskell }: mkDerivation { pname = "papa-base-export"; - version = "0.2.0"; - sha256 = "0jm98mfs339paah260idshsdz1f4hqfnz0c520f7dsvipks81v0z"; - revision = "1"; - editedCabalFile = "1y18rf9q5b6h03870wvlqj53l86r0ad25wm4mv035z1h1c6qmaqn"; - libraryHaskellDepends = [ base ]; + version = "0.3.0"; + sha256 = "19ix2ckdp22xfjghgb8a7586pbldz291185bc96j37ijmy4lhd5z"; + libraryHaskellDepends = [ base semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base-export"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell + ({ mkDerivation, base, directory, doctest, filepath + , papa-base-export, QuickCheck, semigroups, template-haskell }: mkDerivation { pname = "papa-base-implement"; - version = "0.2.0"; - sha256 = "0787w4r79aa94nwihzwvc9vash6bqlrg3mkw760ssygl8p5f9834"; - revision = "1"; - editedCabalFile = "1rb6bm8frga4fh865lrwhwpafgi7x8fq4cshb1j869fj0hzfig70"; - libraryHaskellDepends = [ base ]; + version = "0.3.0"; + sha256 = "17swqgg9nja1jlyhynzaybcq47kqmf0ci7rpd6n2vmwmg2d12inx"; + libraryHaskellDepends = [ base papa-base-export semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-base-implement"; + homepage = "https://github.com/qfpl/papa"; description = "Useful base functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144359,15 +144825,15 @@ self: { }: mkDerivation { pname = "papa-bifunctors"; - version = "0.2.0"; - sha256 = "0gwqqf141gq20bf9p3gm3ki8x3xnqkgkbbjd5vgars8gj0scqmga"; + version = "0.3.0"; + sha256 = "04yy7v810sff3k4wjlmkpqjxic3wj35c03vpiqi2mnjawy4dv02m"; libraryHaskellDepends = [ base papa-bifunctors-export papa-bifunctors-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144378,13 +144844,13 @@ self: { }: mkDerivation { pname = "papa-bifunctors-export"; - version = "0.2.0"; - sha256 = "0q1px6sr1pqc6q33mvys5wnbdz2ydma6dcn0fd2m58kvxcq53163"; + version = "0.3.0"; + sha256 = "0r4sk72ffd6whmmq6x9yjl8yfmq6i8hgywncambhhkprnq0y1lrl"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `bifunctors`"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144395,13 +144861,13 @@ self: { }: mkDerivation { pname = "papa-bifunctors-implement"; - version = "0.2.0"; - sha256 = "04qndk9sca9mrya3lqnb9678dflh2s09j5n8bfa8102hici29fic"; + version = "0.3.0"; + sha256 = "0s003pj5mbqrlp14krzah42920ai111nyp9xz3zi9q0qjqd293x5"; libraryHaskellDepends = [ base bifunctors ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-bifunctors-implement"; + homepage = "https://github.com/qfpl/papa"; description = "useful `bifunctors` functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144473,15 +144939,15 @@ self: { }: mkDerivation { pname = "papa-lens"; - version = "0.2.0"; - sha256 = "1m9cladf481w4yql8d1wrahinzfwgdbiyl4mdvxa9ls9rivq54zb"; + version = "0.3.0"; + sha256 = "0rdxmp9smrbk86hi0n0v4c49mlw4py39961mv7j8mg4szrgnmb8s"; libraryHaskellDepends = [ base papa-lens-export papa-lens-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144492,13 +144958,13 @@ self: { }: mkDerivation { pname = "papa-lens-export"; - version = "0.2.0"; - sha256 = "1c8fydf4gi9zq6962f936n0g33cpjmxrr5wdazr7qja7jjdn3sm3"; + version = "0.3.0"; + sha256 = "02pqgkx0xdpcwaknk0hh0b2mvk0kqh5i1m0zfx6fvh9k7yzjm510"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `lens`"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144509,13 +144975,13 @@ self: { }: mkDerivation { pname = "papa-lens-implement"; - version = "0.2.1"; - sha256 = "0bwwmsnq5a957p3gj9m9r0vx5a3vqyjbywqhl9m2plgzbwlqxfd9"; + version = "0.3.0"; + sha256 = "0scfdiqvjrzimavl6v3g9rlak5rxaa8kdrwxvxsswm4iw7ach1px"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-lens-implement"; + homepage = "https://github.com/qfpl/papa"; description = "useful `lens` functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144613,15 +145079,15 @@ self: { }: mkDerivation { pname = "papa-semigroupoids"; - version = "0.2.0"; - sha256 = "1gl9kp6c0h6abpx4lxb9lkksbxs5h0rdxjykc3g1fwgsljklk1ry"; + version = "0.3.0"; + sha256 = "19gdwj4f2cd25qjakkfwij4igbvx1065dn8gjrdy78vkjsnx9c80"; libraryHaskellDepends = [ base papa-semigroupoids-export papa-semigroupoids-implement ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-semigroupoids"; + homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144632,31 +145098,82 @@ self: { }: mkDerivation { pname = "papa-semigroupoids-export"; - version = "0.2.0"; - sha256 = "06b5pygdbvmkvfmd27gf6z16shiqkrybm5smijs1iilm7yd4ms8v"; + version = "0.3.0"; + sha256 = "19fr1sdpvs9yf8030ff8kx9qahd7zprck5d8mxz2xgrl86zlaa8d"; libraryHaskellDepends = [ base semigroupoids ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa-semigroupoids-export"; + homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `semigroupoids`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-semigroupoids-implement" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroupoids, template-haskell + , semigroupoids, semigroups, template-haskell }: mkDerivation { pname = "papa-semigroupoids-implement"; - version = "0.2.1"; - sha256 = "0zr8vx3vpkilwmwl73ll6ajs9by65sd6n96binrf0wf68jwb41rh"; - libraryHaskellDepends = [ base semigroupoids ]; + version = "0.3.0"; + sha256 = "0i84p1gffvgq58pmjr9rp774zfbvzs3w9krpp60d8pyz61rmsgjd"; + libraryHaskellDepends = [ base semigroupoids semigroups ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - homepage = "https://github.com/data61/papa"; - description = "useful `bifunctors` functions reimplemented"; + homepage = "https://github.com/qfpl/papa"; + description = "useful `semigroupoids` functions reimplemented"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, papa-x-export + , papa-x-implement, QuickCheck, template-haskell + }: + mkDerivation { + pname = "papa-x"; + version = "0.3.0"; + sha256 = "0nxhvnhlk622q7qfzl3z6fwzsanjhy26p8i51w1g5p89izwz8yy4"; + libraryHaskellDepends = [ base papa-x-export papa-x-implement ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x-export" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-x-export"; + version = "0.3.0"; + sha256 = "1y94kfpzk5v5agwhqlysm4jg3q0n09sqpw1wn9r5qqvvxkkjx9s1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "export useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-x-implement" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-x-implement"; + version = "0.3.0"; + sha256 = "1qycam0xb99vgfh01sw3vq5mvlgrq9kgjfs2js8inhmzij3a0nv9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/qfpl/papa"; + description = "useful functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149181,8 +149698,8 @@ self: { ({ mkDerivation, base, containers, heaps, pipes }: mkDerivation { pname = "pipes-interleave"; - version = "1.1.1"; - sha256 = "0l7g184ksrh9qy8ixh49iv13amiwh40v6bbx0gcgq451knfl4n17"; + version = "1.1.2"; + sha256 = "0anjd66z0z7813jcakqcagp4ml8q4dg6bvygy8mn2jqggm2bqs4d"; libraryHaskellDepends = [ base containers heaps pipes ]; homepage = "http://github.com/bgamari/pipes-interleave"; description = "Interleave and merge streams of elements"; @@ -149252,8 +149769,8 @@ self: { }: mkDerivation { pname = "pipes-lzma"; - version = "0.1.1.1"; - sha256 = "09ndjxrfh55269gjpm61h65bk0xcv46dah8i0svxcdq4myc8d9r4"; + version = "0.1.1.2"; + sha256 = "0wx23wf1vr8d2nyapxgmpn1jk53hjbla1xss714vkmar7am37vrc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring lzma pipes ]; @@ -149466,10 +149983,8 @@ self: { }: mkDerivation { pname = "pipes-s3"; - version = "0.3.0.2"; - sha256 = "1rx45znf7ln23gd41fwgfzvqzgqw59w7ab7vnk175waayldbp2gx"; - revision = "1"; - editedCabalFile = "0w1bmf15k6jdiqpcfv8gk41zhh2kr33ch3r72g6rxh42akia99iy"; + version = "0.3.0.3"; + sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -151848,14 +152363,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "postgresql-simple-migration_0_1_10_1" = callPackage + "postgresql-simple-migration_0_1_11_0" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , directory, hspec, postgresql-simple, text, time }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.10.1"; - sha256 = "0g7xf0cl6ld7qs94qsv67rxln4hpibgy7jfgvbaq1br6pwa1w68s"; + version = "0.1.11.0"; + sha256 = "17kmmilvzpllk5nr7xngkym2gavkv32z5i1b7vc290g89c58a3y0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152516,8 +153031,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.48"; - sha256 = "14gdi3md3mr12dp9hi83bqzis9x90bf0cqknrzdi2xfb9wb1jdl5"; + version = "0.0.49"; + sha256 = "1xk8l4lbicl1k6xr14x80dlc5g55dj59xgzgx01b61d0k595mmj1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153211,7 +153726,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "prettyprinter_1_1_0_1" = callPackage + "prettyprinter_1_1_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell @@ -153219,8 +153734,8 @@ self: { }: mkDerivation { pname = "prettyprinter"; - version = "1.1.0.1"; - sha256 = "0pfvh90gya175bdfmkzq53f4i3mvgybqhd4sw86y0vvfg8zpc38n"; + version = "1.1.1"; + sha256 = "1kzfgwpsg3br3dkvqjhldv1bjqw7k8sg3xqinkk3c1219pk2xcx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -153367,8 +153882,8 @@ self: { ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "prim-array"; - version = "0.2"; - sha256 = "0h9n1v3xqvxf8pmycmj5qd4gw8zcxgy4l1fjxff9sfzhpsnvcmp9"; + version = "0.2.1"; + sha256 = "1ng4yhlv12h84gvz7ll9dkk8sydidb31da836y1q9ygdnhh7ipaf"; libraryHaskellDepends = [ base ghc-prim primitive ]; homepage = "https://github.com/andrewthad/prim-array#readme"; description = "Primitive byte array with type variable"; @@ -155022,6 +155537,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_3" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.3"; + sha256 = "1spxilp6zk30ijcr3vqgnzbznc0g3050cy9258931vz2zfkjc6kd"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -155037,6 +155570,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_3" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.3"; + sha256 = "1wwn4lwzl0l8bbw99hdh9xizc39hvjr9cxc5sww8f4zh2vbyw99p"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + homepage = "https://github.com/k-bx/protocol-buffers"; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -155090,6 +155639,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_2" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text + , transformers + }: + mkDerivation { + pname = "protolude"; + version = "0.2"; + sha256 = "1ky72pv1icrcj9s3al23nwylyv7l60s2h0m2hs85wdb3kn1c042n"; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat safe stm text transformers + ]; + homepage = "https://github.com/sdiehl/protolude"; + description = "A small prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude-lifted" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base, protolude }: @@ -156411,12 +156979,12 @@ self: { }) {}; "qchas" = callPackage - ({ mkDerivation, base, hmatrix, tasty, tasty-hunit }: + ({ mkDerivation, base, hmatrix, random, tasty, tasty-hunit }: mkDerivation { pname = "qchas"; - version = "1.0.0"; - sha256 = "0zjhhk6i60svp4p17xjg7pyc5hinj32r7jrcg7z7jibqmm5d3mds"; - libraryHaskellDepends = [ base hmatrix ]; + version = "1.0.1.0"; + sha256 = "12hvhprcpwznxkdl2165ydsrh1r10xz4q4px1dyzyy5i8pkmddam"; + libraryHaskellDepends = [ base hmatrix random ]; testHaskellDepends = [ base hmatrix tasty tasty-hunit ]; homepage = "https://github.com/ardeleanasm/qchas#readme"; description = "A library for implementing Quantum Algorithms"; @@ -156747,16 +157315,17 @@ self: { "quantification" = callPackage ({ mkDerivation, aeson, base, ghc-prim, hashable, path-pieces, text + , vector }: mkDerivation { pname = "quantification"; - version = "0.1.2"; - sha256 = "1ivxikw2fd93qsm9y3lm5bycwsq88nlfq5r1nxhi0qkrs8sdk1gs"; + version = "0.2"; + sha256 = "13mvhhg7j47ff741zrbnr11f5x2bv4gqdz02g2h8rr116shb31ia"; libraryHaskellDepends = [ - aeson base ghc-prim hashable path-pieces text + aeson base ghc-prim hashable path-pieces text vector ]; homepage = "https://github.com/andrewthad/quantification#readme"; - description = "Data types and typeclasses to deal with universally and existentially quantified types"; + description = "Rage against the quantification"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -158196,8 +158765,8 @@ self: { }: mkDerivation { pname = "random-bytestring"; - version = "0.1.0"; - sha256 = "0v4fmns5qji5mb0grnghl2yv5l4rg29319f1d1d7kcz9qwz9qwrd"; + version = "0.1.1"; + sha256 = "08hpzxa4dzxpkcsb18yg093h7z14x73rfhg3l1qs9mddj37wghmh"; libraryHaskellDepends = [ base bytestring mwc-random ]; benchmarkHaskellDepends = [ async base bytestring criterion entropy ghc-prim mwc-random @@ -160218,6 +160787,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "recursion-schemes-ext" = callPackage + ({ mkDerivation, base, composition-prelude, criterion, hspec + , recursion-schemes + }: + mkDerivation { + pname = "recursion-schemes-ext"; + version = "0.1.0.1"; + sha256 = "1g24mcb6qdpq6ggnixbb82iq3b3fhrgpspgrblk9cwwrpl1arnhg"; + libraryHaskellDepends = [ + base composition-prelude recursion-schemes + ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme"; + description = "Amateur addenda to recursion-schemes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "recursive-line-count" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, gtk, mtl , process @@ -165332,6 +165919,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rset" = callPackage + ({ mkDerivation, base, QuickCheck, safe }: + mkDerivation { + pname = "rset"; + version = "1.0.0"; + sha256 = "1d1r9hp38mhl1jmmqhn42al7gd0nsqk5d5msqrzjwxdyj884y3pq"; + libraryHaskellDepends = [ base safe ]; + testHaskellDepends = [ base QuickCheck safe ]; + homepage = "https://github.com/lovasko/rset"; + description = "Range set"; + license = "unknown"; + }) {}; + "rspp" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -165416,13 +166016,13 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-bits, binary-conduit, bytestring , conduit, conduit-combinators, conduit-extra, lens, lens-aeson - , random, resourcet, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, word24 + , random, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, word24 }: mkDerivation { pname = "rtcm"; - version = "0.2.2"; - sha256 = "1fh6hvz3isv8zzmw94lkr354lm7805pr8sg5rj859skh2h49mzbb"; + version = "0.2.5"; + sha256 = "1idqvlva12ndm4nbjhigz6z8r7y8lr25yck6fxilkls766rdv61m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165431,7 +166031,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-combinators conduit-extra resourcet + conduit-combinators conduit-extra ]; testHaskellDepends = [ base basic-prelude binary binary-bits bytestring lens random tasty @@ -166577,6 +167177,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sandi_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, exceptions + , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck + , tasty-th + }: + mkDerivation { + pname = "sandi"; + version = "0.4.1"; + sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j"; + libraryHaskellDepends = [ + base bytestring conduit exceptions stringsearch + ]; + testHaskellDepends = [ + base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + homepage = "http://hackage.haskell.org/package/sandi"; + description = "Data encoding library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sandlib" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -166826,13 +167448,13 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck , template-haskell, text, unordered-containers, yaml }: mkDerivation { pname = "sbp"; - version = "2.2.11"; - sha256 = "1fdwsqh3mr90w6k4f4y8cbshx8divhfwhc06cfbdh64k8wckl27x"; + version = "2.2.12"; + sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166842,7 +167464,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet yaml + conduit-extra yaml ]; testHaskellDepends = [ aeson base base64-bytestring basic-prelude bytestring QuickCheck @@ -168622,14 +169244,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "selda_0_1_10_0" = callPackage + "selda_0_1_10_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, mtl , psqueues, text, time, unordered-containers }: mkDerivation { pname = "selda"; - version = "0.1.10.0"; - sha256 = "107wj74yxw5nz6pzvn9k6inn5x4vcrjv80416a2kr8nl25x1ixgs"; + version = "0.1.10.1"; + sha256 = "1yx8gxi9bha95ss2i1hvbv8vlywxgi3a6rxjig44jz5w2s0zlp5h"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -168719,12 +169341,12 @@ self: { }) {}; "selections" = callPackage - ({ mkDerivation, base, bifunctors, comonad, mtl }: + ({ mkDerivation, base, bifunctors, comonad }: mkDerivation { pname = "selections"; - version = "0.1.0.0"; - sha256 = "0wl8jy0c3sm384qr4q143d0wiy2984mdyxhwd78mnq4glsipkwyc"; - libraryHaskellDepends = [ base bifunctors comonad mtl ]; + version = "0.1.0.3"; + sha256 = "1g7p30mjvkq8ymmjdhh54bhyjs2dvz7v860mr1f8qs35j31bkabd"; + libraryHaskellDepends = [ base bifunctors comonad ]; homepage = "https://github.com/ChrisPenner/selections#readme"; description = "Combinators for operating with selections over an underlying functor"; license = stdenv.lib.licenses.bsd3; @@ -169234,8 +169856,10 @@ self: { }: mkDerivation { pname = "separated"; - version = "0.2.2"; - sha256 = "137s8rzpppnyg3l794m17pndix0nja66qcancwjjqhhfdhmc2pv4"; + version = "0.2.3"; + sha256 = "0lxl7i0j27nn43a6p7ayxd1rr48h31zj0bviw0nd49fsd9l5c0iq"; + revision = "1"; + editedCabalFile = "0k1z3a9yr9aq7cnm7kfk5yiclhq95nqlgnzzz5ksj010qmnsb6zj"; libraryHaskellDepends = [ base bifunctors lens semigroupoids semigroups ]; @@ -169579,8 +170203,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.3"; - sha256 = "1crcc9vsg713cnsrpha54rki4a9pnls8sw4m9hz3pikmyqg01jsh"; + version = "0.3.1"; + sha256 = "01wjr1xlnvz2ml7iiarbbl1h8p4ax457nq1n6xxx070d08l4iq33"; libraryHaskellDepends = [ acid-state aeson ansi-terminal base base16-bytestring base64-bytestring bytestring clock containers deepseq directory @@ -170466,6 +171090,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-iCalendar" = callPackage + ({ mkDerivation, base, data-default, http-media, iCalendar, servant + }: + mkDerivation { + pname = "servant-iCalendar"; + version = "0.1.0.1"; + sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; + libraryHaskellDepends = [ + base data-default http-media iCalendar servant + ]; + homepage = "https://github.com/fgaz/servant-iCalendar#readme"; + description = "Servant support for iCalendar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant @@ -172202,8 +172841,8 @@ self: { }: mkDerivation { pname = "shakers"; - version = "0.0.30"; - sha256 = "0yy820lwl890p96d61n8h7wm6g9ykgldjm29yrp60kzxfjbicpnc"; + version = "0.0.31"; + sha256 = "134v3rzyhf5yv417dp90f9phgm4mdbhc5sv9l44jdbhplnmahh2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173243,6 +173882,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "signal_0_1_0_4" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "signal"; + version = "0.1.0.4"; + sha256 = "1rbnblp2d9cw54jnxjcfjhp0bizvcdcxg9y1b4ky0iskny9dvgy4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base unix ]; + executableHaskellDepends = [ base ]; + homepage = "http://github.com/pmlodawski/signal"; + description = "Multiplatform signal support for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "signals" = callPackage ({ mkDerivation, base, containers, hashable, imperative-edsl-vhdl , language-vhdl, mtl, observable-sharing, operational-alacarte @@ -175173,6 +175828,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck_1_1_2" = callPackage + ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: + mkDerivation { + pname = "smallcheck"; + version = "1.1.2"; + sha256 = "14690ahl3iq99hw638qk0bpmkmspghjz2yh8p1nyccli92y23xjm"; + libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; + homepage = "https://github.com/feuerbach/smallcheck"; + description = "A property-based testing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "smallcheck-laws" = callPackage ({ mkDerivation, base, smallcheck, smallcheck-series }: mkDerivation { @@ -175289,8 +175957,8 @@ self: { }: mkDerivation { pname = "smartcheck"; - version = "0.2.2"; - sha256 = "1wc5257r6qrbawn4ip2d9fqlcpb77bjikjn3ixsa3rhazbasq2is"; + version = "0.2.4"; + sha256 = "0wj6xwassh69z97p47xh7i68xs7mvi05fni4qxizyicmbr8k27il"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175839,10 +176507,8 @@ self: { }: mkDerivation { pname = "snap-extras"; - version = "0.12.0.0"; - sha256 = "15744qmp48qn67n8w2nxxqxfh5rjlg328psl58whb8q5m6grgv3n"; - revision = "2"; - editedCabalFile = "1zm93m5x6h63nagjlfzsq4cgx2600hm16zj5pjxvfh0d0vgq0yjp"; + version = "0.12.1.0"; + sha256 = "1lkdva37dcg6zvy02v65qi8pwzia7wai0ny744jdr659lmninn4g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -175966,8 +176632,8 @@ self: { pname = "snap-server"; version = "1.0.2.2"; sha256 = "0zw3z9s61kkfmlvrg3sfqvd0c3mzg9zjwp01hm1br3z8cawmzpi7"; - revision = "1"; - editedCabalFile = "1r35srci0bglwz8bbl6kwgb33g0lpqdwv8lsy7hfc1l3kj4a7p2f"; + revision = "2"; + editedCabalFile = "032m1c42qm4b07s835aa9jl2n7r7py8cdz3fdfqi6qd68z7lqrb5"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -178271,8 +178937,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.2.6"; - sha256 = "0dc1ahgqwykiscm1bhkf07kijpn4sm4w4sfg88vvdyq8swil5kyz"; + version = "0.2.7"; + sha256 = "0n5lrwlagb6clj3sarmdzy43n9dyfj6rz1rnyj8d63s57fk7jpl5"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base cmdargs containers leancheck ]; benchmarkHaskellDepends = [ base cmdargs containers leancheck ]; @@ -186482,6 +187148,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_0_7_0_0" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "0.7.0.0"; + sha256 = "0713gck8zdcd303zaq52g0ca9x28arwj9n1brfyzqscac95bcccc"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, tasty , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -189835,12 +190514,12 @@ self: { license = stdenv.lib.licenses.isc; }) {}; - "th-abstraction_0_2_4_0" = callPackage + "th-abstraction_0_2_5_0" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.4.0"; - sha256 = "0d2dwf0szxw2vxhdir5xvkgl49qwnm15c7m0a4r7fc1qrnwyvf8r"; + version = "0.2.5.0"; + sha256 = "1fxapnbny5gyys24q8v93i6ipcrmsrs2b95i8kz2dpgg8cc95skp"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -191025,8 +191704,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.2"; - sha256 = "10n0vbhkyvq5mcf98mbh06pzzp3f2k1w9mk576h3ciyh8rirvl4d"; + version = "0.1.1.3"; + sha256 = "0jd6w07sks4v9x7m77dz3r59ri2vsmmbv82yi457bn9szdy0jz2x"; libraryHaskellDepends = [ base composition either megaparsec text text-show ]; @@ -194911,15 +195590,14 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition, containers, criterion, data-default - , directory, extra, hspec, hspec-megaparsec, htoml, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, QuickCheck, split, text - , unordered-containers + , directory, extra, hspec, htoml, http-client, http-client-tls + , http-types, lens, megaparsec, optparse-applicative, QuickCheck + , split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.0.1"; - sha256 = "0z1gi0mlxkchzq6644m5ya3qjz2jzi5rziak5jyz8b8ssvspw3nv"; + version = "1.0.1.1"; + sha256 = "1vcwyhwvh3xfm8n2xlic12in6ybkq11nsafqv0fhbdzhscxgqhqs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194929,9 +195607,7 @@ self: { split text unordered-containers ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck - ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; @@ -198028,8 +198704,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.5.1"; - sha256 = "1fqf9xqapzff8105p9ya65qjy6b1vmg9gvcm37gzv1i3bz7c7z8l"; + version = "0.5.1.1"; + sha256 = "1cj9qs7r3p8zhlrv3h3phmflp158ckimg3rzq4c28vfx85d8vxz2"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe stm text text-format transformers @@ -200436,6 +201112,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vcf" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec + , hspec-expectations, text + }: + mkDerivation { + pname = "vcf"; + version = "0.9.0"; + sha256 = "1sjsgld8zd30insksv0n3rsjwq0mrr69rqnb1jpcq8lmcgz43jlq"; + libraryHaskellDepends = [ aeson attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring hspec hspec-expectations + ]; + description = "A package to parse VCF files inspired in similar python libraries"; + license = stdenv.lib.licenses.mit; + }) {}; + "vcs-revision" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -200950,6 +201642,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; + revision = "1"; + editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -201253,14 +201947,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_7" = callPackage + "viewprof_0_0_0_8" = callPackage ({ mkDerivation, base, brick, containers, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.7"; - sha256 = "11q6p9faav8j6s8qqhvdij6jzd3v3pbgm5q94ksrn5sr2h4p10k8"; + version = "0.0.0.8"; + sha256 = "0pll3j9v5fapbawjp86cnyhdscmj2zn6cqwzg8dxi9s7z8nhqxk9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -201672,6 +202366,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vivid-osc" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, microspec, time + }: + mkDerivation { + pname = "vivid-osc"; + version = "0.3.0.0"; + sha256 = "152ai2j75hbjvws9k1ii2h32nnj8ak44agwpdcfkdf7nc1fgha57"; + libraryHaskellDepends = [ base binary bytestring cereal time ]; + testHaskellDepends = [ base bytestring cereal microspec time ]; + description = "Open Sound Control encode/decode"; + license = "GPL"; + }) {}; + "vk-aws-route53" = callPackage ({ mkDerivation, aws, base, bytestring, containers, http-conduit , http-types, old-locale, resourcet, text, time, xml-conduit @@ -203719,21 +204426,20 @@ self: { "warc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, errors, exceptions - , filepath, free, lens, mmorph, optparse-applicative, pipes - , pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time - , transformers + , filepath, free, hashable, lens, mmorph, optparse-applicative + , pipes, pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time + , transformers, unordered-containers }: mkDerivation { pname = "warc"; - version = "0.3.1"; - sha256 = "044mvpwzgcqzj0zbmlb6v0nx5s2jqw5r9na1m94fxzk571am51rb"; - revision = "1"; - editedCabalFile = "0xmwmi3wqyrpci2zm50kvvyzdyqsblaarm6zz7rjky4qykc12kqr"; + version = "1.0.1"; + sha256 = "0vwml51prp730n5dmdla4s2116slp0wqg195b7psv4a3yqfx7v7p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring errors free lens mmorph pipes + attoparsec base bytestring errors free hashable lens mmorph pipes pipes-attoparsec pipes-bytestring text time transformers + unordered-containers ]; executableHaskellDepends = [ attoparsec base bytestring errors exceptions filepath free lens @@ -204359,6 +205065,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes-th_0_22_6_2" = callPackage + ({ mkDerivation, base, hspec, HUnit, parsec, QuickCheck, split + , template-haskell, text, web-routes + }: + mkDerivation { + pname = "web-routes-th"; + version = "0.22.6.2"; + sha256 = "1j661bdl5nb7a02gvsi89dybzaczjynp3d6kxnrgc4jc41rwbgj8"; + libraryHaskellDepends = [ + base parsec split template-haskell text web-routes + ]; + testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; + homepage = "https://github.com/happstack/web-routes-th"; + description = "Support for deriving PathInfo using Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-routes-transformers" = callPackage ({ mkDerivation, base, transformers, web-routes }: mkDerivation { @@ -205096,6 +205820,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weeder_0_1_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq + , directory, extra, filepath, foundation, hashable, process, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "weeder"; + version = "0.1.7"; + sha256 = "0mvpy2qzwjdl204k3qfi1cjz44rknzyrc187wp9lvxv40mb2kyd6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs deepseq directory extra filepath + foundation hashable process text unordered-containers vector yaml + ]; + homepage = "https://github.com/ndmitchell/weeder#readme"; + description = "Detect dead code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl , process, random, split, template-haskell, temporary @@ -206014,8 +206759,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.25"; - sha256 = "1sd087mf1gr9glx8fa775fp1zf8jyka1cfcqb6jn682bl021xz7p"; + version = "0.3.26"; + sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207213,6 +207958,8 @@ self: { pname = "x509"; version = "1.7.2"; sha256 = "0yyfw07bw73gkh93z653lnncc30wj3g3rf26cwxjpyxvwalia0yw"; + revision = "1"; + editedCabalFile = "07mphpmj4zk5mzhp5x50a7q6w134kgymf557dcgbp643cbkcmc66"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -207352,6 +208099,8 @@ self: { pname = "x509-validation"; version = "1.6.9"; sha256 = "005m5jxjz5cx3lriayv4a17xa19qc2qxw7kz2f9wvj7hgjnwww44"; + revision = "1"; + editedCabalFile = "02n9s0wizi4wivs6is4cyapqjjnbrx3zdk34q0cnlfsvbbvyhjax"; libraryHaskellDepends = [ asn1-encoding asn1-types base byteable bytestring containers cryptonite data-default-class hourglass memory mtl pem x509 @@ -213615,6 +214364,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, exceptions + , filepath, hspec, monad-control, mtl, path, path-io, plan-b + , QuickCheck, resourcet, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "0.2.0"; + sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest exceptions filepath monad-control + mtl path path-io plan-b resourcet text time transformers + transformers-base + ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions filepath hspec path + path-io QuickCheck text time transformers + ]; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty From e01c538f4fd64b22a2a0e2fdd6ac36e2a4205c97 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 12 Aug 2017 18:20:23 +0200 Subject: [PATCH 188/213] axel: 2.12 -> 2.13.1 --- pkgs/tools/networking/axel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 8c23e11017c..322a1a06289 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.12"; + version = "2.13.1"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "12sa5whd5mjn1idd83hbhm0rmsh5bvhhgvv03fk5cgxynwkbprr8"; + sha256 = "15bi5wx6fyf9k0y03dy5mk2rv06mrfgiyrlh44add9n07wi574p1"; }; nativeBuildInputs = [ autoreconfHook ]; From 4ebac8f702be49a8f18f72bdb00148d7ffc896c9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 16:59:44 +0200 Subject: [PATCH 189/213] lr: 0.3.2 -> 0.4 --- pkgs/tools/system/lr/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 11f30f6f444..5510ec0e948 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchFromGitHub }: -let - version = "0.3.2"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "lr-${version}"; - inherit version; + version = "0.4"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "1bbgzshayk0kzmlyw44jqskgmxz5c4jh2h0bqg3n5zi89588ng2k"; + sha256 = "16qp0791s652yi86x472wwr62w6nhiyb1i662d85y5zyfagdf7dd"; }; makeFlags = "PREFIX=$(out)"; From d5fed93263f853a433d5d3a139068ea0f9fcc16f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 17:13:33 +0200 Subject: [PATCH 190/213] ola: 0.10.4 -> 0.10.5 --- pkgs/applications/misc/ola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index b6d2a1cd20b..0aba5106387 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ola-${version}"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; rev = version; - sha256 = "1skb3dwpmsfdr8mp3rs80jmsr1bf78270d9bnd8h0pv8bkb8zvim"; + sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al"; }; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; From 4ce80c5ed54f547076976e7f01a4201052dcf7ca Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 17:16:53 +0200 Subject: [PATCH 191/213] php70: 7.0.21 -> 7.0.22 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 675616a5f21..3cb1d4ed61c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -330,8 +330,8 @@ in { }; php70 = generic { - version = "7.0.21"; - sha256 = "07r3qqyyvf16k4xk5b2070fwilggmph5937drjm8cvyyjb1k789b"; + version = "7.0.22"; + sha256 = "1ppxdlyb9vapcmzylml447vrlizam72h1w41vvn15pdbd5zv5q48"; }; php71 = generic { From bd1a78aa34665952fafbfd3ebdec3ed701bc88e0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 17:17:32 +0200 Subject: [PATCH 192/213] php: 7.1.7 -> 7.1.8 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3cb1d4ed61c..ed018a94227 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -335,7 +335,7 @@ in { }; php71 = generic { - version = "7.1.7"; - sha256 = "1y0z5n0kyd15wzmn1lprjgaysbg0z428q9cjbx4dqf3zk296g6q7"; + version = "7.1.8"; + sha256 = "1y527hs9yh9lmr38q3rf7gkhnvk49vh4nyhci6852mjhjh5a0r3h"; }; } From 89ad46d9b4eacc2120801d8e9c49f498df79ac38 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 18:38:10 +0200 Subject: [PATCH 193/213] sysdig: fix build with current curl --- pkgs/os-specific/linux/sysdig/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 71a7acab0e1..ca5cea0a012 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { "-DluaL_getn(L,i)=((int)lua_objlen(L,i))" ]; + postPatch = '' + sed 's|curl/curlbuild\.h|curl/system.h|' -i \ + userspace/libsinsp/marathon_http.cpp \ + userspace/libsinsp/mesos_http.cpp + ''; + preConfigure = '' export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' From bb5702c521e5ac4f23457159064d7b4c94b5f241 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 18:49:24 +0200 Subject: [PATCH 194/213] treewide: remove automake pinning to the newest version quasi no-op --- pkgs/applications/misc/pcmanx-gtk2/default.nix | 4 ++-- pkgs/applications/networking/cluster/mesos/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index ad5a0b0ef0d..65366607c50 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }: +{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: stdenv.mkDerivation { name = "pcmanx-gtk2-1.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; }; - buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ]; + buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index a7cc5d78938..65758fca600 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - makeWrapper autoconf automake115x libtool curl sasl jdk maven + makeWrapper autoconf automake libtool curl sasl jdk maven python wrapPython boto setuptools leveldb subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix index 34cea5141ba..66cc2cb24c7 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix @@ -3,7 +3,7 @@ , libchamplain, clutter_gtk, geocode_glib , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }: +, libsoup, vala_0_32, dbus_glib, automake, autoconf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libxml2 libsoup gnome3.gnome_online_accounts nspr nss gdk_pixbuf gnome3.defaultIconTheme librsvg libchamplain clutter_gtk geocode_glib - vala_0_32 automake115x autoconf db ]; + vala_0_32 automake autoconf db ]; preFixup = '' gappsWrapperArgs+=( From 439335f676cc41839c507fa991fda935161d5363 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 19:09:26 +0200 Subject: [PATCH 195/213] urlview: builds with default automake --- pkgs/applications/misc/urlview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index f0a48cfb8d4..f745bf3ad60 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, automake111x, autoreconfHook }: +{ stdenv, fetchurl, ncurses, autoreconfHook }: stdenv.mkDerivation rec { version = "0.9"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42"; }; - buildInputs = [ ncurses automake111x autoreconfHook ]; + buildInputs = [ ncurses autoreconfHook ]; preAutoreconf = '' touch NEWS From 220c5377e87d488680e8ca06bd5bbde00d6722f7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 19:11:51 +0200 Subject: [PATCH 196/213] automake112x: remove unused --- .../tools/misc/automake/automake-1.12.x.nix | 54 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 56 deletions(-) delete mode 100644 pkgs/development/tools/misc/automake/automake-1.12.x.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix deleted file mode 100644 index 34bffff23d4..00000000000 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.12.6"; - - # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is - # available upstream; see - # . - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "1ynvca8z4aqcwr94rf7j1bfiid2w9w250y9qhnyj9vmi8lhsnd7q"; - }; - - buildInputs = [perl autoconf makeWrapper]; - - # This test succeeds on my machine, but fails on Hydra (for reasons - # not yet understood). - patchPhase = '' - sed -i -e 's|t/aclocal7.sh||' Makefile.in - ''; - - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.12"; - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e78b08c068..72eb0c4a43d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6605,8 +6605,6 @@ with pkgs; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; - automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; - automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { }; automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { }; From beace037d0f77b83064f0e0beca0f29d4a2ac7f4 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 19:25:39 +0200 Subject: [PATCH 197/213] mongoc: 1.5.4 -> 1.7.0 --- pkgs/development/libraries/mongoc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 5275f4ecb73..67d2bdf1559 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchzip, autoconf, automake114x, perl, pkgconfig, libbson, libtool +{ stdenv, fetchzip, perl, pkgconfig, libbson , openssl, which }: stdenv.mkDerivation rec { name = "mongoc-${version}"; - version = "1.5.4"; + version = "1.7.0"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "0xjk3k76n8yz7zi6a0dx1wgpsvvn5qhpzrapdw4v3h49hwf7rc5q"; + sha256 = "1s0j7wmgdkgawzd75psh5ml35lkx68h6pimqrnfp2z1ggzcwajgn"; }; propagatedBuildInputs = [ libbson ]; - buildInputs = [ autoconf automake114x libtool openssl perl pkgconfig which ]; + buildInputs = [ openssl perl pkgconfig which ]; meta = with stdenv.lib; { description = "The official C client library for MongoDB"; From fbb6b90ed04761f6df87f515e829ad48b5a55c39 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 12 Aug 2017 12:42:30 -0500 Subject: [PATCH 198/213] yices: 2.5.1 -> 2.5.2 --- pkgs/applications/science/logic/yices/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 0ec7f93d26f..c8e20c7260c 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree"; name = "${name}-src.tar.gz"; - sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c"; + sha256 = "18mjnwg0pwc0fx4f99l7hxsi10mb5skkzk0k1m3xv5kx3qfnghs0"; }; patchPhase = ''patchShebangs tests/regress/check.sh''; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # only installing the libyices.so.2.5.1 file. installPhase = '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.2.5.1 libyices.so.2.5) + (cd $out/lib && ln -s -f libyices.so.2.5.2 libyices.so.2.5) ''; meta = with stdenv.lib; { From 473b58f20e491312a03c9c1578c89116e39a1d50 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 19:33:22 +0200 Subject: [PATCH 199/213] inkscape: remove unused automake114x, intltool --- pkgs/applications/graphics/inkscape/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index f48ce6a4ce4..a3a58bc87ee 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 -, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool +, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, automake114x, potrace, cmake +, libvisio, libcdr, libexif, potrace, cmake }: let @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext - makeWrapper intltool gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif automake114x potrace cmake python2Env + makeWrapper gsl poppler imagemagick libwpg librevenge + libvisio libcdr libexif potrace cmake python2Env ]; enableParallelBuilding = true; From 7e5ebed971d0b63a2fd34d94da62713a5f1fb192 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 20:18:58 +0200 Subject: [PATCH 200/213] coreutils: use autoreconfHook --- pkgs/tools/misc/coreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 099e9ee0849..48bcf143bb6 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPackages -, autoconf, automake114x, texinfo, fetchurl, perl, xz, libiconv, gmp ? null +, autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null , hostPlatform, buildPlatform , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ] ++ optional aclSupport acl ++ optional attrSupport attr - ++ optionals hostPlatform.isCygwin [ autoconf automake114x texinfo ] # due to patch + ++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch ++ optionals selinuxSupport [ libselinux libsepol ] # TODO(@Ericson2314): Investigate whether Darwin could benefit too ++ optional (hostPlatform != buildPlatform && hostPlatform.libc != "glibc") libiconv; From bfdd9d2e664a4b28fa7966b39af0de2ea41d8926 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 20:21:24 +0200 Subject: [PATCH 201/213] automake114x: remove --- .../tools/misc/automake/automake-1.14.x.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 43 deletions(-) delete mode 100644 pkgs/development/tools/misc/automake/automake-1.14.x.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix deleted file mode 100644 index c797042885a..00000000000 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.14.1"; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0s86rzdayj1licgj35q0mnynv5xa8f4p32m36blc5jk9id5z1d59"; - }; - - buildInputs = [ perl autoconf ]; - - setupHook = ./setup-hook.sh; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.14"; - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73714e331d6..8ca36c590e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6607,8 +6607,6 @@ with pkgs; automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { }; - automake114x = callPackage ../development/tools/misc/automake/automake-1.14.x.nix { }; - automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; From bd657a72932e8605d3d889fb47f0f33da420f516 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 20:26:50 +0200 Subject: [PATCH 202/213] libtsm: use autoreconfHook --- pkgs/development/libraries/libtsm/default.nix | 12 ++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index dc9e1d01df4..9ba25f33282 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }: +{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { name = "libtsm-3"; @@ -8,13 +8,9 @@ stdenv.mkDerivation rec { sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; - buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [ - autoconf automake - ]; - - preConfigure = lib.optionalString stdenv.isDarwin '' - aclocal - ''; + buildInputs = [ libxkbcommon pkgconfig ] ++ stdenv.isDarwin [ + autoreconfHook + ]; configureFlags = [ "--disable-debug" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ca36c590e8..0185584e80e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9229,9 +9229,7 @@ with pkgs; libtap = callPackage ../development/libraries/libtap { }; - libtsm = callPackage ../development/libraries/libtsm { - automake = automake114x; - }; + libtsm = callPackage ../development/libraries/libtsm { }; libtunepimp = callPackage ../development/libraries/libtunepimp { }; From 758421c0ab98f7a843bcd42c4a2522a3c14bdbe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 12 Aug 2017 07:20:09 +0100 Subject: [PATCH 203/213] spl: 0.7.0 -> 0.7.1 --- pkgs/os-specific/linux/spl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 865be70f34d..227b67e4486 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -15,13 +15,13 @@ in assert buildKernel -> kernel != null; stdenv.mkDerivation rec { name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "05qqwhxc9nj94y28c97iwfz8gkjwicrhnkj425yb47gqa8rafazk"; + sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; }; patches = [ ./const.patch ./install_prefix.patch ]; From 317786c68968fe9642e078856c33cd0330fddf49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 12 Aug 2017 07:20:32 +0100 Subject: [PATCH 204/213] zfs: 0.7.0 -> 0.7.1 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a47b43a1f0f..6d3ad657140 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "16z0fl282rsmvgk608ii7n410swivkrisp112n2fhhjc1fs0zall"; + sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; }; patches = [ From 6d7b0dcdf1482ca8b2f1c1d08febd77587dae358 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 21:06:18 +0200 Subject: [PATCH 205/213] gnome3.pomodoro: no need for automake113x --- pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix index 3ceabe70ad8..37cdfc730ab 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, +{ stdenv, fetchFromGitHub, which, intltool, pkgconfig, libtool, makeWrapper, dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base, glib, gobjectIntrospection, telepathy_glib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureScript = ''./autogen.sh''; buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool + which intltool glib gobjectIntrospection pkgconfig libtool makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop From c1b3dc3308c68d95c054d8388b92af73e61bc6dd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 21:06:46 +0200 Subject: [PATCH 206/213] povray: 3.7 -> 3.7.0.3 --- pkgs/tools/graphics/povray/default.nix | 20 ++++++++++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 1dceb210235..6bdff06699b 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,12 +1,16 @@ -{stdenv, fetchgit, autoconf, automake, boost, zlib, libpng, libjpeg, libtiff}: +{ stdenv, fetchFromGitHub, autoconf, automake, boost +, zlib, libpng, libjpeg, libtiff +}: -stdenv.mkDerivation { - name = "povray-3.7"; +stdenv.mkDerivation rec { + name = "povray-${version}"; + version = "3.7.0.3"; - src = fetchgit { - url = "https://github.com/POV-Ray/povray.git"; - rev = "39ce8a24e50651904010dda15872d63be15d7c37"; - sha256 = "1nbs9vwf6fn3jkm0myfnbn7nrc17q8ppzmr4h7kj49nr0710ifw0"; + src = fetchFromGitHub { + owner = "POV-Ray"; + repo = "povray"; + rev = "v${version}"; + sha256 = "0mzkgk3gn8jfrw1fq0z3kqbysdfq8nwdl8a28l18v8gzb31bblhq"; }; @@ -40,6 +44,6 @@ stdenv.mkDerivation { homepage = http://www.povray.org/; description = "Persistence of Vision Raytracer"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0185584e80e..4da826510e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3827,9 +3827,7 @@ with pkgs; postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; - povray = callPackage ../tools/graphics/povray { - automake = automake113x; # fails with 14 - }; + povray = callPackage ../tools/graphics/povray { }; ppl = callPackage ../development/libraries/ppl { }; From 0bce8f86e5b481266230fb0111180df017a1b34d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 21:28:08 +0200 Subject: [PATCH 207/213] misc: remove ancient code, that is not used and at least partly broken --- pkgs/misc/misc.nix | 165 -------------------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 167 deletions(-) delete mode 100644 pkgs/misc/misc.nix diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix deleted file mode 100644 index cb4765957f1..00000000000 --- a/pkgs/misc/misc.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ pkgs, stdenv } : - -let inherit (pkgs) stdenv runCommand perl lib; - -in - -{ - /* - Usage example creating a derivation installing ruby, sup and a lib: - - packageOverrides = { - rubyCollection = collection { - name = "ruby"; - list = let l = rubyPackages; in - [ pkgs.ruby l.chronic l.sup ]; - }; - } - */ - collection = {list, name} : runCommand "collection-${name}" {} '' - mkdir -p $out/nix-support - printWords ${builtins.toString list} > $out/nix-support/propagated-user-env-packages - ''; - - /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name} - then you can - ln -s ~/.nix-profile/cdt-envs/name ./nix-deps - and add .nix-deps/{libs,includes} to IDE's such as Eclipse/ Netbeans etc. - To update replace library versions just replace the symlink - */ - cdtEnv = { name, buildInputs }: - stdenv.mkDerivation { - name = "cdt-env-${name}"; - inherit buildInputs; - phases = "installPhase"; - installPhase = '' - set -x - # requires bash4 - PATH=$PATH:${pkgs.pkgconfig}/bin - - perlScript=$(dirname $(dirname ${builtins.getEnv "NIXPKGS_ALL"}))/build-support/buildenv/builder.pl - # now collect includes and lib paths - - # probably the nix hooks work best, so reuse them by reading NIX_CFLAGS_COMPILE and NIX_LDFLAGS - - PKG_CONFIG_KNOWN_PACKAGES=$(pkg-config --list-all | sed 's/ .*//') - - declare -A INCLUDE_PATHS - declare -A LIB_PATHS - declare -A LIBS - declare -A CFLAGS_OTHER - - PKG_CONFIG_LIBS="$(pkg-config --libs $PKG_CONFIG_KNOWN_PACKAGES)" - PKG_CONFIG_CFLAGS="$(pkg-config --cflags $PKG_CONFIG_KNOWN_PACKAGES)" - - for i in $NIX_CFLAGS_COMPILE $PKG_CONFIG_CFLAGS; do - echo i is $i - case $i in - -I*) INCLUDE_PATHS["''${i/-I/}"]= ;; - *) CFLAGS_OTHER["''${i}"]= ;; - esac - echo list is now ''${!INCLUDE_PATHS[@]} - done - - for i in $NIX_LDFLAGS $PKG_CONFIG_LIBS; do - case $i in - -L*) - LIB_PATHS["''${i/-L/}"]= ;; - esac - done - - for i in $NIX_LDFLAGS $PKG_CONFIG_LIBS; do - echo chekcing $i - case $i in - -l*) LIBS["''${i}"]= ;; - esac; - done - - # build output env - - target="$out/cdt-envs/${name}" - - link(){ - echo "link !!!!" - echo $1 - echo $2 - ( - export out="$1" - export paths="$2" - - export ignoreCollisions=1 - export manifest= - export pathsToLink=/ - ${perl}/bin/perl $perlScript - ) - } - - mkdir -p $target/{include,lib} - link $target/lib "$(echo "''${!LIB_PATHS[@]}")" - link $target/include "$(echo "''${!INCLUDE_PATHS[@]}")" - echo "''${!LIBS[@]}" > $target/libs - echo "''${!CFLAGS_OTHER[@]}" > $target/cflags-other - echo "''${PKG_CONFIG_PATH}" > $target/PKG_CONFIG_PATH - echo "''${PATH}" > $target/PATH - ''; - }; - - - # build a debug version of a package - debugVersion = pkg: lib.overrideDerivation pkg (attrs: { - - prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases; - postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases; - - dontStrip = true; - - CFLAGS="-ggdb -O0"; - CXXFLAGS="-ggdb -O0"; - - debugPhase = '' - s=$out/src - mkdir -p $s; cd $s; - export TMP=$s - export TEMP=$s - - for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do - declare -x "$var=''${!var} -ggdb -O0" - done - echo "file should tell that executable has not been stripped" - ''; - - objectsPhase = '' - cd $out/src - find . -name "*.o" -exec rm {} \; - ''; - }); - - # build an optimized ersion of a package but with symbols and source - symbolsVersion = pkg: lib.overrideDerivation pkg (attrs: { - - prePhases = ["debugPhase"] ++ lib.optionals (attrs ? prePhases) attrs.prePhases; - postPhases = ["objectsPhase"] ++ lib.optionals (attrs ? postPhases) attrs.postPhases; - - dontStrip = true; - - CFLAGS="-g -O2"; - CXXFLAGS="-g -O2"; - - debugPhase = '' - s=$out/src - mkdir -p $s; cd $s; - export TMP=$s - export TEMP=$s - - for var in CFLAGS CXXFLAGS NIX_CFLAGS_COMPILE; do - declare -x "$var=''${!var} -g -O2" - done - echo "file should tell that executable has not been stripped" - ''; - - objectsPhase = '' - cd $out/src - find . -name "*.o" -exec rm {} \; - ''; - }); -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4da826510e0..8d4298aec3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19126,8 +19126,6 @@ with pkgs; inherit (gnome2) gtksourceview; }; - misc = callPackage ../misc/misc.nix { }; - bullet = callPackage ../development/libraries/bullet {}; bullet283 = callPackage ../development/libraries/bullet/bullet283.nix {}; From 05a11f8a3d312812309c0bd54cc1aaf5267b2849 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 21:48:32 +0200 Subject: [PATCH 208/213] mysql-workbench: build with default automake --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d4298aec3f..a1dc6100537 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18731,7 +18731,6 @@ with pkgs; mnemonicode = callPackage ../misc/mnemonicode { }; mysql-workbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in { - automake = automake113x; gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; From 1e2529498db2367ac886ab68c7388dfbecc67a3d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 12 Aug 2017 21:48:51 +0200 Subject: [PATCH 209/213] automake113x: remove --- .../tools/misc/automake/automake-1.13.x.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 43 deletions(-) delete mode 100644 pkgs/development/tools/misc/automake/automake-1.13.x.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix deleted file mode 100644 index 54e697656d2..00000000000 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: - -stdenv.mkDerivation rec { - name = "automake-1.13.4"; - - src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0rhx1mr2gv483s4bc9yy9skwr5d5a3jcyfaw24h0r3wvylrlkkl9"; - }; - - buildInputs = [ perl autoconf ]; - - setupHook = ./setup-hook.sh; - - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; - inherit doCheck; - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.13"; - homepage = http://www.gnu.org/software/automake/; - description = "GNU standard-compliant makefile generator"; - license = stdenv.lib.licenses.gpl2Plus; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1dc6100537..f6ae62db18d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6603,8 +6603,6 @@ with pkgs; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; - automake113x = callPackage ../development/tools/misc/automake/automake-1.13.x.nix { }; - automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; From ee85d3d166c2b659fc00ee1c7398d7a6aee12e00 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 12 Aug 2017 17:12:38 +0200 Subject: [PATCH 210/213] webkitgtk: 2.16.4 -> 2.16.6 see: https://webkitgtk.org/2017/07/24/webkitgtk2.16.6-released.html Security fixes: CVE-2017-7039, CVE-2017-7018, CVE-2017-7030, CVE-2017-7037, CVE-2017-7034, CVE-2017-7055, CVE-2017-7056, CVE-2017-7064, CVE-2017-7061, CVE-2017-7048, CVE-2017-7046. --- pkgs/development/libraries/webkitgtk/2.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix index 6231a59dbd1..7d7424d914d 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.4"; + version = "2.16.6"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0a2ikwiw1wn8w11y9ci6nn6dq9w0iki48l9lhnbm7g8rhcrs9azr"; + sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; }; # see if we can clean this up.... From 2ecc4d84ada0c40765052238a1eeae310276b6b4 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 13 Aug 2017 00:23:34 +0200 Subject: [PATCH 211/213] man-pages: 4.11 -> 4.12 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 6ced5785ecf..def57149f22 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "4.11"; + version = "4.12"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd"; + sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; From 2866b8416880fc0c42c99f26e4430bcd97a5885d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 13 Aug 2017 00:40:33 +0200 Subject: [PATCH 212/213] libtsm: fix eval Ref: bd657a72932e8605d3d889fb47f0f33da420f516 --- pkgs/development/libraries/libtsm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 9ba25f33282..bac29bc0ca8 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; - buildInputs = [ libxkbcommon pkgconfig ] ++ stdenv.isDarwin [ + buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [ autoreconfHook ]; From ef026e02fcaa92323be875d8c7146b0b86e31880 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 12 Aug 2017 15:50:55 -0700 Subject: [PATCH 213/213] obs-studio: 19.0.3 -> 20.0.0 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index cddd2af7ae2..b0214f4faa3 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -26,13 +26,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "19.0.3"; + version = "20.0.0"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1qh69bw848l61fmh6n5q86yl3djmvzh76ln044ngi2k69a9bl94b"; + sha256 = "07xjrr86722b05f88z77hzcrkkdlcz3pndaw600ip5xqhsyjy330"; }; patches = [ ./find-xcb.patch ];