diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 650db718665..77d020afa2d 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -37,8 +37,9 @@ In Nixpkgs, these three platforms are defined as attribute sets under the names buildPlatform, hostPlatform, and targetPlatform. - All three are always defined at the top level, so one can get at them just like a dependency in a function that is imported with callPackage: - { stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ... + All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with callPackage: + { stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform..., or just off stdenv: + { stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform.... diff --git a/lib/lists.nix b/lib/lists.nix index a04b1b27893..6a8fd8a1840 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -477,4 +477,12 @@ rec { */ subtractLists = e: filter (x: !(elem x e)); + /* Test if two lists have no common element. + It should be slightly more efficient than (intersectLists a b == []) + */ + mutuallyExclusive = a: b: + (builtins.length a) == 0 || + (!(builtins.elem (builtins.head a) b) && + mutuallyExclusive (builtins.tail a) b); + } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 69bb69c8e20..142e7ff7869 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,6 +43,7 @@ andrewrk = "Andrew Kelley "; andsild = "Anders Sildnes "; aneeshusa = "Aneesh Agrawal "; + ankhers = "Justin Wood "; antono = "Antono Vasiljev "; apeschar = "Albert Peschar "; apeyroux = "Alexandre Peyroux "; @@ -62,6 +63,7 @@ bachp = "Pascal Bach "; badi = "Badi' Abdul-Wahid "; balajisivaraman = "Balaji Sivaraman"; + barrucadu = "Michael Walker "; basvandijk = "Bas van Dijk "; Baughn = "Svein Ove Aas "; bcarrell = "Brandon Carrell "; @@ -155,6 +157,7 @@ drewkett = "Andrew Burkett "; dsferruzza = "David Sferruzza "; dtzWill = "Will Dietz "; + dywedir = "Vladyslav M. "; e-user = "Alexander Kahl "; ebzzry = "Rommel Martinez "; edanaher = "Evan Danaher "; @@ -224,6 +227,7 @@ havvy = "Ryan Scheel "; hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; + hectorj = "Hector Jusforgues "; heel = "Sergii Paryzhskyi "; henrytill = "Henry Till "; hinton = "Tom Hinton "; @@ -315,6 +319,7 @@ luispedro = "Luis Pedro Coelho "; lukego = "Luke Gorrie "; lw = "Sergey Sofeychuk "; + lyt = "Tim Liou "; m3tti = "Mathaeus Sander "; ma27 = "Maximilian Bosch "; madjar = "Georges Dubus "; @@ -564,6 +569,7 @@ tv = "Tomislav Viljetić "; tvestelind = "Tomas Vestelind "; tvorog = "Marsel Zaripov "; + tweber = "Thorsten Weber "; twey = "James ‘Twey’ Kay "; uralbash = "Svintsov Dmitry "; utdemir = "Utku Demir "; diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 4b5e7b3230c..9ede74a54cd 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -250,7 +250,7 @@ trap cleanup EXIT # If --repair is given, don't try to use the Nix daemon, because the # flag can only be used directly. if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then - export NIX_REMOTE=${NIX_REMOTE:-daemon} + export NIX_REMOTE=${NIX_REMOTE-daemon} fi diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 446c05da39d..aa5844cdc4d 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -42,6 +42,10 @@ in }; config = mkIf cfg.enable { + + # Prevent zsh from overwriting oh-my-zsh's prompt + programs.zsh.promptInit = mkDefault ""; + environment.systemPackages = with pkgs; [ oh-my-zsh ]; programs.zsh.interactiveShellInit = with pkgs; with builtins; '' diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b276bf9bb73..a055291282c 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -97,45 +97,6 @@ in config = mkIf cfg.enable { - programs.zsh = { - - shellInit = '' - . ${config.system.build.setEnvironment} - - ${cfge.shellInit} - ''; - - loginShellInit = cfge.loginShellInit; - - interactiveShellInit = '' - # history defaults - SAVEHIST=2000 - HISTSIZE=2000 - HISTFILE=$HOME/.zsh_history - - setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK - - # Tell zsh how to find installed completions - for p in ''${(z)NIX_PROFILES}; do - fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) - done - - ${if cfg.enableCompletion then "autoload -U compinit && compinit" else ""} - - ${optionalString (cfg.enableAutosuggestions) - "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh" - } - - ${zshAliases} - ${cfg.promptInit} - - ${cfge.interactiveShellInit} - - HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" - ''; - - }; - environment.etc."zshenv".text = '' # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically. @@ -146,6 +107,10 @@ in if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi export __ETC_ZSHENV_SOURCED=1 + . ${config.system.build.setEnvironment} + + ${cfge.shellInit} + ${cfg.shellInit} # Read system-wide modifications. @@ -163,6 +128,8 @@ in if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi __ETC_ZPROFILE_SOURCED=1 + ${cfge.loginShellInit} + ${cfg.loginShellInit} # Read system-wide modifications. @@ -182,8 +149,34 @@ in . /etc/zinputrc + # history defaults + SAVEHIST=2000 + HISTSIZE=2000 + HISTFILE=$HOME/.zsh_history + + setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK + + HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" + + ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"} + + ${optionalString (cfg.enableAutosuggestions) + "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh" + } + + ${zshAliases} + + ${cfge.interactiveShellInit} + ${cfg.interactiveShellInit} + ${cfg.promptInit} + + # Tell zsh how to find installed completions + for p in ''${(z)NIX_PROFILES}; do + fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) + done + # Read system-wide modifications. if test -f /etc/zshrc.local; then . /etc/zshrc.local diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 11628781bbd..bd6c316243c 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -44,6 +44,16 @@ in { ''; }; + startWhenNeeded = mkOption { + type = types.bool; + default = false; + description = '' + If set, mpd is socket-activated; that + is, instead of having it permanently running as a daemon, + systemd will start it on the first incoming connection. + ''; + }; + musicDirectory = mkOption { type = types.path; default = "${cfg.dataDir}/music"; @@ -123,10 +133,23 @@ in { config = mkIf cfg.enable { + systemd.sockets.mpd = mkIf cfg.startWhenNeeded { + description = "Music Player Daemon Socket"; + wantedBy = [ "sockets.target" ]; + listenStreams = [ + "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}" + ]; + socketConfig = { + Backlog = 5; + KeepAlive = true; + PassCredentials = true; + }; + }; + systemd.services.mpd = { after = [ "network.target" "sound.target" ]; description = "Music Player Daemon"; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; preStart = '' mkdir -p "${cfg.dataDir}" && chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}" @@ -136,6 +159,16 @@ in { User = "${cfg.user}"; PermissionsStartOnly = true; ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon ${mpdConf}"; + Type = "notify"; + LimitRTPRIO = 50; + LimitRTTIME = "infinity"; + ProtectSystem = true; + NoNewPrivileges = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK"; + RestrictNamespaces = true; }; }; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index fe0c452d067..846efc8b5b9 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -225,11 +225,7 @@ in { User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.home; - Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.www}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.waterfall-view}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.console-view}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages:${pkgs.python27Packages.dateutil}/lib/python2.7/site-packages:${pkgs.python27Packages.six}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy}/lib/python2.7/site-packages:${pkgs.python27Packages.jinja2}/lib/python2.7/site-packages:${pkgs.python27Packages.markupsafe}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy_migrate}/lib/python2.7/site-packages:${pkgs.python27Packages.tempita}/lib/python2.7/site-packages:${pkgs.python27Packages.decorator}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlparse}/lib/python2.7/site-packages:${pkgs.python27Packages.txaio}/lib/python2.7/site-packages:${pkgs.python27Packages.autobahn}/lib/python2.7/site-packages:${pkgs.python27Packages.pyjwt}/lib/python2.7/site-packages:${pkgs.python27Packages.distro}/lib/python2.7/site-packages:${pkgs.python27Packages.pbr}/lib/python2.7/site-packages:${pkgs.python27Packages.urllib3}/lib/python2.7/site-packages"; - - # NOTE: call twistd directly with stdout logging for systemd - #ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; - ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac"; + ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; }; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f1b3d298fec..ab161b7e772 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -9,11 +9,16 @@ let # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; + dns = + if cfg.useDnsmasq then "dnsmasq" + else if config.services.resolved.enable then "systemd-resolved" + else "default"; + configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} - dns=${if cfg.useDnsmasq then "dnsmasq" else "default"} + dns=${dns} [keyfile] ${optionalString (cfg.unmanaged != []) diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index 1893edf3a77..843f0d98687 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -29,6 +29,40 @@ in description = "The config directory, for the access keys and other settings."; }; + accessKey = mkOption { + default = ""; + type = types.str; + description = '' + Access key of 5 to 20 characters in length that clients use to access the server. + This overrides the access key that is generated by minio on first startup and stored inside the + configDir directory. + ''; + }; + + secretKey = mkOption { + default = ""; + type = types.str; + description = '' + Specify the Secret key of 8 to 40 characters in length that clients use to access the server. + This overrides the secret key that is generated by minio on first startup and stored inside the + configDir directory. + ''; + }; + + region = mkOption { + default = "us-east-1"; + type = types.str; + description = '' + The physical location of the server. By default it is set to us-east-1, which is same as AWS S3's and Minio's default region. + ''; + }; + + browser = mkOption { + default = true; + type = types.bool; + description = "Enable or disable access to web UI."; + }; + package = mkOption { default = pkgs.minio; defaultText = "pkgs.minio"; @@ -57,6 +91,14 @@ in Group = "minio"; LimitNOFILE = 65536; }; + environment = { + MINIO_REGION = "${cfg.region}"; + MINIO_BROWSER = "${if cfg.browser then "on" else "off"}"; + } // optionalAttrs (cfg.accessKey != "") { + MINIO_ACCESS_KEY = "${cfg.accessKey}"; + } // optionalAttrs (cfg.secretKey != "") { + MINIO_SECRET_KEY = "${cfg.secretKey}"; + }; }; users.extraUsers.minio = { diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix new file mode 100644 index 00000000000..e1dee71fddf --- /dev/null +++ b/nixos/tests/ammonite.nix @@ -0,0 +1,20 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "ammonite"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + amm = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.ammonite ]; + }; + }; + + testScript = '' + startAll; + + $amm->succeed("amm -c 'val foo = 21; println(foo * 2)' | grep 42") + ''; +}) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index 462a3bc4768..a349265b2f5 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -4,8 +4,15 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ bachp ]; }; - machine = { config, pkgs, ... }: { - services.minio.enable = true; + nodes = { + machine = { config, pkgs, ... }: { + services.minio = { + enable = true; + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + }; + environment.systemPackages = [ pkgs.minio-client ]; + }; }; testScript = @@ -14,6 +21,12 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->waitForUnit("minio.service"); $machine->waitForOpenPort(9000); $machine->succeed("curl --fail http://localhost:9000/minio/index.html"); + + # Create a test bucket on the server + $machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4"); + $machine->succeed("mc mb minio/test-bucket"); + $machine->succeed("mc ls minio") =~ /test-bucket/ or die; $machine->shutdown; + ''; }) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 3beb38e0d2d..7f7c3f304c2 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,31 +1,20 @@ -{ stdenv, lib, go, fetchgit }: +{ stdenv, lib, clang, buildGoPackage, fetchgit }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.4.7"; + version = "1.6.6"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/ethereum/go-ethereum"; - buildInputs = [ go ]; + buildInputs = [ clang ]; + preBuild = "export CC=clang"; src = fetchgit { inherit rev; url = "https://${goPackagePath}"; - sha256 = "19q518kxkvrr44cvsph4wv3lr6ivqsckz1f22r62932s3sq6gyd8"; + sha256 = "066s7fp9pbyq670xwnib4p7zaxs941r9kpvj2hm6bkr28yrpvp1a"; }; - buildPhase = '' - export GOROOT=$(mktemp -d --suffix=-goroot) - ln -sv ${go}/share/go/* $GOROOT - ln -svf ${go}/bin $GOROOT - make all - ''; - - installPhase = '' - mkdir -p $out/bin - cp -v build/bin/* $out/bin - ''; - meta = { homepage = "https://ethereum.github.io/go-ethereum/"; description = "Official golang implementation of the Ethereum protocol"; diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index bf2d6f65326..b2f5cfdea06 100644 --- a/pkgs/applications/altcoins/seth.nix +++ b/pkgs/applications/altcoins/seth.nix @@ -1,22 +1,22 @@ { stdenv, makeWrapper, lib, fetchFromGitHub -, bc, coreutils, curl, ethabi, git, gnused, jshon, solc, which }: +, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which }: stdenv.mkDerivation rec { name = "seth-${version}"; - version = "0.5.1"; + version = "0.5.6"; src = fetchFromGitHub { owner = "dapphub"; repo = "seth"; rev = "v${version}"; - sha256 = "1qph1gldj24r8l6aswb1w133lrm8zsxmmxl4krjik0a73bm4ghdm"; + sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6"; }; nativeBuildInputs = [makeWrapper]; buildPhase = "true"; makeFlags = ["prefix=$(out)"]; postInstall = let path = lib.makeBinPath [ - bc coreutils curl ethabi git gnused jshon solc which + bc coreutils curl ethabi git gnused jshon perl solc which ]; in '' wrapProgram "$out/bin/seth" --prefix PATH : "${path}" ''; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a7ac2325eac..98b8282b999 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.3.0.tar"; - sha256 = "1p2zaq0s4bbl5cx6wyab24wamw7m0mysb0v47dqjmnvfc25z84rq"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.4.0.tar"; + sha256 = "1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4"; }; packageRequires = [ emacs ]; meta = { @@ -821,10 +821,10 @@ gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; - version = "0.2.5"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.2.5.tar"; - sha256 = "186cyay7nk2khnhilrwzjipb3syxl0s4n96b48j9plaba48azz11"; + url = "https://elpa.gnu.org/packages/gited-0.3.1.tar"; + sha256 = "14ng63hxd6l76r8m54gzqq9j66cqz48ad1zaamn100h4b2rzf2q8"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1445,10 +1445,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170622"; + version = "20170703"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170622.tar"; - sha256 = "0922lcbr2r7bkswljqzbm5y3ny1n67qfrmf7h7z9hsw2wy0505dp"; + url = "https://elpa.gnu.org/packages/org-20170703.tar"; + sha256 = "04rg2fldbsxizq84xl6613s8xnwyp8iwmxm167v69bc85xaf7s9s"; }; packageRequires = []; meta = { @@ -1651,10 +1651,10 @@ }) {}; rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rnc-mode"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rnc-mode-0.1.el"; - sha256 = "18hm9g05ld8i1apr28dmd9ccq6dc0w6rdqhi0k7ka95jxxdr9m6d"; + url = "https://elpa.gnu.org/packages/rnc-mode-0.2.el"; + sha256 = "0xhvcfqjkb010wc7r218xcjidv1c8597vayyv09vk97z4qxqkrbd"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 55a6f691041..708713e8181 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -801,8 +801,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1174,12 +1174,12 @@ add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "20170518.209"; + version = "20170705.2205"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "f7a94ef1762ad8eb58d24c0857751863ea93cd5b"; - sha256 = "1j524wvl9l9hzahq8by9bnh745kg2z7l808ad9b0y0wx5kf17xlz"; + rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; + sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1403,12 +1403,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20160721.2122"; + version = "20170702.2226"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74"; - sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4"; + rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; + sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1487,12 +1487,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170611.1031"; + version = "20170629.2153"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "e32d3908e40287648b3e88014aa9c2c977a9b715"; - sha256 = "0993zm6dn2k85pkyvwf63ccqc90z1s8b3qaqpxm9qprinimxff6h"; + rev = "24f2495ab209f8f00b7883285637e207b6f07201"; + sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1508,12 +1508,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20170202.6"; + version = "20170701.751"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766"; - sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq"; + rev = "d1d19c76393ffe80fb11c6837e8582c3cb087d40"; + sha256 = "1gyjswlgbx5p1pq74qncrcjypkrfqd3dxm39bnbaszc6rhb58k8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1592,12 +1592,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170627.538"; + version = "20170703.112"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "c491f5fa2267e7f8df180d7d125d9faeccbdea46"; - sha256 = "080xdw3jz687dfpg2ad7j35axagbnlz7bbrxxj018gh9b5hy3i1k"; + rev = "f155ce7e6984d8fe11831cd8a9f89828f5c5be43"; + sha256 = "1860ia7ld566f2z2pskvyi0cnfl20frszi4w5281px6y2c8g4zxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -4023,12 +4023,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170411.608"; + version = "20170702.237"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "f2bedeeb5804a4863bb53aca6f77195f7d530c38"; - sha256 = "1p2l6zqls2c8v1ahn9rkfj6vvcsx1ymd0rd590scj8kqhjjyq3n7"; + rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b"; + sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -5094,8 +5094,8 @@ src = fetchFromGitHub { owner = "riscy"; repo = "bifocal-mode"; - rev = "e33923fd9970a6d46c9366264818abcb9856d6e4"; - sha256 = "07vkqgz45di0ccjs21psywx74ji9k0bbgix15k0nnav66fzv1i47"; + rev = "05d1076069d0a19292a38e835c32137e43ee9708"; + sha256 = "1fvr8vvpdd2xawv1j58wpxakbia31rzy513dakd78mlfkih2ixvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; @@ -5157,8 +5157,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400"; - sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf"; + rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c"; + sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5470,8 +5470,8 @@ src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "a7d3fa9317e9aa0b492e61b0706c4d9ca2f7a4b5"; - sha256 = "0ry1n53y1jz0gmijhypp84kaxkxn8g1pma74dwqmsy7f5ayhwi3h"; + rev = "98e397c4014f7c81c42722028778726cbf9baf8c"; + sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5633,7 +5633,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170626.844"; + version = "20170703.1431"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; @@ -6445,12 +6445,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170520.147"; + version = "20170701.429"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb"; - sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1"; + rev = "b6deeffe032527696e32623b69bdf07b538a315e"; + sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6718,12 +6718,12 @@ calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "20170410.1920"; + version = "20170703.1704"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; - sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + rev = "bcfc0c546c3c58e1f635a9a29efdf56c9421a3ce"; + sha256 = "0n7kn0g7mxylp28w5llrz22w12qjvypa1g82660qr2d9ga9mb0v9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw"; @@ -7014,8 +7014,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; + sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -7056,8 +7056,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; + sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -7305,7 +7305,7 @@ version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12262"; + rev = "12267"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7929,12 +7929,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170620.207"; + version = "20170705.951"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "55a579f56a05d945e6ce5764002d2cadafa581eb"; - sha256 = "1lni2a9gy44xna62w6kfv678j8zk1dawwaqrbyn3mdy1s7d3mcj9"; + rev = "4a7b5ffc245be2b4285bed07f66ca88c5b4420a8"; + sha256 = "1k5zdw3cag9918kv51ph0jlg0wa0m4fbzl7yf3cvsfb78xf4apmd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8205,7 +8205,7 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "306591"; + rev = "307254"; sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; }; recipeFile = fetchurl { @@ -8675,12 +8675,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "clomacs"; - version = "20170128.850"; + version = "20170705.719"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "0c7793b52166730a563c3318cdcb9f2b423bc675"; - sha256 = "1sj4awcz6xdk1lq7yz69d8v0d97alipc3avzmnby6lpm2pw1n45a"; + rev = "7af6fa717f08fda930641a27f3a07743c2042514"; + sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8847,8 +8847,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "e40e8f5c4216ac1e176342887d1af95965528344"; - sha256 = "0l45qjyq8x64l96mikrpnbnw1919a8l8lrs40lzca35b429sbyqq"; + rev = "8bc93cdd797e6396040bd00eee877734af0d3759"; + sha256 = "1b92ba67dkihyixd1p2pkaqcgr39gf64vka1sbbx2fcwczyv3q32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -10053,8 +10053,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61"; - sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -10395,8 +10395,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10915,12 +10915,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170628.1034"; + version = "20170705.417"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74"; - sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5"; + rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; + sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11066,8 +11066,8 @@ src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "158d6bacb0986a27aa90a5b6dce81ae820b62cef"; - sha256 = "1n510afmaprwlv6hck2kc9myvj9wsrspqyjzj5vql1y9c6w1xhsc"; + rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d"; + sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; @@ -11981,8 +11981,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "20256403e4d81b7eea1165bf78b8faf8502e8204"; - sha256 = "1njxnzss34w6wary9icj7vsazhmc9bz3ix1qf3bjacbi1n5q3k2c"; + rev = "749d07b9c1eee8751c690967dc48bdd11c0cfc06"; + sha256 = "0h51h7c19ncb3a6q4mgkq06fdc4q64s71z4a9rwwxk7kqs842hwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12124,12 +12124,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170628.811"; + version = "20170702.1007"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "7491ab2dfe5d0200f32cb3100671ea4db419dffe"; - sha256 = "1bnhybals3b6bfngsqyksdp8n3kdar9ihffc5ppc77rvvjcl7p3w"; + rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83"; + sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12334,12 +12334,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170528.2201"; + version = "20170629.1848"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "e5e2433fccb225b347c84c3bba5e3ed9769c2922"; - sha256 = "0l3clqy9zrd8xbaacx7ck8kw1x6rl1b9vd5ss57wnqpsdz25nggi"; + rev = "475fd1b583958d40b1cba6cfaf4ccfd7d5ca8f18"; + sha256 = "1w2jsg5nyms6iz02digwj96dry926hs0d2c9pi7y252zifhldkdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12628,12 +12628,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170610.1729"; + version = "20170705.533"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "a7aebe7a4c6744853bb2ce4acb0e4c9fd2ac3890"; + sha256 = "09mpib3xhqf1aazgq9amq8khj4jmvmal26f9l5s40s019ipzdx9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12731,12 +12731,12 @@ decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; - version = "20160314.1248"; + version = "20170702.1617"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; - rev = "f243afc7cff11d9696552695e2dfc0ca91e1c5b6"; - sha256 = "05n57djagbkm8im4168d5d2fr2ibfnckya7qzrca1f9rmm0ah15j"; + rev = "90133687118c236142b8110571c463304b3192f9"; + sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; @@ -12960,12 +12960,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20170126.739"; + version = "20170628.1503"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "f61f336c8c291208d9feef2ce495e8c659052f77"; - sha256 = "1wb7n4k2qwl3m7y22zag6rdzi1gqb8a5lj7crpkkn5ryycbxbbpi"; + rev = "1e8b42ff6479fa541eeec5699b4727af136d40da"; + sha256 = "1x9crsc8n5pqyp60h46gz6wz98qaj3bygk11vd39qpfh2hxdxxi6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -13731,10 +13731,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170623.1621"; + version = "20170630.752"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "14lkdkk6z2zx0rvz8vnhz9a7i87irm1a5wc3q39wmf8q5vh32pkc"; + sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y"; name = "dired+.el"; }; recipeFile = fetchurl { @@ -14843,12 +14843,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170615.437"; + version = "20170630.922"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "55d2f8eb0b6ed6a1964741c61d898c97ed934b7a"; - sha256 = "0wbhjfiidl1fbxhdrpk9f7wc3kvb4nshwzfxd1vrgpx48kaiahgb"; + rev = "dc9c0b938ea0bc7a30a79fb74f2e66f1fb2128be"; + sha256 = "04wwv3pps4kwld590x5gwif69izcbapp0y4w3i4nsc88ld08sp96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15278,7 +15278,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1800204"; + rev = "1801041"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15903,12 +15903,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170605.1440"; + version = "20170705.2343"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "4624e67ca26cb348063a97a8f59a3fbcbf8a5736"; - sha256 = "0ds11hphxp8jxsc50lvnr9n4macvzd82y7siqh8wvswk62l8vb4x"; + rev = "a6356007a58dc72636ab94c89536c621f089bb0c"; + sha256 = "00qcq1bs8wyxj9cf2jy691ddddz0v5czwn92x40nc43a7qi0a9h1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16346,8 +16346,8 @@ src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "0a50fbb524fe256560f481701c000309c627b9ca"; - sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd"; + rev = "f7cf37c3f605812d429fd90699d6d33f6ac9db8d"; + sha256 = "1i4fvw7703pr505mzspkc7sphh3mbg4pvbpfcr847lrg66pdw419"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -16763,12 +16763,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20170112.2204"; + version = "20170701.1607"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "f7bb3855b2393f667f597d30775749faa5038cfc"; - sha256 = "0i89fmn8k3p3qciqq2vhbl86mn9s9l0hinn6kgs637v0fanyahsd"; + rev = "3925f0189d99c6cddbe19831c2020f97adcc4933"; + sha256 = "1lzmhfhwfnkpcbkvkl5vzfjv3h7wb85y9j98wrb3vlydbc9735dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16847,12 +16847,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170513.2050"; + version = "20170705.1739"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "22682dd020ac93b621bf45e57c738e551e2cb14b"; - sha256 = "1hv9i78fchvmygmb7pfx1ybkq270aibdhjsidzskipfzw40p0dz2"; + rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c"; + sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -17013,12 +17013,12 @@ el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2markdown"; - version = "20160822.1135"; + version = "20170630.1158"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "el2markdown"; - rev = "712364b9f64d2f6501a069e1bfed207de0237881"; - sha256 = "12l50k56h1aiwmvvxrka3y1i82sv5xc7vn99z3y3kl31yl3g6382"; + rev = "368d99313683cd943c99feaffca356be60bdb636"; + sha256 = "1h0cr8qcvj9r3acb6bf5nyglvi5gdglwflkfl5jbzp0nm1p9iqcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2markdown"; @@ -17221,12 +17221,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170531.206"; + version = "20170703.1849"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55"; - sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg"; + rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6"; + sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17295,8 +17295,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55"; - sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg"; + rev = "d02bdb074046ba07774e3ce74a7a22739f01c3a6"; + sha256 = "1ssf692hi3l5bq8fdsj1nm25ng3x0vqi87fpw34dzmvgbg2jk6ff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17753,12 +17753,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170613.1339"; + version = "20170701.1412"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "4970cbb55767e5f31913b21fb1ae733b6479ccd0"; - sha256 = "0v0gw8ba073k6n48vrksp1bkrsh0fyg7wmc0mpjf13qcbcwn3ydd"; + rev = "6b654b5fdc4e8f09cd842a0dde83ded284223c2f"; + sha256 = "02z965inkp3bxg9nyqscjs14dfzx7s18s3kx7ry50j2yi0iki6rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18841,12 +18841,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170625.617"; + version = "20170703.505"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "e70a39d6e079dc1f818ad49d39c328fd3d9df1d9"; - sha256 = "08qm2vbdimbmwhz4zdhc2kypkk8c0vhw8ihl5z8l9yfq4nw2wrc7"; + rev = "4a253e1c24bfb993ca115dac7c9c03189fa0f7cc"; + sha256 = "1vkihm7m5zpcyyr418661gfpdwixqzyrbp2vlhf6vd7i26ik3i8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18954,12 +18954,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20170301.856"; + version = "20170702.59"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "deb9affaadce11c356df53b6b62ab376ef652d16"; - sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0"; + rev = "d9c43561d8d50066c1774e3cf3df12e168c9fc92"; + sha256 = "145zn11l9i0lmjr83zvn8snviqqn6kw24dm5ihlllgxycclsvcrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19482,8 +19482,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "e629ff20dce103b4c38ee3a654c9b4a83867d41a"; - sha256 = "1x34b7f4xkpa6w5gllvz7cmlnvvyy474gscbxvypszdf4ynxpcv1"; + rev = "9e9ad191ce49eb410c7a95a8410122eed8049755"; + sha256 = "06iyy74hpnc9aqrgbwndx1shvdq05z8hys9siv4ng13725cfpj0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19645,12 +19645,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170608.1234"; + version = "20170705.1947"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "3752438d17c45553956cf775022b2358ff3d8731"; - sha256 = "0a2afjg0ygd88qp5pc39ghwck837f6sk57c8zbcsyxwrabxnchhd"; + rev = "61a8bf7d6cc6881e5555922eb36eecc6733a2b87"; + sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -19750,12 +19750,12 @@ esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-help"; - version = "20140107.222"; + version = "20170702.1912"; src = fetchFromGitHub { owner = "tom-tan"; repo = "esh-help"; - rev = "3dc15f2f6086d4e4da977468fda67229a859c927"; - sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms"; + rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695"; + sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; @@ -20439,12 +20439,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170624.1221"; + version = "20170704.1409"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "cecbcfbdda16653e3b5ddc7de2eab25537ec154b"; - sha256 = "0s6g822m19dq557ax42vwvgd017qff8hdajdjb03bfp2gd2zwb66"; + rev = "a375ac8aea43980dfa60525c7585be64896e42d1"; + sha256 = "1b3j29d4ppbgfg15vfyxz7rpjppqma9am3hk57qxq08n5y3skaxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; @@ -21342,12 +21342,12 @@ evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170623.1221"; + version = "20170702.302"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "dc62ac317fd29f018e9785c1b3b7dd7ad57b3938"; - sha256 = "18j33smlajj7ynigfgm64z3kfys5idbxin2gd93civ2564n85r33"; + rev = "c50372d152b123fbf7bc26b49504505a22e82635"; + sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21884,22 +21884,22 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170628.732"; + version = "20170706.408"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "3b9367779653635cf5e0ab1554b9709b109859ed"; - sha256 = "0802az9ywfjmainj1is335ni1dm8hfrj3rabhmhwjsa9h0crh5f5"; + rev = "c73155257a3248d30a9f602de8247ac3e32ba400"; + sha256 = "1bcmrmyx12g11laz9f994vhmqyv1g0qvmp0sbh07nl1q42xy86m6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; name = "exwm-x"; }; - packageRequires = [ cl-lib exwm swiper switch-window ]; + packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -23553,12 +23553,12 @@ flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-analyzer"; - version = "20170623.446"; + version = "20170704.2333"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-clang-analyzer"; - rev = "4c7d24a6a20ef528ee4ac28e5f783af6732b639a"; - sha256 = "0ncp9jwxf1lqxzpxz6ivn4qhg6bn318ykmfrw4jp1iz73qxx0kh8"; + rev = "a33752224cb1da13b35d0d60b2017fe73d167781"; + sha256 = "1f6nb92fg1lgf4xz8x1i61njwnqrab94p88kliaa7g9r4hfhgv8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer"; @@ -23658,12 +23658,12 @@ flycheck-coverity = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-coverity"; - version = "20170520.825"; + version = "20170703.1759"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-coverity"; - rev = "fb8ef7b07ca17681b72272331d43578f30405bec"; - sha256 = "0068wzh2fyrbjn5gvfyf1kpfppfw49mnwkd0n046nhjgaz9y1lc7"; + rev = "cb211e3dd50413a5042eb20175be518214591c9d"; + sha256 = "17c5lppa5axw6wga3k8zqmn5f2syadlqbavrqgsi8k8nlcckxy1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55e8df91adbcf8b059096e02aba2781424250381/recipes/flycheck-coverity"; @@ -24523,8 +24523,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -26355,11 +26355,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170627.1447"; + version = "20170705.1534"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "7a9817aeb69f503cb8433510db59a2f110cd7f43"; - sha256 = "0y755v2bv9lq9sban6in49d6kz7cgz3hyg4mpns53ibiqc0jf0sy"; + rev = "1eff2b3dbcbe6d8518a5ec42207b5578dbe93530"; + sha256 = "1nr5s98xss68scmbzrfmdn1ri4hfny6317j6bhksxqnd6dr6za8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -26480,12 +26480,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170623.756"; + version = "20170705.1240"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "9e2a79856fd07fdad91113c9eb10566193b74586"; - sha256 = "0a395l9kvx1flyzfp2npsz4izww4kqkj3sby3fv5knrhd4dz5jdi"; + rev = "8e3b72bcf26b992546d794b10b96d05ed01f0a73"; + sha256 = "1y2y701ks3fd6khls4i30b906akxqj3l1c15nbblp6xl07bznxw9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26810,12 +26810,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170411.1021"; + version = "20170704.1044"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "41059d6295dbaa207b2203fb6b78003de4888714"; - sha256 = "19ri8q3wbpw3vsw2iq1ym60gk0j4f9bniipiddrjqqirhcns8zzq"; + rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd"; + sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27125,12 +27125,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170614.840"; + version = "20170702.512"; src = fetchFromGitHub { owner = "tarsius"; repo = "ghub"; - rev = "efdc28e3d27dd0847ceece593ecd1e9ed3287c9f"; - sha256 = "0vh6y36b219vg2iwxbcdkdsnpnmb4kkvr9pz2kgiayyqrmz3ck37"; + rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011"; + sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; @@ -27339,8 +27339,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53"; - sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n"; + rev = "b8d558678821e35450c19e415656e366ebe44c38"; + sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27755,12 +27755,12 @@ github-modern-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-modern-theme"; - version = "20170624.2230"; + version = "20170628.2332"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "GitHub-Modern-Theme-For-Emacs"; - rev = "4bdcaf765d87995be99e15775fe313fe98c3ee57"; - sha256 = "1lkbx06dgwc19h9bxxwvqqwwdpy0dm8djazvzbsxw0x200cx2j2m"; + rev = "1890ab87ca8a046b3fc7b54220647d9ef43a6780"; + sha256 = "00jw2qf4x943sib0j6grcmm3lfr0ac23wa3vnzjzc509v4l7jzwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5506d93bd8cf59cd281091b377c1bb9a4243666/recipes/github-modern-theme"; @@ -27839,12 +27839,12 @@ github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; - version = "20170624.2223"; + version = "20170630.1501"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "emacs-github-theme"; - rev = "99dd601d7f80893d42531510204f8115ed27f32b"; - sha256 = "03gnwg482m8mhhfdi7jlinyjwwv4l3jf8s84spkl4jl4d97brk04"; + rev = "29f00a51d949a248a5f6355a97131e216747c797"; + sha256 = "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; @@ -28324,8 +28324,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61"; - sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28870,8 +28870,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "85799e8cd3040b960e4dcc544cc9bb7c9cd716c3"; - sha256 = "16khvjfiv4x1rghac2d970875w6jyg2fl7pbj801q0ia5cm7cxz8"; + rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a"; + sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29137,12 +29137,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170316.1124"; + version = "20170629.1129"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "af03c6dfde43f6f6d39a1363267d591cf76aab66"; - sha256 = "1adgg08bsi8p03a6rpc1a23dxvrikc37zcljrdyc4j2z8ci839x4"; + rev = "eecdf6b7aaed40a71eff13c44456d63127e494bc"; + sha256 = "1y7dxd40w5zkp59m0n1ybf128zhpi2wkjbw5v5w0ps7nx782dnzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29267,8 +29267,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "525f899f69623828d75f0e744250316f27ed02a6"; - sha256 = "01711l9g64d6sxhappn8cpxl315cprc3a5dnbkgm0vsaas6kl4xa"; + rev = "2f63009220e9b13516696396a8bf1a5be4757e33"; + sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29502,27 +29502,6 @@ license = lib.licenses.free; }; }) {}; - gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gregorio-mode"; - version = "20151026.720"; - src = fetchFromGitHub { - owner = "cajetanus"; - repo = "gregorio-mode.el"; - rev = "5b618a8d05cc073bd8e6f1e4e56eceb4de60eab3"; - sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/81317d4ad793d8a58770844ec9a526a2c695f94a/recipes/gregorio-mode"; - sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx"; - name = "gregorio-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gregorio-mode"; - license = lib.licenses.free; - }; - }) {}; grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-a-lot"; @@ -29648,12 +29627,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170628.1209"; + version = "20170705.815"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "525f899f69623828d75f0e744250316f27ed02a6"; - sha256 = "01711l9g64d6sxhappn8cpxl315cprc3a5dnbkgm0vsaas6kl4xa"; + rev = "2f63009220e9b13516696396a8bf1a5be4757e33"; + sha256 = "0vkfvpggdwp6xnz0c7kgfkrlv53v2h4hxdx75nsfnycm6wm9m3v7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29711,12 +29690,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170627.215"; + version = "20170705.1636"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "1e41219fce47a8b5201de98f954e7040b4eea980"; - sha256 = "0yaw60pny5q63ljn4pwx316rix7385rycvyiakcn7zfd00nwnvdh"; + rev = "fff195715b537ac6f13b89034c232a8f33bca45e"; + sha256 = "0l5iwxj0ahn3r2sha4045lwlqi4s8070p1rbiw5fmad3v66i3m3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -29858,12 +29837,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170628.747"; + version = "20170702.724"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "f4b0d8d83bad30b99a919639b387189350c6fc62"; - sha256 = "0cif4d4n0l5apfksg67zsavh6wrv2pcpq2r0m8zjfg48hv6qmsad"; + rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f"; + sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30362,12 +30341,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170601.2103"; + version = "20170704.1445"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "7eb94b5a5d9478a0da869bd26ba51d08e574d843"; - sha256 = "1bj077gpg2xzzjcriv9zixjqalppv0ya5s3bpxn2w93jkzxa9xd5"; + rev = "00ca4d935e80707e18c17e40630ea9e36b39592c"; + sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30631,12 +30610,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170627.155"; + version = "20170705.2232"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9d840649dd08f0c417add55c3b434d34f4b381a1"; - sha256 = "0az1a95drpcmzkqn0jw9kc9kjbz7wbgphzrwcag4rg8ljkn7q80r"; + rev = "f0bbfb828320c95992d6fc593be849f522cde0cc"; + sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31240,12 +31219,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170622.1355"; + version = "20170701.629"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9d840649dd08f0c417add55c3b434d34f4b381a1"; - sha256 = "0az1a95drpcmzkqn0jw9kc9kjbz7wbgphzrwcag4rg8ljkn7q80r"; + rev = "f0bbfb828320c95992d6fc593be849f522cde0cc"; + sha256 = "0i5x4y2z3k40zm0brjjvzb4qkxncpx13xxx0f3pjl34h446b0m46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -33049,8 +33028,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33343,8 +33322,8 @@ src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "89a7564edc6b23ffba52b02353528b9b6285c729"; - sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1"; + rev = "a4c267aef5a3344bd4d76b6b6cf13e120cbe002e"; + sha256 = "13r4s6k0yxp3z68756sni27l7lmlfhdz3hx021w7lhn4np69i299"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -33610,8 +33589,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "792e340352b3ddc579e34d8d6ffb4219bac5cbeb"; - sha256 = "1af9xkzmn84374kr0czlivzxxfay35l2pw8rp7nkr0w0kjhmmxmr"; + rev = "da7d479c89090155996bf568bd89fa8a8859eac7"; + sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -33690,12 +33669,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170627.22"; + version = "20170702.1915"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "235264a99435552ebd57c0a7784ec0c500b7966a"; - sha256 = "0j3z1zabzc2mmlvzzp21pmfv03p5lf0cjf0xadiy5df2z2xnrmfa"; + rev = "201c795ded01d96690ceadc1dd068744aceaeda8"; + sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -33913,12 +33892,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20170617.1126"; + version = "20170706.552"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "e71c2970dc4eb90e5473f7a038e7ccba4dac6c36"; - sha256 = "10mlbz3xlbvka5bw5cxymbha5vkkbb9sfziwxgfx5bwrhjp6n90z"; + rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764"; + sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -33933,10 +33912,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20170223.743"; + version = "20170702.732"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=145"; - sha256 = "05dsa2sfciajwagm1gzl3v2r199nl1yjnb6l0v8ria3f9d72yj5j"; + url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149"; + sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56"; name = "highlight.el"; }; recipeFile = fetchurl { @@ -34470,12 +34449,12 @@ historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historian"; - version = "20170416.2154"; + version = "20170630.1054"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d"; - sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip"; + rev = "99e282bdd8994cb4e23185d9004b2cb42a214927"; + sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -34737,12 +34716,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170623.1400"; + version = "20170705.1355"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "24fef866f5aaee475da845145a516b3c368fde81"; - sha256 = "0h3pn079i2vj9japba7wbsfap5s5qjglvvbmncmgjd26sl4q4hr0"; + rev = "67d52175fbc5a194367e421a33ff4359a0ee016d"; + sha256 = "11l13j9j3bh7p1hprlpvjc8ir8643d7px4a89rpwa2m70z9v0skp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -35572,7 +35551,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170625.1911"; + version = "20170704.1507"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087"; sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp"; @@ -35779,12 +35758,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170601.559"; + version = "20170705.1656"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40"; - sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm"; + rev = "e8c2716cb38067d23f35666be83323267e692618"; + sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -36094,12 +36073,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170530.1839"; + version = "20170705.1656"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40"; - sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm"; + rev = "e8c2716cb38067d23f35666be83323267e692618"; + sha256 = "02xyrfw219nfww0rf3qyn43sxk7c9hi9agq7l23dzq7rq25r6qjd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -36178,12 +36157,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20170628.1231"; + version = "20170703.2038"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "e4347cfb75e4efdb43b52b01bd759c84aba84804"; - sha256 = "0m26xwp0gysawf7dzx2k70hlxky0qbfpxqfs7clb17dv1i7ixa6y"; + rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3"; + sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -36675,12 +36654,12 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "20170601.1828"; + version = "20170702.1844"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "41f90782b7d5c58f53ad0187b816faeea408e4cf"; - sha256 = "1w73734n8qwhvina1y9m60b5jj5yy1csizbldyph4vcgi3x0ff6l"; + rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c"; + sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -36801,12 +36780,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170620.808"; + version = "20170705.305"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "74e84231ec9565c4420019b913e3f16521dea542"; - sha256 = "1lmvdmcy47swgj1nqhq91w50fh9iz0zwn06ygns1z06s9gcqc6sm"; + rev = "9fa8f37a7be33337ab0e865b1718bbb81eea295a"; + sha256 = "1h6637sa83jckswp81682yis5srhaj02r6ycxzcc1ngfap3mkks7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37302,12 +37281,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20170211.807"; + version = "20170630.22"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "822ae2d29aaf92bcf96324442126b551e4477d6a"; - sha256 = "0nq2f6pgq4vszy3hx84qdml4i9lbqlrh9knqgwgrl819vr15srqg"; + rev = "2c0458038bf0440f271f6e000039027be411eba7"; + sha256 = "0rpw1ms80hr01s76av8cvid4gvkd3sapx0c3g3a05za0bq1jqacw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -37884,12 +37863,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170623.1108"; + version = "20170703.2350"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74"; - sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5"; + rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; + sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37947,12 +37926,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170605.2046"; + version = "20170704.1238"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "117369f882f81fb9cc88459a4072a2789138c136"; - sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f"; + rev = "b0407466a1e6dc23150663757f6b48e14cc5290a"; + sha256 = "0wapfnz7l32qc93xbx64bd42v4b4dav3288ij3pc7r03r4by02m4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -37993,8 +37972,8 @@ src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d"; - sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip"; + rev = "99e282bdd8994cb4e23185d9004b2cb42a214927"; + sha256 = "1vscfy63nzzv68vpiqdpg5y9mip8hcxwbpsr5zbvcm9dz7r0vvkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -38010,12 +37989,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20170609.938"; + version = "20170703.2350"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74"; - sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5"; + rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; + sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38098,8 +38077,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38764,12 +38743,12 @@ jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jemdoc-mode"; - version = "20170611.1536"; + version = "20170704.1327"; src = fetchFromGitHub { owner = "drdv"; repo = "jemdoc-mode"; - rev = "0b09b0368acf3b90c9b58274ff8c2a1e77d1d5e1"; - sha256 = "094smy6n30lwgldg958z387dc0nzjvghlai5xpxc5q2i1gjjqh78"; + rev = "529b4d4681e1198b9892f340fdd6c3f1592a047a"; + sha256 = "1f8nn8mv18q3x3k32i6kjis9f3g1ybdjcfaw8hywqwy6k8dr734m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode"; @@ -39203,12 +39182,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20170525.544"; + version = "20170703.314"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "6ee315825b6f0424f15a8520733dc145c85ccd83"; - sha256 = "14ykvbj5f9w5pk8l73k8niwr62slfx956px35zn51563sjs55gnd"; + rev = "01a8d98958b8c546a6a9eb3b339a1dee864684fa"; + sha256 = "09pap1r9aiif8rmmzpw01154iravsmqw8msbdrxgbqlpndcaqnmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -40274,8 +40253,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "aaca07b200702a6b40e0016556f8d3683fce6bb0"; - sha256 = "1rg3n0bp8f2bz6rcf01656hvv7mn3a7wr3hc1c7j0830a1d7nn2w"; + rev = "ae8f3a2dfccdf4495c137163e5e68b9130fee34e"; + sha256 = "04nik71cd3cnx41rz0nhwkk41nx7r0x63ldf4rihz6q1h43zxpzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41044,12 +41023,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170616.2223"; + version = "20170702.200"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "0e577560f0c01f9e4bbd5280edf113020e65c3f3"; - sha256 = "01ndc6llqfdz8x64k5c1bjvvx47nd2dag4fn48xfsb8vrpnp78i2"; + rev = "9dca096255f7ca92ff887d70b6c4c67ce3374ff1"; + sha256 = "0k63sad7w1gym3l5p0hfnwjhj8a0ic59z6g1zf3j10752439bsx3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -41989,6 +41968,27 @@ license = lib.licenses.free; }; }) {}; + livereload = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }: + melpaBuild { + pname = "livereload"; + version = "20170628.2350"; + src = fetchFromGitHub { + owner = "joaotavora"; + repo = "emacs-livereload"; + rev = "1e501d7e46dbd476c2c7cc9d20b5ac9d41fb1955"; + sha256 = "1z1v2panxrqpam5ysnilx83y6b4dwxmxqhmbgjwfyd1bdmr4iya4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/330731804c442226fa2faaa3da408e9253a1c051/recipes/livereload"; + sha256 = "1z0dbg82l6znz1b03v19a8fnq6b1smikpvaplpxlgny82xrs9als"; + name = "livereload"; + }; + packageRequires = [ emacs websocket ]; + meta = { + homepage = "https://melpa.org/#/livereload"; + license = lib.licenses.free; + }; + }) {}; livescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "livescript-mode"; @@ -42037,8 +42037,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "a143b4a4f33d548f126e7d212e91b7742fe1af18"; - sha256 = "1nl9sq71dsny6hm4bd9bh1nzxx4iqd7a91x2lyyjlfnnf1f4602a"; + rev = "45bbe61cd4d8950d8f91e2c9efd6d36c7e4245e2"; + sha256 = "0dzpdjg7yrbvkmx0nfn3wgs0bi5j38k6js75axxfpgk1jp4l8x8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -42284,12 +42284,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170518.428"; + version = "20170705.1217"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "c85f0527664538ac9d59bbac9bea40c207c8b9d5"; - sha256 = "1gnia7vkhdh116b7hyxnrnkjnqliqsy5zskn43wjhfw6swf0ipxn"; + rev = "134b41557ab539219d9e3a1b3c8939df93676726"; + sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -42494,12 +42494,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170601.1101"; + version = "20170629.33"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "6fe3246e00995ca7ebe3b3c36ea58a69de521193"; - sha256 = "1ib4ld45wfwq5c48w56k8ca5qggjmxgpn2q0vvi556awk47anhqr"; + rev = "3e93b3fd754931cfd122855659afbd070d844bac"; + sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42849,12 +42849,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170625.1144"; + version = "20170705.2113"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53"; - sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n"; + rev = "b8d558678821e35450c19e415656e366ebe44c38"; + sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42877,12 +42877,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170621.1328"; + version = "20170702.832"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "15eca25c59bef89da75f9a741d194698d0e708eb"; - sha256 = "184873b01b9dvwjjx6xsfz4v8rwhwsz9knjw7yjggmql20lxdpqq"; + rev = "85b860cb53d6f0088255013ef849af9a882110f9"; + sha256 = "1jj467kdvklb1sl0dyyb00jnl4xgz56mql1wnr4nmiqbxaqzqa46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -43045,12 +43045,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170625.1144"; + version = "20170701.1313"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53"; - sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n"; + rev = "b8d558678821e35450c19e415656e366ebe44c38"; + sha256 = "1f4c21zi0xjzvpmfjdmnaj2bsafb591qh5swsld1fd40k8scps79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43066,12 +43066,12 @@ magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-rockstar"; - version = "20161013.544"; + version = "20170703.704"; src = fetchFromGitHub { owner = "tarsius"; repo = "magit-rockstar"; - rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b"; - sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2"; + rev = "a65042e3445008b55190f1258ae54bd78e12174b"; + sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; @@ -43532,8 +43532,8 @@ src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "c832bd706293f394c9b2ed9b2da96cde7f4347f3"; - sha256 = "0n4iv1f7qp6n5hs28p30v9gg6qm8p25q1y301g0ljmsr2f55qjcf"; + rev = "4463a734a9377d6c17a0cdba0f1e7ced0db7bbdc"; + sha256 = "1h99cgpw28gg9lqh53pzpp7qh350dbcran90387jrh5plyicsq3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -43704,12 +43704,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170627.900"; + version = "20170702.738"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "ae5eeecf1228d12b48f0d6bb22149ab2aaa9aba8"; - sha256 = "110z98kpfb7bw8r7xn1cr2hjbmm91gcvv6il2pzxmha24qwswxgy"; + rev = "2c8d0e537ea7a2e823b7768b603f7194beebe565"; + sha256 = "1w8vm5inmrzxp790ynpdbh6wavc9jq0f0jafc5a277hsxhbl9i7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44275,12 +44275,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170625.1942"; + version = "20170628.2045"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "77bc1c735b41acb6d43692dc3dcb60f323656cb5"; - sha256 = "0b33bbmj7c62zn882max569wyybb9b04plb47sg55amv3nv8c8fr"; + rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; + sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -45624,12 +45624,12 @@ monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-alt-theme"; - version = "20170529.1607"; + version = "20170630.1348"; src = fetchFromGitHub { owner = "dawidof"; repo = "emacs-monokai-theme"; - rev = "09370802ddf6010a9a83b6c38cfc055e31433a73"; - sha256 = "1dn8z2lj8kvgs0vxiiqm0wz73sgqykkbi32d6f7qa6i4ishyw341"; + rev = "f342b6afc31f929be0626eca2d696ee9fab78011"; + sha256 = "1lgsqrwf21b0rh4x8nmj08a46ld7dkq4jhwxi1fi7a9xhmi2yd4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme"; @@ -45645,12 +45645,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20170314.1612"; + version = "20170705.1152"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36"; - sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r"; + rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062"; + sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -47332,12 +47332,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "20170628.611"; + version = "20170630.245"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "0666c4ca4ccf0c3b712115617a035413ca40df22"; - sha256 = "14kcp5yy306gj9clqlzrabdhq71q3p5wsbwc4gcy1r1kmia1mp4c"; + rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; + sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -47584,11 +47584,11 @@ nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nikola"; - version = "20170301.1148"; + version = "20170703.1321"; src = fetchgit { url = "https://git.daemons.cf/drymer/nikola.el/"; - rev = "6752cc70b08889ff5184ac111616863f1881d357"; - sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h"; + rev = "964715ac30943c9d6976999cad208dc60d09def0"; + sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola"; @@ -47692,8 +47692,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c7346a275c4cdcb59b3961241ddc52b79452d716"; - sha256 = "17vyi7215pwffa1hfsgkmgc1xkxkqqmrmg06rsxdy747mi4vpvr0"; + rev = "a3dc1e65abe29f9d0528d3b5ea45812f4dcd63ed"; + sha256 = "0bliq5wnzp3n0pdf6c2271ngxxgphqimjm6qv8kxl83f1mpfpknc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -47835,12 +47835,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170621.1348"; + version = "20170702.457"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "1f10dbf40266c8e675e2e10f708f87ec61413ab5"; - sha256 = "03dndvbvb3f9ia1sk03zhbi43mq2irxbcxdaazvvyfk021bffbzs"; + rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; + sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -48021,11 +48021,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170625.557"; + version = "20170704.432"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "c9deb329331afbd16f42ef122aba92375ce6dad8"; - sha256 = "1zzbg0i76m6pqmy5mh5bdrfmfa9hzw5z0r6vyxgy344ry6fq9bl7"; + rev = "6a79229737198110c9ae1a3c3e9b86d09b78bd94"; + sha256 = "017cp7z9l97xszlz4v97943zn1k03hmwxx9hphjrl7015hr38zwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48435,22 +48435,22 @@ license = lib.licenses.free; }; }) {}; - ob-async = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-async"; - version = "20170624.1810"; + version = "20170705.2131"; src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "fc0020e515fe156fdda7fbf47f12c4b00029d44b"; - sha256 = "1b2gpzml8hjcadb4sdhhwdj14h9hj1aawq9iic5sqffc8nsakfqc"; + rev = "079dbcbfa229407ae2f53689a4d045f827adabd5"; + sha256 = "0jinxwv72yypns22iv2v4ll1wkg2ca5vbx1v36pgxgmjvawfilvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8"; name = "ob-async"; }; - packageRequires = [ async org ]; + packageRequires = [ async emacs org ]; meta = { homepage = "https://melpa.org/#/ob-async"; license = lib.licenses.free; @@ -49589,15 +49589,15 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: + 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 = "20170620.719"; + version = "20170705.1133"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7070f2a64de65e0446536fb974c940399a4097a3"; - sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a"; + rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35"; + sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49610,6 +49610,7 @@ csharp-mode dash emacs + f flycheck popup s @@ -49955,12 +49956,12 @@ org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-alert"; - version = "20160701.1900"; + version = "20170701.1855"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; - rev = "685c18aa5ce994360c7f9e8bbf49590c412187ac"; - sha256 = "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s"; + rev = "169acc082643b6b793aab17ab7e0de3694e74698"; + sha256 = "0khk1jyy4vxsfalf27f53d1g9w41qq6i6c9xm670pj6xrf38hxj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; @@ -50102,12 +50103,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170625.1444"; + version = "20170706.447"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "318d5a375b9d58e22ec8a80332ac8424916b9d7a"; - sha256 = "15gqw87qlxbbvbcyxqp3h5vi1f0pashd131181mqjq5w3x8jk534"; + rev = "497c18f517074629394c4c30de03d985e0c5ca8c"; + sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50773,12 +50774,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170221.612"; + version = "20170705.217"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "c020fa3f58cdeff51701322334daa6253a144db6"; - sha256 = "0pcymhjaybaxpghixa2gnshzqy03hafmzjdas8q087dn7b19cr8h"; + rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d"; + sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -50860,8 +50861,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "379a22c9c6f785a4b250a5225ebe8dc958bc8f6f"; - sha256 = "1i6in0f56kxp8mn8wfz5rfx2vxf4br47vaswxwb3nyvcqnhx41wz"; + rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a"; + sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -50880,8 +50881,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "379a22c9c6f785a4b250a5225ebe8dc958bc8f6f"; - sha256 = "1i6in0f56kxp8mn8wfz5rfx2vxf4br47vaswxwb3nyvcqnhx41wz"; + rev = "6a64c34863d35fbd53702d56547bec7aa5324b9a"; + sha256 = "00dk29jhr79jlamdlvqrw2mpjm1zx6m9r4kmfscqmv8w7qqp2mya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -51074,11 +51075,11 @@ org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170528.1324"; + version = "20170703.1738"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "c4870192ea24"; - sha256 = "04s39zfa1gwn6zclgdhz3b9fbgyqlbysh6hsn7iqkwfzkpmc2n9c"; + rev = "e8c81e633595"; + sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; @@ -51091,21 +51092,21 @@ license = lib.licenses.free; }; }) {}; - org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: + org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; - version = "20170124.549"; + version = "20170701.919"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "a982506652a2f5f4afeb338238e724d361cbc74d"; - sha256 = "0x9f0vlgawbvga56yj95pdcx1j9r51ax76xsbbyrir0iyawgh258"; + rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2"; + sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm"; name = "org-password-manager"; }; - packageRequires = [ org s ]; + packageRequires = [ dash org s ]; meta = { homepage = "https://melpa.org/#/org-password-manager"; license = lib.licenses.free; @@ -51288,12 +51289,12 @@ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170604.1353"; + version = "20170703.1625"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "9b373ddafe33283ed9a41bddc65f05d6e9bfcda6"; - sha256 = "0k92z02dyzax35wx7q5s9zasmkba9vzb2y7jf55jn8d7qjdw4lnn"; + rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42"; + sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -52542,8 +52543,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "82375dba2d7c5fcc1ddce4579a3b44aaa1afa84e"; - sha256 = "007s3x4111zlinicxarsibkhcykdy71219417rwvdhdj29ick2jg"; + rev = "957fc496311e8c685a5299aeaeb0f1882caaa3af"; + sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -52580,12 +52581,12 @@ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; - version = "20170304.1504"; + version = "20170628.1402"; src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "47c466b660ec184af70589df1c3a26d90241cd1c"; - sha256 = "0jwk7nrdc09mrmwc6myyhlnqq4fap15s8spbzl78zsw3kf89n4vs"; + rev = "99f93011b069e02b37c9660b8fcb45dab086a07f"; + sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -52766,22 +52767,22 @@ license = lib.licenses.free; }; }) {}; - ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: + ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20161125.35"; + version = "20170706.431"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "d9cf410096fb27be8eb13b2207697f8530f62abf"; - sha256 = "0c8nfvh9vn850i3minfqvri2py48ycgz3sf5p1l0a3k98s4x4jl3"; + rev = "1dd4370f52b6db999f3b5edbb146c26034024ef4"; + sha256 = "0cm1a83jblrp76z5a9hmicsq2b3i5xwpyy1d08ahk0hffq0mbimq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc"; name = "ox-pandoc"; }; - packageRequires = [ dash emacs ht org ]; + packageRequires = [ cl-lib dash emacs ht org ]; meta = { homepage = "https://melpa.org/#/ox-pandoc"; license = lib.licenses.free; @@ -53084,12 +53085,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170624.1712"; + version = "20170702.227"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "08affd2ae70f245f2697cdbf5c7a5f72fb325ce0"; - sha256 = "1rfi1qgwn7ngg3s6hpkqgaz2iygq0iv6y6vjzvbbmk1i9s8f51qz"; + rev = "416d1cba6664b0783722129d24f4a748bd71e057"; + sha256 = "1718raqkpzscrnih519dp7a7jnaymjgcaqppfgskbsw59r46p7sj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -55664,8 +55665,8 @@ src = fetchFromGitHub { owner = "brocode"; repo = "play-routes-mode"; - rev = "ec861ab171fc5513df082d26b96a2e9d545ad64c"; - sha256 = "1yn3270d0djsi7jwxw0arrylsyxkwbwawyw2ifpn6iwzcz55cnxh"; + rev = "22d7b87e0eaf0330f2b2283872f8dc08a3258771"; + sha256 = "0j61adh2lsh2zgz1v9i2jzh56ngnrpvsblipvc472k5dxa5qdxin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode"; @@ -56635,12 +56636,12 @@ prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettier-js"; - version = "20170613.2323"; + version = "20170703.519"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "4bfc8b3f8e459235dca24796f18a3587d59f4aef"; - sha256 = "1nzb0gf6hac35nnz6scqkfcwgp8ahwzv8qql9g1gkd5vhiag21ac"; + rev = "22a333402aa9bbe00e2943f6aa6e25c402345241"; + sha256 = "0dsm4iz8d2qj72a7jpznjy4skiznsh5lpai95p612dlanafgfpyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -57177,12 +57178,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20170626.653"; + version = "20170704.2358"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "28df7d105cbfde2d9fbf322325a15edd85ced77a"; - sha256 = "0v2x7psx7zgwpmxvqx7yq38vhsikrlnzlr798y8p1aqx6k4y9xfd"; + rev = "c917c6e188de27331815f39511ed45a408de22d0"; + sha256 = "11f52g8r5zb34nigm68gm8hwgkw184psknd7zqya0l1ipwkhhrif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -57475,8 +57476,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "12acbc2678073c3439b427be0b713b97e2074bfb"; - sha256 = "1rb2055zrv956z0sl1q2g88xnn82yns9vacjrg9ab2466amdcmjw"; + rev = "6bd51a59df41b99058ec8c2b03a177a218267ce5"; + sha256 = "1bgi9954xb70wjymxyzihjfqy29ps28x9h1brnd2krza15rwgrwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -59495,12 +59496,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170603.1430"; + version = "20170630.1507"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "3d0fcb80eb017ee2277440d688bf366af3bcdf6f"; - sha256 = "1i71z36hk46w50c9p4b078rqlh4bvwb3dcylhfcwnp4b8j02f31p"; + rev = "b3719faa0207688db5db543e5420648c11928d4f"; + sha256 = "0hn9qcc6c5lgna57yjlwkfl5yahwwgvjnhgp1r0idzamfc631g5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -59837,8 +59838,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "e136fe3e11d6cb46166c49999d57f6f50bac9d3d"; - sha256 = "1adwv5p8rk1b146vg76lpnfrkj19mdzn5l5ghsls197n2j9q00x4"; + rev = "7758d2a42a1a98199a9ed6af95bf70fe70f0c168"; + sha256 = "0q08yfrv6mfkhh5rm0wq6c8p6sb60rib5z42k98y9d92gsn96lzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60417,12 +60418,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "20170624.1658"; + version = "20170704.2212"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "274a96e9754b606d85c9dd62cfed628ff4f736df"; - sha256 = "0ax18sflqh9wg938gaz9m5r1i45761qym7r1lyqqxp24jzp4wa6j"; + rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; + sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -60459,12 +60460,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20170627.153"; + version = "20170703.33"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "8292fe68c73561413cebff88008509180768718d"; - sha256 = "16c2g8s64lxav5r5v8cqv5ihlskvz22kld5d1vzf3vzr2c9c4dwx"; + rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247"; + sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -60484,8 +60485,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "8292fe68c73561413cebff88008509180768718d"; - sha256 = "16c2g8s64lxav5r5v8cqv5ihlskvz22kld5d1vzf3vzr2c9c4dwx"; + rev = "d8bb3fbfea7e59587bf746c45c655fdf94af3247"; + sha256 = "0zlxrvghccpzfc38pjk6sicmqlnc2h755f902y13110l7gr7ahhs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -61085,12 +61086,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170527.450"; + version = "20170705.144"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17"; - sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805"; + rev = "2f975aece29d011a7a1efdea931d1bc2c1ae4769"; + sha256 = "1jpzf4k2xnyfc6hvgsggi6rv9m2xl5bfdqbza6hbdpiyk8dj7630"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -61151,7 +61152,7 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59201"; + rev = "59273"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -61232,7 +61233,7 @@ version = "20150424.752"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59201"; + rev = "59273"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -61669,12 +61670,12 @@ salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; - version = "20170626.444"; + version = "20170702.246"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "3a570369c9ed4e04a9bffa7e79ced0c8bd7f99b1"; - sha256 = "1d4fk1387xjch3a8xrij8knvrs18c7iq7m9jclzy2v6bp9ml2lnb"; + rev = "ea4980b9c9e8e7570086a2558fe7f66c62a528ad"; + sha256 = "0ygi9kzkfqzizygaqwqpymn8s7kr8ci38v61qmy4n58n9c19fdwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; @@ -61858,11 +61859,11 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20170530.355"; + version = "20170629.2356"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "736da7f466aad2b64c846ece258082c6aac647ae"; + rev = "03834eb7fa0922efaa31d2157d9effa2b7e04810"; sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw"; }; recipeFile = fetchurl { @@ -62442,10 +62443,10 @@ }) {}; second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "second-sel"; - version = "20170307.946"; + version = "20170702.729"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=28"; - sha256 = "1sgwza2ka3iqsajnppq2vd150h1wbkzzi04rk7bzpqj32dyh7gbx"; + url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29"; + sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg"; name = "second-sel.el"; }; recipeFile = fetchurl { @@ -63527,12 +63528,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170624.1454"; + version = "20170703.926"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "23d6d213a90e031dec8dbbaaeac5ddbe2cf050de"; - sha256 = "0y96l6m7lnw2wsi5zbla88xgxmw3zksblnk36bgr153bik14waxf"; + rev = "3adbfe7c03d509538a6e43bafda27ea290298a14"; + sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -64051,12 +64052,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170612.900"; + version = "20170701.436"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "94f1a311de0c79c8245784543b05359714550d72"; - sha256 = "1ypsl1vin5h90sr4cc127f8gm23h4pkag6zwfwx53h2yrsj7vvrh"; + rev = "35b0ae538b2023c91b035b3f9c133b28f0afbaf8"; + sha256 = "12ks2d91bvsxkwwjjgs9ymcwf3w90x7r0krvb6nsgh970s35yv78"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -64114,12 +64115,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170622.1604"; + version = "20170705.643"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "74c1a83711a0c2b96e9387f3fa03f387a6713193"; - sha256 = "05rs4da1dgwvcwvbq70angwqh3zjhsxnjvp5rpfvk5lzw9p8ng9r"; + rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6"; + sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -64303,12 +64304,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "20170612.725"; + version = "20170629.235"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "7488623cbe406eaafccc36d293e8c42bbd308085"; - sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n"; + rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; + sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -64825,12 +64826,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170624.504"; + version = "20170705.1319"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "0f32a87ae7a70c4a39debe4aa4585029f35ea30a"; - sha256 = "0gdskz49lqm20prhanqcldfz6sbiqpdfpn6xl5p3yqskdz4b4pdp"; + rev = "34ca8a68b201879e88c3814a2dfe3a1b9609bac3"; + sha256 = "0ybij6m0h27q3q1pv1cny5bpg35q0m0yx071db40qd8pdvxn0b90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -65185,8 +65186,8 @@ src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab"; - sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf"; + rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20"; + sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -65734,12 +65735,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20170621.45"; + version = "20170630.2327"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "b1c41ddd290153fcc1df8f1d0fb54062e9943894"; - sha256 = "1ga6h2jbnkjkf5f1hqg5jy5fw0cwlgzpn2f1mcrj04302i2vliv4"; + rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33"; + sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -65755,12 +65756,12 @@ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: melpaBuild { pname = "spaceline-all-the-icons"; - version = "20170605.838"; + version = "20170703.237"; src = fetchFromGitHub { owner = "domtronn"; repo = "spaceline-all-the-icons.el"; - rev = "bc611779a7a3c10b7367bc8c985923d26ee91443"; - sha256 = "1slnzb26fkmj01hakzbaarlmf2ng4d1zkimgb93axx0svxh03qc7"; + rev = "655ad80f6d63aa6bb2fcc8f73e5a2c65f807b02d"; + sha256 = "0b4l3afajkcgahzara666fhkxm6wbgim65r4yy73psadhwpfhp3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; @@ -65776,12 +65777,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170621.718"; + version = "20170705.1052"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "be01cae704dc73e6a4b53766e655fb0dfba1bbc1"; - sha256 = "0c8mx9ivalgvazhn51lbmskayhdhwnmvq5jp5wi7925p05i0kb3z"; + rev = "6f41a3321296c35c1b77660cf3956f07b3b68086"; + sha256 = "0n8gchqrm8nm687wpqm599622yhvylkf1vslw0akgq3r4vsyfini"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -67336,12 +67337,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170525.1254"; + version = "20170703.1433"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "13611ca0e4dfb8e6e4a314142368bfa7f0de5b9b"; - sha256 = "0svlf2kgdbhwaygydvwvhinafiwv3qrgyn5wkfpcnz1km30g92hf"; + rev = "59e140248a667127771aa7aa49ee0511c55e8817"; + sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -67714,8 +67715,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74"; - sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5"; + rev = "d4ff6c5a29e33878e58d26b76ba5a2325f452896"; + sha256 = "1xhkq015l8lxhcckpkx619wgi5xlr2s5gwa1d683ys4am15zr8xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67773,12 +67774,12 @@ switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20170522.2042"; + version = "20170701.246"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b"; - sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f"; + rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; + sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; @@ -68487,8 +68488,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "c823729104873d0d1eeff4256eb15ee4c1dbfa36"; - sha256 = "1zkjyj3jm2q23yfjvrvikrm6c6lvcysnnhivfvvrh0qr7qlqvwfz"; + rev = "477a87418980cfba695b2507a268d632f4e7a220"; + sha256 = "1xgi33wi69v3lx62q8lk04njcjz8ny2lnjn7ll332bcgx7sbh292"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -69446,8 +69447,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07"; - sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8"; + rev = "49e5103920e75a149d02c7d487496c8c79154a6c"; + sha256 = "1ywqyz27k1h87rz3vwyzchsajl52smp0ypwdmwggj2yn1mrcc9p6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -69805,12 +69806,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20170621.2059"; + version = "20170702.1859"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "2d80571cbffc5c02aad771da4b00502d86242926"; - sha256 = "14gc1ihiyk7j4vf33r2kq3sbj37gw9s17p3gykj2sfviq295s006"; + rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1"; + sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -70478,12 +70479,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170625.1509"; + version = "20170705.1153"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; - sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; + sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -70503,8 +70504,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; - sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; + rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; + sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71310,11 +71311,11 @@ undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "undo-tree"; - version = "20161012.701"; + version = "20170706.246"; src = fetchgit { url = "http://www.dr-qubit.org/git/undo-tree.git"; - rev = "4cba00bb049cfaa2ee6821a9e347209a88a740b5"; - sha256 = "0qawh5cr0ahdg1rks96g9fbva2nfkz8mbl82jnps6axqdf57gm38"; + rev = "e9a9102f515acd7523158f20e83f300600374989"; + sha256 = "07y1pn0dzwh1avkd3dm96lcjisvnr7p02wbhxf1m3dgaxf059mcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree"; @@ -71780,12 +71781,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170616.1454"; + version = "20170702.1322"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400"; - sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf"; + rev = "fd462e8aeaf858fec0bc63a41bd10ff8d445490c"; + sha256 = "0qk57jap3vs5rvj8hgajzk74v8mj73l975g8zgylcx2kniy3dvwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -72347,12 +72348,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20170508.735"; + version = "20170701.1603"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "282274b319f2c3598ac6bbdd27a8b7ca40b0bb0e"; - sha256 = "0va5aqij3gan3j37jjhx8a8bv0zdpid5x18jfynzizlyk68fc196"; + rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; + sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -73055,12 +73056,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170325.357"; + version = "20170627.2306"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "0a324086eb9cf2d357d3c8a431e80cd45fce016a"; - sha256 = "0hcyy44xxg6f7c10db6xf8944wiaijxln3kgrl49kc0m3icilxyy"; + rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9"; + sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -73855,8 +73856,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "74daf284e32bf84d29377d1d7a638b640ebf8f76"; - sha256 = "0rx05is17g255gymyp6lvsskg5i6c4s28q89kbspdyfwx3rr42qa"; + rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615"; + sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -74266,12 +74267,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170517.1242"; + version = "20170706.349"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395"; - sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m"; + rev = "e300dab6c4be06ae42bc2f1919ed37e8624c3605"; + sha256 = "07lz63yzjxj1y2524b7cd829srl3dvng7g67kf1377njgyrrgq0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -74854,12 +74855,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170627.1123"; + version = "20170706.348"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "dba445db28d3c1d0e2d0a9924ab96061850bb00c"; - sha256 = "03wcifmmianrh0qp7p2pvhbpnzh0yjh5ys7x7qv3ywr62bnv4akh"; + rev = "ea43010b362f6b5dd214f2f81daf4c12f6433f40"; + sha256 = "0cwk3m1179ldb1qk6jx0g156vsqv14h3bqgfyb4yc5bg980ikm61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -74938,12 +74939,12 @@ xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-reformat-code"; - version = "20170111.812"; + version = "20170706.339"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-reformat-code"; - rev = "7e5bbd09be8035a482a76417d900cb5d3a70e1cd"; - sha256 = "04xwf9jxk4805bl7xj05kjfgl7m71zp94qdvw4g37s6q8v25j73d"; + rev = "655cc8820118737db7b758ab72ad107d7fff091a"; + sha256 = "12zrgp76nq18anp7vc7pj0w9a688i7xylplqh55jv9q24xgmpyhs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code"; @@ -75509,8 +75510,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "ebb1349c55dadd9aa1a87a80f3392023a1fbad43"; - sha256 = "0zijnhjjdppwmy69bdh1wvqfmkvijqpazvk71b3b3ns6w8cln582"; + rev = "40fc1d12a4f69cacf8b6b07d3372dee2969cb2e5"; + sha256 = "0ahkrgl1isd9bppclk8i72fkm9c0hmhf9i5zc1n9k96c4x9h831i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76535,11 +76536,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170620.2134"; + version = "20170703.2041"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "d5aa3fb7d4cd"; - sha256 = "0154cij71gczwpc0rxpa669dx6ds6b383y9f3fi1hh6i6w5dw1dm"; + rev = "d8f7969db645"; + sha256 = "03xyal7r0gc6r4vx23sx44vcm4fk68dkxyd1x0jw47im4xfmfvzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 1ed81a16f4a..6e1cc04a2f6 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -884,12 +884,12 @@ add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "9b1bdb91c59ea9c2cc0aba48262c49069273d856"; - sha256 = "1jzgyfcr6m64q79qibnbqa41sbpivslwk2hygbk9yp46l5vgj1hc"; + rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; + sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1052,12 +1052,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74"; - sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4"; + rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; + sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -6141,15 +6141,16 @@ homepage = "https://melpa.org/#/darcula-theme"; license = lib.licenses.free; }; + }) {}; darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "dde50661210d8610cd03526a6c9a922bb0e494a6"; - sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6"; + rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555"; + sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -6162,7 +6163,6 @@ license = lib.licenses.free; }; }) {}; - }) {}; dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; @@ -6334,12 +6334,12 @@ decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; - version = "0.5"; + version = "0.7"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; - rev = "ce0cd15e8e42d458d86cbf4c1effd03cefec33bd"; - sha256 = "0wm24ndiyhrayg1gz456s0s1ddlpcvg4vp555g4zzl3zcpsy94bg"; + rev = "90133687118c236142b8110571c463304b3192f9"; + sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; @@ -8310,12 +8310,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b"; - sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r"; + rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c"; + sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -9634,12 +9634,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0"; + version = "20.0.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "040bdce67f88d833bfb59adae130a4ffb4c180f0"; - sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0"; + rev = "a01de6873844ba510084090abec734c4166d71fa"; + sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -11015,22 +11015,22 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "1.5"; + version = "1.6.4"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "1ab5ce73fd9aca5267416b998084e1a8e96122a7"; - sha256 = "1ncnsqlnqikm1fv9ahv6jrmdp02czhcbmln346llwzwrpw31ly78"; + rev = "6e6c4c3ce5f65c71ba08565edbec2dfb0cf64e0c"; + sha256 = "1r6d6sb9ylfqidcbrr7f75m68s1cpm220pnb4hl0qv5n6hr8h5gi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; name = "exwm-x"; }; - packageRequires = [ cl-lib exwm swiper switch-window ]; + packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -15408,12 +15408,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "35c1506bec0cb43629d30cae8be6cd7f793fff8b"; - sha256 = "1dlh4ppnbliv2ipfysdrnpix5kg6nwjc0468whi3w758nwpkamzc"; + rev = "6d4ccb3f7376d6326b58b25f3c94ab546418a030"; + sha256 = "13n8k5ak3y1x6i27x47sji49kdbqhnc3ywqkn4xwmxcnrs28kr25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -21270,12 +21270,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c"; - sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b"; + rev = "134b41557ab539219d9e3a1b3c8939df93676726"; + sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -22250,12 +22250,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "77bc1c735b41acb6d43692dc3dcb60f323656cb5"; - sha256 = "0b33bbmj7c62zn882max569wyybb9b04plb47sg55amv3nv8c8fr"; + rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; + sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -23614,12 +23614,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "d0f8f003840081b57d4f372d9ff41c057422b1a1"; - sha256 = "135b7h5vx0w7p6k2f5d8lcqxd5w199089wcar3kk0frb9vrk3xss"; + rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; + sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -23782,12 +23782,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.7"; + version = "0.5.9"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e041942cb0f4f02d00cf30afb956208496562ba4"; - sha256 = "00d6fz5kg2k6py5mj2h9rzbqa4gkiv02h9ba55psfgbnmak6ip0v"; + rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; + sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -24510,15 +24510,15 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: + 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 = "4.0"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7070f2a64de65e0446536fb974c940399a4097a3"; - sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a"; + rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35"; + sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -24531,6 +24531,7 @@ csharp-mode dash emacs + f flycheck popup s @@ -25027,12 +25028,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "24313870fa682a53e7f3f916b0e853a731868886"; - sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh"; + rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d"; + sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -29502,12 +29503,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "274a96e9754b606d85c9dd62cfed628ff4f736df"; - sha256 = "0ax18sflqh9wg938gaz9m5r1i45761qym7r1lyqqxp24jzp4wa6j"; + rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; + sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -30991,12 +30992,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "23d6d213a90e031dec8dbbaaeac5ddbe2cf050de"; - sha256 = "0y96l6m7lnw2wsi5zbla88xgxmw3zksblnk36bgr153bik14waxf"; + rev = "3adbfe7c03d509538a6e43bafda27ea290298a14"; + sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -31030,6 +31031,27 @@ license = lib.licenses.free; }; }) {}; + silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "silkworm-theme"; + version = "0.1"; + src = fetchFromGitHub { + owner = "mswift42"; + repo = "silkworm-theme"; + rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b"; + sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme"; + sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13"; + name = "silkworm-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/silkworm-theme"; + license = lib.licenses.free; + }; + }) {}; simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-bookmarks"; @@ -31369,12 +31391,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "7488623cbe406eaafccc36d293e8c42bbd308085"; - sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n"; + rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; + sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -32626,12 +32648,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "588ec8b9476c8d7f5f16018a7aaf90ee828fb4f5"; - sha256 = "1ckvsckqlbdcw6nbsrh9xizbpkr7r88ks39av8dhn5n412c5jm4g"; + rev = "26e8b0615def4f0531682b8a849f55d330616ac1"; + sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -32878,12 +32900,12 @@ switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b"; - sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f"; + rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; + sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; @@ -34772,12 +34794,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "af4ff24ae4489e0a3bfbbddf6bc934f66b0af527"; - sha256 = "1z88wy7m6rj028dqxzyyyf67gw4jqd72dgsvlr8inwimds2iplbv"; + rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; + sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 7e8715f32a9..82bd5ea0c52 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 = "20170622"; + version = "20170703"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170622.tar"; - sha256 = "0z4ypv6q4nx4icir69xchzn58xzndnxlkg0v4pb62gqghdxng6vy"; + url = "http://orgmode.org/elpa/org-20170703.tar"; + sha256 = "0l590ygknlbz3r0w9zzljwqn8vasz5w82wsivi9bi60lf0d0hx58"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170622"; + version = "20170703"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170622.tar"; - sha256 = "0ix4gmr6y9nrna9sc9cy30533mxlnvlfnf25492ky6dkssbxb10s"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170703.tar"; + sha256 = "0l7hsz6rbq1zw6wdlm3ryxb60md44rvx0waii98hww89zpdi0gmw"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 81f9ddd96d2..b05bbd053c1 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/leo-editor mv * $out/share/leo-editor - makeWrapper ${python3Packages.python}/bin/python3.5m $out/bin/leo \ + makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \ --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \ --add-flags "-O $out/share/leo-editor/launchLeo.py" ''; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index b7949b4d4f9..5de8e7892ab 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.18.2"; + version = "2.19"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil"; + sha256 = "1sfhr6628xpj9p6bqihdq35y139x2gmrpydjlrwsl1rs77c2bgnf"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 2023d9486bd..7e375367a2d 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.8.3"; + version = "2.9"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "0fhmqa1q1y5y0ivrgx9xv864zqvd5dk4fiqi4bgi1ybdfx7vv2fy"; + sha256 = "1xncf6aq52zpxpmz3ikmlkinz7y3nmbpgfxjb7q40sqs00n0mfsd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 72ba96ad701..ea3ca107d24 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,8 +1,7 @@ -{ stdenv, pythonPackages, fetchFromGitHub, -}: +{ stdenv, pythonPackages, fetchFromGitHub }: with pythonPackages; buildPythonApplication rec { - version = "3.0"; + version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck name = "buku-${version}"; src = fetchFromGitHub { @@ -12,6 +11,13 @@ with pythonPackages; buildPythonApplication rec { sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax"; }; + nativeBuildInputs = [ + pytestcov + pytest-catchlog + hypothesis + pytest + ]; + propagatedBuildInputs = [ cryptography beautifulsoup4 @@ -19,13 +25,28 @@ with pythonPackages; buildPythonApplication rec { urllib3 ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + preCheck = '' + # Fixes two tests for wrong encoding + export PYTHONIOENCODING=utf-8 + + ### Remove this for 3.1 ### + # See https://github.com/jarun/Buku/pull/167 (merged) + substituteInPlace setup.py \ + --replace "hypothesis==3.7.0" "hypothesis>=3.7.0" + + # Disables a test which requires internet + substituteInPlace tests/test_bukuDb.py \ + --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" + ''; installPhase = '' make install PREFIX=$out - ''; - doCheck = false; + mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d + cp auto-completion/zsh/* $out/share/zsh/site-functions + cp auto-completion/bash/* $out/share/bash-completion/completions + cp auto-completion/fish/* $out/share/fish/vendor_completions.d + ''; meta = with stdenv.lib; { description = "Private cmdline bookmark manager"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f4cbc142d6b..37cb027aa36 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.1.1"; + version = "3.3.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1lh1gz0915r49igfhy1icz79qx36s3d8m32qlih0g3zn7jahp86g"; + sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c"; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Remove unneeded files and libs rm -rf resources/calibre-portable.* \ - src/{chardet,cherrypy,html5lib,odf,routes} + src/{chardet,cherrypy,odf,routes} ''; dontUseQmakeConfigure = true; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { python pyqt5 sip regex msgpack # the following are distributed with calibre, but we use upstream instead - chardet cherrypy html5lib_0_9999999 odfpy routes + chardet cherrypy odfpy routes ]); installPhase = '' diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 595c58db992..142c558a95d 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.24.1"; + version = "0.25"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0zphxi11rny6wh1ysz7508fdrsbxj3n138q2bkkqaz0rrdab710a"; + sha256 = "01p063nsyhavf13cva3sdqdcc7s42gi7iry4v857f1c2i402f0zk"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 4a3f4ff15cb..ff832d4961f 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -359,6 +359,15 @@ sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz"; }; } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d"; + sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r"; + }; + } { goPackagePath = "golang.org/x/net"; fetch = { diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 7f5dad62d26..bcf351ff46a 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - kconfig, kinit, kparts + karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem }: let @@ -23,5 +23,5 @@ in mkDerivation rec { }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ kconfig kinit kparts ]; + propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ]; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 671370252a7..e8ab85121da 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -5,14 +5,14 @@ , preferQWebView ? false }: mkDerivation rec { - version = "0.5.7"; + version = "0.5.8"; name = "qsyncthingtray-${version}"; src = fetchFromGitHub { owner = "sieren"; repo = "QSyncthingTray"; rev = "${version}"; - sha256 = "0crrdpdmlc4ahkvp5znzc4zhfwsdih655q1kfjf0g231mmynxhvq"; + sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w"; }; buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index cffdfa7a97d..1dd5c9191f0 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,6 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , esteidfirefoxplugin , vlc_npapi +, libudev }: ## configurability of the wrapper itself @@ -46,7 +47,7 @@ let ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 614473d39ee..5ec4340dba7 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook -, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking +, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav , qtwebkit-plugins @@ -26,12 +26,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.10.1"; + version = "0.11.0"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "57f4915f0f2b1509f3aa1cb9c47117fdaad35b4c895e9223c4eb0a6e8af51917"; + sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv"; }; # Needs tox @@ -48,7 +48,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 cssutils + pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl ]; postPatch = '' diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 19b6c030f2e..dc7d2b8b2ea 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,11 +4,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "0vjkcilxzwvkgcczcbq58nl2j17ddqiysxm5yl13agnmxzvxw6r2" - else "1ga9gxzji48vhbaa0pkxd03h89zgjsbikbki9xla1qbvyvqjnw5g"; - + then "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd" + else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj"; pname = "helm"; - version = "2.4.1"; + version = "2.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index aaade82e31d..e036fb2f38b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.6.0"; + version = "1.6.2"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1z890kjgsdnghg71v4sp7lljvw14dhzr23m2qjmk6wndyssscykr"; + sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 7b67ad235e3..86a93309b1f 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -3,14 +3,14 @@ , glib_networking }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.5.1"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "0nll3ns1riylxg33w6myz5x8h6ai39k5fw2bkf96g5rgmi6zsjma"; + sha256 = "1qajb4xms3vsfm5sg91z9ka0nrzgfi0fjgjxqm7snhkfgxlkph7w"; }; preConfigure = '' diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 416995f120c..629e748fcac 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,14 +1,20 @@ -{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: +{ stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: stdenv.mkDerivation (rec { - name = "mldonkey-3.1.5"; + name = "mldonkey-3.1.6"; src = fetchurl { - url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl"; + url = https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2; + sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; }; - buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ]; + preConfigure = stdenv.lib.optionalString (ocamlPackages.camlp4 != null) '' + substituteInPlace Makefile --replace '+camlp4' \ + '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' + ''; + + buildInputs = [ zlib ncurses bzip2 file gd libpng libjpeg ] ++ + (with ocamlPackages; [ ocaml camlp4 ]); configureFlags = [ "--disable-gui" ]; meta = { @@ -17,7 +23,7 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; -} // (if !ocaml.nativeCompilers then +} // (if !ocamlPackages.ocaml.nativeCompilers then { # Byte code compilation (the ocaml opt compiler is not supported in some platforms) buildPhase = "make mlnet.byte"; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index fa890c03b6f..9c8ecd01639 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -1,42 +1,42 @@ -{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4, +{ stdenv, fetchurl, ocamlPackages, buildBytecode ? true, buildNative ? true, installExamples ? true, installEmacsMode ? true }: -let inherit (stdenv.lib) getVersion versionAtLeast +let inherit (stdenv.lib) versionAtLeast optionals optionalString; in -assert versionAtLeast (getVersion ocaml) "3.07"; -assert versionAtLeast (getVersion dypgen) "20080925"; -assert versionAtLeast (getVersion bolt) "1.4"; +let inherit (ocamlPackages) ocaml camlp4; in assert buildBytecode || buildNative; stdenv.mkDerivation { - name = "acgtk-1.1"; + name = "acgtk-1.3.1"; src = fetchurl { - url = "http://www.loria.fr/equipes/calligramme/acg/software/acg-1.1-20140905.tar.gz"; - sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6"; + url = http://calligramme.loria.fr/acg/software/acg-1.3.1-20170303.tar.gz; + sha256 = "1hhrf6bx2x2wbv5ldn4fnxhpr9lyrj3zh1vcnx8wf8f06ih4rzfq"; }; - buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ]; + buildInputs = with ocamlPackages; [ + ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson + ]; patches = [ ./install-emacs-to-site-lisp.patch ./use-nix-ocaml-byteflags.patch ]; postPatch = stdenv.lib.optionalString (camlp4 != null) '' substituteInPlace src/Makefile.master.in \ - --replace "+camlp4" "${camlp4}/lib/ocaml/${getVersion ocaml}/site-lib/camlp4/" + --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/" ''; # The bytecode executable is dependent on the dynamic library provided by # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to # -rpath) to make sure that ocamlrun is able to link the library at # runtime and that Nix detects a runtime dependency. - NIX_OCAML_BYTEFLAGS = "-dllpath ${ansiterminal}/lib/ocaml/${getVersion ocaml}/site-lib/ANSITerminal"; + NIX_OCAML_BYTEFLAGS = "-dllpath ${ocamlPackages.ansiterminal}/lib/ocaml/${ocaml.version}/site-lib/ANSITerminal"; buildFlags = optionalString buildBytecode "byte" + " " diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch deleted file mode 100644 index 5c1ec4f7aaf..00000000000 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- a/Makefile (révision 199) -+++ b/Makefile (copie de travail) -@@ -59,7 +59,7 @@ - then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ - else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ - then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ -- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \ -+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \ - then cp pa_j_3.1x_6.11.ml pa_j.ml; \ - else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ - fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index fbd732595e6..8d7c11ee91b 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, ocaml, camlp5 }: +{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }: let start_script = '' @@ -9,18 +9,24 @@ let in stdenv.mkDerivation { - name = "hol_light-2016-07-23"; + name = "hol_light-2017-07-06"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "67cff936dda719f0e0ee57ab9d07c779ff664660"; - sha256 = "0r85ifdvsvk2cdv7s4a0kf9ha6jdznqmz7swvp577f8r182klr28"; + rev = "0ad8cbdb4de08a38dac600f352555e8454499faa"; + sha256 = "0px9hl1b0mkyqv84j0si1zdq4066ffdrhzp27p2iah9l8ynbvpaq"; }; buildInputs = [ ocaml camlp5 ]; - patches = [ ./Makefile.patch ]; + patches = [ (fetchpatch { + url = https://github.com/girving/hol-light/commit/f80524bad61fd6f6facaa42153b2e29d1eab4658.patch; + sha256 = "1563wp597vakhmsgg8940dpirzzfvvxqp75x3dnx20rvmi2n2xw0"; + }) + ]; + + postPatch = "cp pa_j_3.1x_{6,7}.xx.ml"; installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix new file mode 100644 index 00000000000..2fdbd87a275 --- /dev/null +++ b/pkgs/applications/science/logic/poly/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, gmp, cmake, python}: + +let version = "0.1.3"; +in + +stdenv.mkDerivation { + name = "libpoly-${version}"; + + src = fetchurl { + url = "https://github.com/SRI-CSL/libpoly/archive/v${version}.tar.gz"; + sha256 = "0nd90585imnznyp04vg6a5ixxkd3bavhv1437397aj2k3dfc0y2k"; + }; + + buildInputs = [ cmake gmp python ]; + + meta = with stdenv.lib; { + homepage = https://github.com/SRI-CSL/libpoly; + description = "C library for manipulating polynomials"; + license = licenses.lgpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index cf5114b4a41..0ec7f93d26f 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, gmp-static, gperf, autoreconfHook }: +{ stdenv, fetchurl, gmp-static, gperf, autoreconfHook, libpoly }: stdenv.mkDerivation rec { name = "yices-${version}"; version = "2.5.1"; src = fetchurl { - url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-${version}-src.tar.gz&accept=I+Agree"; - name = "yices-${version}-src.tar.gz"; + 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"; }; @@ -14,13 +14,19 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" "--with-static-gmp-include-dir=${gmp-static.dev}/include" + "--enable-mcsat" ]; - buildInputs = [ gmp-static gperf autoreconfHook ]; + buildInputs = [ gmp-static gperf autoreconfHook libpoly ]; enableParallelBuilding = true; doCheck = true; - installPhase = ''make install LDCONFIG=true''; + # Includes a fix for the embedded soname being libyices.so.2.5, but + # 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) + ''; meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 69c763acd83..cefdc1108bf 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -2,15 +2,15 @@ , tcllib, withJson ? true}: stdenv.mkDerivation rec { - name = "fossil-1.36"; + name = "fossil-2.2"; src = fetchurl { urls = [ - https://fossil-scm.org/index.html/uv/download/fossil-src-1.36.tar.gz + https://www.fossil-scm.org/index.html/uv/fossil-src-2.2.tar.gz ]; name = "${name}.tar.gz"; - sha256 = "04px1mnq5dlc6gaihxj5nj6k7ac43wfryzifaairjh74qmgc6xi6"; + sha256 = "0wfgacfg29dkl0c3l1rp5ji0kraa64gcbg5lh8p4m7mqdqcq53wv"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index b7e4fe6b7c6..ea5af4ab118 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.6.0"; + name = "smplayer-17.7.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0kgrkn50sgr79jfj66p59wka17prnxibf7fbfpg5m0n95kdkr7rg"; + sha256 = "1g35h8xqs2bdwjdibzgs1ab2z2lmwgj8h53a7vqydv3j3crxx9wk"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index a4eb850f939..df7ba69c5c5 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,85 +1,72 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb_run, symlinkJoin, configFile ? null }: +, xorgserver, xvfb_run }: -let +stdenv.mkDerivation rec { + name = "i3-${version}"; version = "4.13"; - i3 = stdenv.mkDerivation rec { - name = "i3-${version}"; - - src = fetchurl { - url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; - }; - - nativeBuildInputs = [ which pkgconfig makeWrapper ]; - - buildInputs = [ - libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon - libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango - perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun - perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC - xorgserver xvfb_run - ]; - - configureFlags = [ "--disable-builddir" ]; - - enableParallelBuilding = true; - - postPatch = '' - patchShebangs . - ''; - - # Tests have been failing (at least for some people in some cases) - # and have been disabled until someone wants to fix them. Some - # initial digging uncovers that the tests call out to `git`, which - # they shouldn't, and then even once that's fixed have some - # perl-related errors later on. For more, see - # https://github.com/NixOS/nixpkgs/issues/7957 - doCheck = false; # stdenv.system == "x86_64-linux"; - - checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - '' - (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) - ! grep -q '^not ok' testcases/latest/complete-run.log - ''; - - postInstall = '' - wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" - for program in $out/bin/i3-sensible-*; do - sed -i 's/which/command -v/' $program - done - ''; - - separateDebugInfo = true; - - meta = with stdenv.lib; { - description = "A tiling window manager"; - homepage = "http://i3wm.org"; - maintainers = with maintainers; [ garbas modulistic fpletz ]; - license = licenses.bsd3; - platforms = platforms.all; - - longDescription = '' - A tiling window manager primarily targeted at advanced users and - developers. Based on a tree as data structure, supports tiling, - stacking, and tabbing layouts, handled dynamically, as well as - floating windows. Configured via plain text file. Multi-monitor. - UTF-8 clean. - ''; - }; - + src = fetchurl { + url = "http://i3wm.org/downloads/${name}.tar.bz2"; + sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; }; -in if configFile == null then i3 else symlinkJoin { - name = "i3-with-config-${version}"; - paths = [ i3 ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ which pkgconfig makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/i3 \ - --add-flags "-c ${configFile}" + buildInputs = [ + libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon + libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango + perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun + perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + xorgserver xvfb_run + ]; + + configureFlags = [ "--disable-builddir" ]; + + enableParallelBuilding = true; + + postPatch = '' + patchShebangs . ''; + + # Tests have been failing (at least for some people in some cases) + # and have been disabled until someone wants to fix them. Some + # initial digging uncovers that the tests call out to `git`, which + # they shouldn't, and then even once that's fixed have some + # perl-related errors later on. For more, see + # https://github.com/NixOS/nixpkgs/issues/7957 + doCheck = false; # stdenv.system == "x86_64-linux"; + + checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + '' + (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) + ! grep -q '^not ok' testcases/latest/complete-run.log + ''; + + postInstall = '' + wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" + for program in $out/bin/i3-sensible-*; do + sed -i 's/which/command -v/' $program + done + ''; + + separateDebugInfo = true; + + meta = with stdenv.lib; { + description = "A tiling window manager"; + homepage = "http://i3wm.org"; + maintainers = with maintainers; [ garbas modulistic fpletz ]; + license = licenses.bsd3; + platforms = platforms.all; + + longDescription = '' + A tiling window manager primarily targeted at advanced users and + developers. Based on a tree as data structure, supports tiling, + stacking, and tabbing layouts, handled dynamically, as well as + floating windows. Configured via plain text file. Multi-monitor. + UTF-8 clean. + ''; + }; + } diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index de0fcf953e4..676fbd00688 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -22,12 +22,14 @@ assert !nativeTools -> assert !(nativeLibc && noLibc); assert (noLibc || nativeLibc) == (libc == null); -assert targetPlatform != hostPlatform -> runCommand != null; +assert stdenv.targetPlatform != stdenv.hostPlatform -> runCommand != null; # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper. assert cc.langVhdl or false -> zlib != null; let + inherit (stdenv) hostPlatform targetPlatform; + # Prefix for binaries. Customarily ends with a dash separator. # # TODO(@Ericson2314) Make unconditional, or optional but always true by diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 10bc5787e40..053a3ae76c1 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "iosevka-${version}"; - version = "1.13.0"; + version = "1.13.1"; buildInputs = [ unzip ]; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "03jc8a10177wk35gyp0n317azakyy5qzc6vbh331552asawckswr"; + sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i"; }; sourceRoot = "."; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index e9adc4c0422..01959f91195 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188"; }; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; installPhase = '' for i in *.ttf; do @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" done - install -Dm 644 COPYING "$out/share/doc/COPYING" + install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; meta = with stdenv.lib; { @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://files.ax86.net/terminus-ttf; license = licenses.ofl; maintainers = with maintainers; [ okasu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix new file mode 100644 index 00000000000..8db10d7f582 --- /dev/null +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: +let + pname = "ttf-envy-code-r"; + version = "PR7"; +in +stdenv.mkDerivation rec { + name = "${pname}-0.${version}"; + + src = fetchurl { + url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + sha256 = "9f7e9703aaf21110b4e1a54d954d57d4092727546348598a5a8e8101e4597aff"; + }; + + 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" + ''; + + meta = with stdenv.lib; { + homepage = http://damieng.com/blog/tag/envy-code-r; + description = "Free scalable coding font by DamienG"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = [ maintainers.lyt ]; + }; +} diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 693de6d78c6..6fef0c1b6cb 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "10.0.01"; + version = "10.0.02"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "0yfz5y4vidb7h6csv6k8h0mx808psdn4vx4842bnyz0fkyhr9h3y"; + sha256 = "1g7iaw2vx7yq8d3z625p6ainkn35wpfsimbl75lyj3d8206fhx0z"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "0shlr5804knh14qnv270yzsyfndw6na5ajbx4kvx20gfyxzcsi76"; + sha256 = "1l2cnkshpsg3mw5ps1ghzqm2a1nr7jfdn2bxqyvw7d0l5xyxvg3d"; }; buildInputs = [ mkfontscale mkfontdir ]; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index d1a2a785a9c..f0a049bb4b2 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -16,7 +16,7 @@ let in import ./hex-packages.nix { inherit pkgs stdenv callPackage; - } // { + } // rec { inherit callPackage erlang; beamPackages = self; @@ -37,9 +37,23 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = if versionAtLeast (lib.getVersion erlang) "18" - then callPackage ../interpreters/elixir { debugInfo = true; } - else throw "Elixir requires at least Erlang/OTP R18."; + elixir = elixir_1_4; + + elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix { + inherit rebar erlang; + debugInfo = true; + }; + + elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix { + inherit rebar erlang; + debugInfo = true; + }; + + elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix { + inherit rebar erlang; + debugInfo = true; + }; + lfe = callPackage ../interpreters/lfe { }; # Non hex packages diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 009bfb4975b..dd4ed5e1bbf 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -12,15 +12,6 @@ rec { callPackage = callPackageWith pkgs; - /* Erlang/OTP-specific version retrieval, returns 19 for OTP R19 */ - getVersion = x: - let - parse = drv: (builtins.parseDrvName drv).version; - in builtins.replaceStrings ["B" "-"] ["." "."] ( - if builtins.isString x - then parse x - else x.version or (parse x.name)); - /* Uses generic-builder to evaluate provided drv containing OTP-version specific data. @@ -43,4 +34,26 @@ rec { mkDerivation = pkgs.makeOverridable builder; }; + /* Uses generic-builder to evaluate provided drv containing Elixir version + specific data. + + drv: package containing version-specific args; + builder: generic builder for all Erlang versions; + args: arguments merged into version-specific args, used mostly to customize + dependencies; + + Arguments passed to the generic-builder are overridable. + + Please note that "mkDerivation" defined here is the one called from 1.4.nix + and similar files. + */ + callElixir = drv: args: + let + inherit (stdenv.lib) versionAtLeast; + builder = callPackage ../interpreters/elixir/generic-builder.nix args; + in + callPackage drv { + mkDerivation = pkgs.makeOverridable builder; + }; + } diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix new file mode 100644 index 00000000000..65fb20aa260 --- /dev/null +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, autoconf, ... }: + +stdenv.mkDerivation rec { + name = "gambit-bootstrap-${version}"; + version = "4.8.8"; + tarball_version = "v4_8_8"; + + src = fetchurl { + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz"; + sha256 = "075k2z04d6svxqf9paj3xvp0mm0xzy0vbma1y61s0lkywdim8xjz"; + }; + + buildInputs = [ autoconf ]; + + configurePhase = '' + ./configure --prefix=$out --enable-single-host + ''; + + buildPhase = '' + # Copy the (configured) sources now, not later, so we don't have to filter out + # all the intermediate build products. + mkdir -p $out ; cp -rp . $out/ + + # build the gsc-boot* compiler + make bootstrap + ''; + + installPhase = '' + cp -fa ./ $out/ + ''; + + forceShare = [ "info" ]; + + meta = { + description = "Optimizing Scheme to C compiler, bootstrap step"; + homepage = "http://gambitscheme.org"; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 7e17cee9abd..58b08ebd4fb 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,31 +1,75 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }: stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.8.6"; - devver = "4_8_6"; + version = "4.8.8-f3ffeb6"; + bootstrap = import ./bootstrap.nix ( pkgs ); - src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz"; - sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl"; +# devver = "4_8_8"; +# src = fetchurl { +# url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${version}-devel.tgz"; +# sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl"; +# }; + src = fetchgit { + url = "https://github.com/feeley/gambit.git"; + rev = "f3ffeb695aeea80c18c1b9ef276b57898c780dca"; + sha256 = "1lqixsrgk9z2gj6z1nkys0pfd3m5zjxrp3gvqn2wpr9h7hjb8x06"; }; - configureFlags = [ - "--enable-single-host" - "--enable-shared" - "--enable-absolute-shared-libs" - "--enable-c-opt=-O6" "--enable-gcc-opts" "--enable-inline-jumps" - "--enable-thread-system=posix" "--enable-dynamic-tls" - "--enable-openssl" - ]; + buildInputs = [ openssl git autoconf bootstrap ]; - buildInputs = [ openssl ]; + configurePhase = '' + options=( + --prefix=$out + --enable-single-host + --enable-c-opt=-O2 + --enable-gcc-opts + --enable-shared + --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. + --enable-poll + --enable-openssl + + #--enable-multiple-versions # Nope, NixOS already does version multiplexing + #--enable-guide + #--enable-track-scheme + #--enable-high-res-timing + #--enable-max-processors=4 + #--enable-multiple-vms + #--enable-dynamic-tls + #--enable-multiple-vms + #--enable-multiple-threaded-vms ## when SMP branch is merged in + #--enable-thread-system=posix ## default when --enable-multiple-vms is on. + #--enable-profile + #--enable-coverage + #--enable-inline-jumps + #--enable-char-size=1" ; default is 4 + ) + ./configure ''${options[@]} + ''; + + buildPhase = '' + # Make bootstrap compiler, from release bootstrap + mkdir -p boot/wip-compiler && + cp -rp ${bootstrap}/. boot/wip-compiler/. && + chmod -R u+w boot && + cd boot/wip-compiler && \ + cp ../../gsc/makefile.in ../../gsc/*.scm gsc && \ + (cd gsc && make bootclean ) && + make bootstrap && + cd ../.. && + cp boot/wip-compiler/gsc/gsc gsc-boot && + + # Now use the bootstrap compiler to build the real thing! + make -j2 from-scratch + ''; + + doCheck = true; meta = { description = "Optimizing Scheme to C compiler"; homepage = "http://gambitscheme.org"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 7ea403715a5..22047b663d0 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,15 +1,22 @@ -{ stdenv, fetchurl, fetchgit, gambit, openssl, zlib, coreutils, rsync, bash }: +{ stdenv, fetchurl, fetchgit, gambit, + coreutils, rsync, bash, + openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }: stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.11"; - src = fetchurl { - url = "https://github.com/vyzo/gerbil/archive/v${version}.tar.gz"; - sha256 = "0mqg6cqdcf5qr7vk79x5zkls7z2wm8i3lhwn0b7i0g1m6yyyyff7"; + version = "0.12-DEV"; + src = fetchgit { + url = "https://github.com/vyzo/gerbil.git"; + rev = "3657b6e940ea248e0b312f276590e38ff68997e7"; + sha256 = "11ys7082ghkm4yikz4qxmv3jpxcr42jfi0jhjw1mpzbqdg6004w2"; }; - buildInputs = [ gambit openssl zlib coreutils rsync bash ]; + buildInputs = [ + gambit openssl + coreutils rsync bash + zlib openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb + ]; postPatch = '' patchShebangs . @@ -21,7 +28,13 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + + # Enable all optional libraries + substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' + + # Build, replacing make by build.sh ( cd src && sh build.sh ) + runHook postBuild ''; diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index 6b0cdf4fbdc..92014200c61 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -9,8 +9,8 @@ let inherit (bootPkgs) ghc; - version = "8.2.1-rc2"; - preReleaseName = "ghc-8.2.0.20170507"; + version = "8.2.1-rc3"; + preReleaseName = "ghc-8.2.0.20170704"; commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure @@ -27,7 +27,7 @@ in stdenv.mkDerivation (rec { src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; - sha256 = "1hy3l6nzkyhzwy9mii4zs51jv048zwvdqk1q3188jznz35392zrn"; + sha256 = "0ccfybbjrmd8yzqbfdqvb6clz2kd005wi8sx3mfjmbkmxv0l4jry"; }; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 4a777d7b4f1..61408c0ebb3 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -113,6 +113,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.5.patch ./creds-test.patch + ./fix-systime-1.6.patch # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch # actually works on old versions too. diff --git a/pkgs/development/compilers/go/fix-systime-1.6.patch b/pkgs/development/compilers/go/fix-systime-1.6.patch new file mode 100644 index 00000000000..e4a3932001e --- /dev/null +++ b/pkgs/development/compilers/go/fix-systime-1.6.patch @@ -0,0 +1,45 @@ +diff --git a/src/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s +index e09b906ba5..fa8ff2f65c 100644 +--- a/src/runtime/sys_darwin_amd64.s ++++ b/src/runtime/sys_darwin_amd64.s +@@ -157,6 +157,7 @@ systime: + // Fall back to system call (usually first call in this thread). + MOVQ SP, DI + MOVQ $0, SI ++ MOVQ $0, DX // required as of Sierra; Issue 16570 + MOVL $(0x2000000+116), AX + SYSCALL + CMPQ AX, $0 +diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go +index 70b53b87f4..79083117b6 100644 +--- a/src/syscall/syscall_darwin_amd64.go ++++ b/src/syscall/syscall_darwin_amd64.go +@@ -26,14 +26,21 @@ func NsecToTimeval(nsec int64) (tv Timeval) { + } + + //sysnb gettimeofday(tp *Timeval) (sec int64, usec int32, err error) +-func Gettimeofday(tv *Timeval) (err error) { +- // The tv passed to gettimeofday must be non-nil +- // but is otherwise unused. The answers come back +- // in the two registers. ++func Gettimeofday(tv *Timeval) error { ++ // The tv passed to gettimeofday must be non-nil. ++ // Before macOS Sierra (10.12), tv was otherwise unused and ++ // the answers came back in the two registers. ++ // As of Sierra, gettimeofday return zeros and populates ++ // tv itself. + sec, usec, err := gettimeofday(tv) +- tv.Sec = sec +- tv.Usec = usec +- return err ++ if err != nil { ++ return err ++ } ++ if sec != 0 || usec != 0 { ++ tv.Sec = sec ++ tv.Usec = usec ++ } ++ return nil + } + + func SetKevent(k *Kevent_t, fd, mode, flags int) { diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix index e51bbc0c308..911ba0ae02a 100644 --- a/pkgs/development/compilers/mono/5.0.nix +++ b/pkgs/development/compilers/mono/5.0.nix @@ -2,6 +2,6 @@ callPackage ./generic-cmake.nix (rec { inherit Foundation libobjc; - version = "5.0.0.48"; - sha256 = "13n20wmijkhd7vm41lzz1n774rna67d94prl33bz1lly0idsciq0"; + version = "5.0.1.1"; + sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8"; }) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index ab232f07d1b..f6e3f5a0100 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" + patchShebangs ./ ./autogen.sh --prefix $out ''; @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { # LLVM path to point into the Mono LLVM build, since it's private anyway. preBuild = '' makeFlagsArray=(INSTALL=`type -tp install`) - patchShebangs ./ substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" '' + stdenv.lib.optionalString withLLVM '' substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix index a63034d700d..4f49bcf8072 100644 --- a/pkgs/development/compilers/ocaml/4.04.nix +++ b/pkgs/development/compilers/ocaml/4.04.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "04"; - patch_version = "1"; - sha256 = "11f2kcldpad9h5ihi1crad5lvv2501iccb2g4c8m197fnjac8b12"; + patch_version = "2"; + sha256 = "0bhgjzi78l10824qga85nlh18jg9lb6aiamf9dah1cs6jhzfsn6i"; # If the executable is stipped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 3ed5a2bef72..6ace7d96be8 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchzip, fetchgit, boost, cmake }: -let jsoncpp = fetchzip { - url = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; - sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0"; -}; in +let + version = "0.4.12"; + rev = "194ff033ae44944ac59aa7bd3da89ba94ec5893c"; + sha256 = "0gkg3nay0625qmhxxxax1d1c4dl554ri3pkwd12qfg6g1w6j04w7"; + jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; + jsoncpp = fetchzip { + url = jsoncppURL; + sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0"; + }; +in -let commit = "68ef5810593e7c8092ed41d5f474dd43141624eb"; in - -stdenv.mkDerivation rec { - version = "0.4.11"; +stdenv.mkDerivation { name = "solc-${version}"; # Cannot use `fetchFromGitHub' because of submodules src = fetchgit { url = "https://github.com/ethereum/solidity"; - rev = commit; - sha256 = "13zycybf23yvf3hkf9zgw9gbc1y4ifzxaf7sll69bsn24fcyq961"; + inherit rev sha256; }; patchPhase = '' - echo >commit_hash.txt ${commit} + echo >commit_hash.txt '${rev}' echo >prerelease.txt substituteInPlace deps/jsoncpp.cmake \ - --replace https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz ${jsoncpp} + --replace '${jsoncppURL}' ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ --replace 'add_compile_options(-Werror)' "" ''; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index af123de5654..1f6a39b8651 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5462,6 +5462,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "FontyFruity_0_5_3_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , directory, filepath, text, vector, xml + }: + mkDerivation { + pname = "FontyFruity"; + version = "0.5.3.3"; + sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq directory filepath text + vector xml + ]; + description = "A true type file format loader"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ForSyDe" = callPackage ({ mkDerivation, array, base, containers, directory, filepath, mtl , old-time, parameterized-data, pretty, process, random @@ -37571,8 +37588,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.6"; - sha256 = "1pp4wyii4gb585nvy8zzylpaxbmhxw6r0v28qdsm825kqldhvy4f"; + version = "4.35.9"; + sha256 = "1d7xd9v8gc0ahyx557470dw01s3zs6vz594a4hy95bgx5d45s357"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42405,12 +42422,16 @@ self: { }) {}; "clash-multisignal" = callPackage - ({ mkDerivation, base, clash-prelude, QuickCheck }: + ({ mkDerivation, base, clash-prelude, deepseq + , ghc-typelits-knownnat, QuickCheck + }: mkDerivation { pname = "clash-multisignal"; - version = "0.1.0.0"; - sha256 = "0hb9pxggdw8sg5g4227sghf366b2psl7l83c9mcy5dcxlng3znl4"; - libraryHaskellDepends = [ base clash-prelude QuickCheck ]; + version = "0.2.0.0"; + sha256 = "0jqlz3h226ql641z4kzwf921f5sb0zf9zh2c9gli4bbw7csn93nd"; + libraryHaskellDepends = [ + base clash-prelude deepseq ghc-typelits-knownnat QuickCheck + ]; homepage = "https://github.com/ra1u/clash-multisignal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -51835,8 +51856,8 @@ self: { }: mkDerivation { pname = "data-basic"; - version = "0.2.0.1"; - sha256 = "16j5jvry7hfgnyz4bsi1a2kja7q7a0sfafswa942pqby6dzcgxz1"; + version = "0.2.0.3"; + sha256 = "0xmc9cj22nw90c4l9ava7da14d2y3pvip81admgjx8cqgz93255k"; libraryHaskellDepends = [ aeson base binary bytestring cases containers hssqlppp lens lens-aeson mtl overload postgresql-simple simple-effects @@ -52225,8 +52246,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, hspec, lens, tagged }: mkDerivation { pname = "data-diverse"; - version = "0.4.0.0"; - sha256 = "0jqyn4jwdvzijqwrb5j0052h95vxdwgixfb5a7cgwa574yipks09"; + version = "0.5.0.0"; + sha256 = "0cr67dpfbzayw2hhg8zf4yqwgbkjn5dislh7r96fjz1mkif6m0zz"; libraryHaskellDepends = [ base containers ghc-prim lens tagged ]; testHaskellDepends = [ base hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse#readme"; @@ -58514,6 +58535,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_3" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck + , quickcheck-instances + }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.3"; + sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base Cabal QuickCheck quickcheck-instances + ]; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -64534,8 +64573,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.4"; - sha256 = "01zzvd751bxy1mbfimqxn5ck172cc54lp7ch7p0yxln9ss2ngzj2"; + version = "0.8.2.5"; + sha256 = "0vl9kc0grhp72rlx922khvf5833qshyx4danismf8n5r3i9f7qr0"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -66128,13 +66167,13 @@ self: { }: mkDerivation { pname = "fast-tagsoup"; - version = "1.0.13"; - sha256 = "11h9d9a3wk87vw1xwc309cxhind1xbwhbvrqx6648dxf3nj5h1i5"; + version = "1.0.14"; + sha256 = "08vxz22iilai542h4g5c8xdawib9b0r7jlfmiga8ys7aq7nvgcsj"; libraryHaskellDepends = [ base bytestring containers tagsoup text text-icu ]; homepage = "https://github.com/vshabanov/fast-tagsoup"; - description = "Fast parser for tagsoup package"; + description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -69017,8 +69056,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.3.3"; - sha256 = "0rl6zwamkwdjnlmn2rr0mh16idci5xqgr70qsvqarj34h1ax2idb"; + version = "0.5.3.4"; + sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -92963,6 +93002,8 @@ self: { pname = "heap"; version = "1.0.3"; sha256 = "00plmd5b8dlgb8324h1dbd168apfcx3hkv65rhi463a8lff7xmcv"; + revision = "1"; + editedCabalFile = "0j1f0xl3y2vqiyh3m9w5vssxyi62s6qic3zmpkm429vawyh4yad5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; @@ -97567,8 +97608,8 @@ self: { }: mkDerivation { pname = "hnormalise"; - version = "0.4.1.1"; - sha256 = "0q25mds552c87f2xs7s82b749drg3r41qswy0k8jmyz5dsc9wcir"; + version = "0.4.2.0"; + sha256 = "1h38qr8d8dbn81bghh3imb7jink6b06wadbpyg4axfr39s21xvkg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119093,8 +119134,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.1.0"; - sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4"; + version = "0.2.0"; + sha256 = "0vs6n3q9svwhcp6853ipxmw1anmy8qfy3xajjsf7h4pjnqzy7g88"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers network semigroups stm text @@ -125511,21 +125552,21 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, composition, containers - , criterion, directory, file-embed, hspec, hspec-megaparsec - , megaparsec, microlens, MonadRandom, mtl, optparse-applicative - , random-shuffle, template-haskell, text + ({ mkDerivation, ansi-wl-pprint, base, composition + , composition-extra, containers, criterion, directory, file-embed + , hspec, hspec-megaparsec, megaparsec, microlens, MonadRandom, mtl + , optparse-applicative, random-shuffle, template-haskell, text }: mkDerivation { pname = "madlang"; - version = "2.3.1.1"; - sha256 = "1ybbf281kpmdwggjvmhpilip0pficsqqg1m1nizgwwlgg76kwnj3"; + version = "2.3.2.0"; + sha256 = "0cg38m9ji0l8kv3sqqhwbvn57all0h9652acjdhhcg3n98hxpam6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base composition containers directory file-embed - megaparsec microlens MonadRandom mtl optparse-applicative - random-shuffle template-haskell text + ansi-wl-pprint base composition composition-extra containers + directory file-embed megaparsec microlens MonadRandom mtl + optparse-applicative random-shuffle template-haskell text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -127792,7 +127833,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "mediabus_0_4_0_0" = callPackage + "mediabus_0_4_0_1" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, monad-control @@ -127803,8 +127844,8 @@ self: { }: mkDerivation { pname = "mediabus"; - version = "0.4.0.0"; - sha256 = "00aps3hlml830ws4czpabzndwh2dvmyih1hy6k841zj7kzpvmg73"; + version = "0.4.0.1"; + sha256 = "0f0ip2l87a7divqp580iziskx3fkvv6f6vny42vz7v4p77i05p20"; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async @@ -127818,7 +127859,7 @@ self: { monad-control mtl QuickCheck singletons spool stm tagged template-haskell text time transformers type-spec vector ]; - homepage = "https://github.com/lindenbaum/mediabus"; + homepage = "https://github.com/sheyll/mediabus"; description = "Multimedia streaming on top of Conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127892,7 +127933,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "mediabus-rtp_0_4_0_0" = callPackage + "mediabus-rtp_0_4_0_1" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, mediabus @@ -127903,8 +127944,8 @@ self: { }: mkDerivation { pname = "mediabus-rtp"; - version = "0.4.0.0"; - sha256 = "0b8nhyb072nqcikq40la226da30vg343cjmp4qjpsr714i2sd3rk"; + version = "0.4.0.1"; + sha256 = "1yfy8aak1z9bbwy676qyfxa7hmk1n94f3dn1x070hvpbvgpgmijb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127925,7 +127966,7 @@ self: { monad-control monad-logger mtl QuickCheck singletons spool stm tagged template-haskell text time transformers type-spec vector ]; - homepage = "https://github.com/lindenbaum/mediabus-rtp"; + homepage = "https://github.com/sheyll/mediabus-rtp"; description = "Receive and Send RTP Packets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129958,8 +129999,8 @@ self: { }: mkDerivation { pname = "miso"; - version = "0.1.1.0"; - sha256 = "16ww5nbjdkjlwsr3dapv3px12dvi9dxbmz9z62n3hfpz5c4v5864"; + version = "0.1.2.0"; + sha256 = "1f9gs5lmcg86gs35fsdjq7bdhxyawdfna5lp84chsxl5fqa44wjs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137490,8 +137531,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.4.0.0"; - sha256 = "1cp77flxddnxiln2x1iy9f0ijrim9ai7xry87h23y8xn1zgwvyh4"; + version = "0.4.1.0"; + sha256 = "0vlcvvgl6sncgw03ks20b115jlznlv4f1n9fnzwzignws09hyf6y"; libraryHaskellDepends = [ async base binary bytestring template-haskell unix ]; @@ -139951,6 +139992,18 @@ self: { license = "GPL"; }) {}; + "onpartitions" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "onpartitions"; + version = "0.1.0.0"; + sha256 = "0iy4hpibiz6v93kz8jv5phb96sh6ygcdakf9vqss5d5622s5pgf1"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/paolino/onpartitions"; + description = "partition lenses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "onu-course" = callPackage ({ mkDerivation, base, smallcheck }: mkDerivation { @@ -144667,8 +144720,8 @@ self: { }: mkDerivation { pname = "pcgen"; - version = "1.0.0"; - sha256 = "1nh05bf7xd0l9jrjzvvmng64q5wc6j7iz856g8z3d20mcv2q1lza"; + version = "2.0.1"; + sha256 = "15116krysjvp3if7rdqcfjgqappfybjzwmgrkd5v5x8w62izhnla"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base hspec QuickCheck random ]; benchmarkHaskellDepends = [ base criterion deepseq random ]; @@ -146154,8 +146207,8 @@ self: { }: mkDerivation { pname = "pg-store"; - version = "0.4.2"; - sha256 = "1i1ma0m7qmn2v2qswv5kj1rbbfscqirkcvyr5nf07czbghwpx1v6"; + version = "0.4.3"; + sha256 = "1qqy79yqhwjw094p8i4qanmjwlvym7lndnqiw10mgp0xn63rznid"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring hashable haskell-src-meta mtl postgresql-libpq scientific tagged @@ -152683,8 +152736,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.0.6"; - sha256 = "0w8n7l4ws3awccqf6g12bk09l10s4scmdvr5vkxhhpm5cmawd0fq"; + version = "4.3.0"; + sha256 = "1walyz9x0rxa9n77kr0w7gpm2vnydxq70ii782ygzy0izymhnx39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153017,6 +153070,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_2" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.2"; + sha256 = "13z1sh8z5b3nlscqnzw137k3979d4war3yzhxclljqq2z88rm1bv"; + 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 { @@ -163902,6 +163973,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safe-exceptions_0_1_6_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, transformers + , void + }: + mkDerivation { + pname = "safe-exceptions"; + version = "0.1.6.0"; + sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i"; + libraryHaskellDepends = [ base deepseq exceptions transformers ]; + testHaskellDepends = [ base hspec void ]; + homepage = "https://github.com/fpco/safe-exceptions#readme"; + description = "Safe, consistent, and easy exception handling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-exceptions-checked" = callPackage ({ mkDerivation, base, deepseq, hspec, safe-exceptions , transformers @@ -163910,8 +163997,8 @@ self: { pname = "safe-exceptions-checked"; version = "0.1.0"; sha256 = "0gyaq2pf87dqn0l6n3mi0qamf99y3zj5xxh513c0iqwdh8mma1yq"; - revision = "1"; - editedCabalFile = "1nnnljp0l70zafgfl09kskf965p993plmk52pv2wqhjj94xdnwzb"; + revision = "2"; + editedCabalFile = "18fwk5yr8zm4y215vbsl149jkn9pxyv3m8mgq3979pvs1c4kqivz"; libraryHaskellDepends = [ base deepseq safe-exceptions transformers ]; @@ -171779,6 +171866,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-logging" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, iso8601-time + , lens, mtl, simple-effects, string-conv, text, time, vector + }: + mkDerivation { + pname = "simple-logging"; + version = "0.2.0.1"; + sha256 = "1x0vclb2an4mbwxqk44z0rpw1ai0pq2kc9ak0chyzijbk1vivwmx"; + libraryHaskellDepends = [ + aeson base bytestring exceptions iso8601-time lens mtl + simple-effects string-conv text time vector + ]; + testHaskellDepends = [ base simple-effects ]; + homepage = "https://gitlab.com/haskell-hr/logging"; + description = "Logging effect to plug into the simple-effects framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "simple-money" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -172447,9 +172552,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "singnal"; - version = "0.1.0.0"; - sha256 = "099akvb0j6a7hh4g5pm8i8hy8pmsc6i33jg957zsbnbh72s0ck3d"; + version = "0.1.1.0"; + sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj"; libraryHaskellDepends = [ base ]; + homepage = "https://github.com/zaoqi/Signal.hs"; + description = "Singnal"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -179953,21 +180060,20 @@ self: { }) {}; "streaming-concurrency" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hspec, lifted-async + ({ mkDerivation, base, exceptions, hspec, lifted-async , monad-control, QuickCheck, quickcheck-instances, stm, streaming - , streaming-bytestring, streaming-with, transformers-base + , streaming-with, transformers-base }: mkDerivation { pname = "streaming-concurrency"; - version = "0.1.0.0"; - sha256 = "1g2p928mvkwwdy0xbm8c6ph2cdqswj1gpi0zq6ln1bl4f3xd98rz"; + version = "0.3.0.0"; + sha256 = "1dnlnm57rlk900n148xnfihx917rc9lggx6fdzhf7cjbi1n2ibn2"; libraryHaskellDepends = [ - base bytestring exceptions lifted-async monad-control stm streaming - streaming-bytestring streaming-with transformers-base + base exceptions lifted-async monad-control stm streaming + streaming-with transformers-base ]; testHaskellDepends = [ - base bytestring hspec QuickCheck quickcheck-instances streaming - streaming-bytestring + base hspec QuickCheck quickcheck-instances streaming ]; description = "Concurrency support for the streaming ecosystem"; license = stdenv.lib.licenses.mit; @@ -185136,16 +185242,16 @@ self: { }) {}; "teardown" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, criterion, doctest, Glob - , protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit + ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest + , Glob, protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit , tasty-rerun, tasty-smallcheck, text, time }: mkDerivation { pname = "teardown"; - version = "0.1.0.0"; - sha256 = "0sg113khwlb56x0rgb47lm0hf0cfsr9wc31w98nav9zcw5gndm33"; + version = "0.1.0.1"; + sha256 = "0jxhr73dq4gvbzrwhbqsrwg1v8qa2mj1nfygb44kj60diwa4cwj2"; libraryHaskellDepends = [ - ansi-wl-pprint base protolude text time + ansi-wl-pprint base deepseq protolude text time ]; testHaskellDepends = [ base doctest Glob protolude QuickCheck tasty tasty-hspec @@ -188788,19 +188894,16 @@ self: { }) {}; "throwable-exceptions" = callPackage - ({ mkDerivation, base, doctest, either, safe-exceptions, tasty - , tasty-discover, tasty-hunit, template-haskell, text + ({ mkDerivation, base, doctest, either, safe-exceptions, silently + , tasty, tasty-discover, tasty-hunit, template-haskell, text }: mkDerivation { pname = "throwable-exceptions"; - version = "0.1.0.7"; - sha256 = "1afxzk9xvxlvi13ysda9gcv6zzr7njcvi5p15lbn9bg68nrwqazj"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.8"; + sha256 = "0d8dxrd922rxnn417yn2ij71v6vb9c5i37qvcmdixfh773p9sm8r"; libraryHaskellDepends = [ base safe-exceptions template-haskell ]; - executableHaskellDepends = [ base safe-exceptions ]; testHaskellDepends = [ - base doctest either safe-exceptions tasty tasty-discover + base doctest either safe-exceptions silently tasty tasty-discover tasty-hunit text ]; homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md"; @@ -192797,14 +192900,13 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition, containers, criterion, data-default - , directory, extra, hspec, hspec-megaparsec, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, split, text + , directory, extra, hspec, http-client, http-client-tls, http-types + , lens, megaparsec, optparse-applicative, split, text }: mkDerivation { pname = "tweet-hs"; - version = "0.6.0.1"; - sha256 = "1rd1isvbia2cvxbfxx6sxk8vz3vjckpwa7ci0sgpbmb6qcm0ddyr"; + version = "0.6.1.2"; + sha256 = "17nvm7xnb5gvmq977bz812gd6s3dfvvkxd2zwcdayczdmnz06gyz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192813,10 +192915,8 @@ self: { http-types lens megaparsec optparse-applicative split text ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec - ]; - benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; + testHaskellDepends = [ base bytestring hspec ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; @@ -195799,8 +195899,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.4.3"; - sha256 = "17rrikfid54z8h95qns5q7bdxadnnggv1pl2d9ilz9pz9hi7a9g6"; + version = "0.5"; + sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe stm text text-format transformers diff --git a/pkgs/development/interpreters/elixir/1.3.nix b/pkgs/development/interpreters/elixir/1.3.nix new file mode 100644 index 00000000000..43d48e2cf7c --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.3.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.3.4"; + sha256 = "01qqv1ghvfadcwcr5p88w8j217cgaf094pmpqllij3l0q1yg104l"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/1.4.nix b/pkgs/development/interpreters/elixir/1.4.nix new file mode 100644 index 00000000000..9ddd9062acd --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.4.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.4.5"; + sha256 = "18ivcxmh5bak13k3rjy7jjzin57rgb2nffhwnqb2wl7bpi8mrarw"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix new file mode 100644 index 00000000000..d9e2e9c16c6 --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.5.0-rc.0"; + sha256 = "1p0sawz86w9na56c42ivdacqxzldjb9s9cvl2isj3sy4nwsa0l0j"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix deleted file mode 100644 index 0e77b2af252..00000000000 --- a/pkgs/development/interpreters/elixir/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, coreutils, curl, bash, - debugInfo ? false }: - -stdenv.mkDerivation rec { - name = "elixir-${version}"; - version = "1.4.4"; - - src = fetchFromGitHub { - owner = "elixir-lang"; - repo = "elixir"; - rev = "v${version}"; - sha256 = "0m51cirkv1dahw4z2jlmz58cwmpy0dya88myx4wykq0v5bh1xbq8"; - }; - - buildInputs = [ erlang rebar makeWrapper ]; - - # Elixir expects that UTF-8 locale to be set (see https://github.com/elixir-lang/elixir/issues/3548). - # In other cases there is warnings during compilation. - LANG = "en_US.UTF-8"; - LC_TYPE = "en_US.UTF-8"; - - setupHook = ./setup-hook.sh; - - inherit debugInfo; - - buildFlags = if debugInfo - then "ERL_COMPILER_OPTIONS=debug_info" - else ""; - - preBuild = '' - # The build process uses ./rebar. Link it to the nixpkgs rebar - rm -v rebar - ln -s ${rebar}/bin/rebar rebar - - substituteInPlace Makefile \ - --replace "/usr/local" $out - ''; - - postFixup = '' - # Elixir binaries are shell scripts which run erl. Add some stuff - # to PATH so the scripts can run without problems. - - for f in $out/bin/*; do - b=$(basename $f) - if [ $b == "mix" ]; then continue; fi - wrapProgram $f \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \ - --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt - done - - substituteInPlace $out/bin/mix \ - --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir" - ''; - - meta = with stdenv.lib; { - homepage = "http://elixir-lang.org/"; - description = "A functional, meta-programming aware language built on top of the Erlang VM"; - - longDescription = '' - Elixir is a functional, meta-programming aware language built on - top of the Erlang VM. It is a dynamic language with flexible - syntax and macro support that leverages Erlang's abilities to - build concurrent, distributed and fault-tolerant applications - with hot code upgrades. - ''; - - license = licenses.epl10; - platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny havvy couchemar ]; - }; -} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix new file mode 100644 index 00000000000..ff63406aea3 --- /dev/null +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -0,0 +1,77 @@ +{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, + coreutils, curl, bash, debugInfo ? false }: + +{ baseName ? "elixir" +, version +, minimumOTPVersion +, sha256 ? null +, rev ? "v${version}" +, src ? fetchFromGitHub { inherit rev sha256; owner = "elixir-lang"; repo = "elixir"; } +}: + +let + inherit (stdenv.lib) getVersion versionAtLeast; + +in + assert versionAtLeast (getVersion erlang) minimumOTPVersion; + + stdenv.mkDerivation ({ + name = "${baseName}-${version}"; + + inherit src version; + + buildInputs = [ erlang rebar makeWrapper ]; + + LANG = "en_US.UTF-8"; + LC_TYPE = "en_US.UTF-8"; + + setupHook = ./setup-hook.sh; + + inherit debugInfo; + + buildFlags = if debugInfo + then "ERL_COMPILER_OPTIONS=debug_info" + else ""; + + preBuild = '' + # The build process uses ./rebar. Link it to the nixpkgs rebar + rm -v rebar + ln -s ${rebar}/bin/rebar rebar + + substituteInPlace Makefile \ + --replace "/usr/local" $out + ''; + + postFixup = '' + # Elixir binaries are shell scripts which run erl. Add some stuff + # to PATH so the scripts can run without problems. + + for f in $out/bin/*; do + b=$(basename $f) + if [ "$b" = mix ]; then continue; fi + wrapProgram $f \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \ + --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt + done + + substituteInPlace $out/bin/mix \ + --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir" + ''; + + meta = with stdenv.lib; { + homepage = "http://elixir-lang.org/"; + description = "A functional, meta-programming aware language built on top of the Erlang VM"; + + longDescription = '' + Elixir is a functional, meta-programming aware language built on + top of the Erlang VM. It is a dynamic language with flexible + syntax and macro support that leverages Erlang's abilities to + build concurrent, distributed and fault-tolerant applications + with hot code upgrades. + ''; + + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ the-kenny havvy couchemar ankhers ]; + }; + }) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 1694e3e4850..a754e2c4347 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,41 +1,73 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, hostPlatform }: +rec { -stdenv.mkDerivation rec { - name = "luajit-${version}"; - version = "2.1.0-beta3"; - luaversion = "5.1"; + luajit = + # Compatibility problems with lightuserdata pointers; see: + # https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101 + if hostPlatform.is64bit && (/*hostPlatform.isArm ||*/ hostPlatform.isSunOS) + # FIXME: fix the aarch64 build + then luajit_2_0 + else luajit_2_1; - src = fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; + luajit_2_0 = generic { + version = "2.0.5"; + isStable = true; + sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; + }; + + luajit_2_1 = generic { + version = "2.1.0-beta3"; + isStable = false; sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; }; - enableParallelBuilding = true; - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local $out + generic = + { version, sha256 ? null, isStable + , name ? "luajit-${version}" + , src ? + (fetchurl { + url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; + inherit sha256; + }) + }: - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig - ''; + stdenv.mkDerivation rec { + inherit name version src; - configurePhase = false; - buildFlags = [ "amalg" ]; # Build highly optimized version - installPhase = '' - make install INSTALL_INC=$out/include PREFIX=$out - ln -s $out/bin/luajit* $out/bin/lua - ln -s $out/bin/luajit* $out/bin/luajit - ''; + luaversion = "5.1"; - meta = with stdenv.lib; { - description = "High-performance JIT compiler for Lua 5.1"; - homepage = http://luajit.org; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers ; [ thoughtpolice smironov ]; - }; + patchPhase = '' + substituteInPlace Makefile \ + --replace /usr/local "$out" + + substituteInPlace src/Makefile --replace gcc cc + '' + stdenv.lib.optionalString (stdenv.cc.libc != null) + '' + substituteInPlace Makefile \ + --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig + ''; + + configurePhase = false; + + buildFlags = [ "amalg" ]; # Build highly optimized version + enableParallelBuilding = true; + + installPhase = '' + make install INSTALL_INC="$out"/include PREFIX="$out" + ln -s "$out"/bin/luajit-* "$out"/bin/lua + '' + + stdenv.lib.optionalString (!isStable) + '' + ln -s "$out"/bin/luajit-* "$out"/bin/luajit + ''; + + meta = with stdenv.lib; { + description = "High-performance JIT compiler for Lua 5.1"; + homepage = http://luajit.org; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers ; [ thoughtpolice smironov vcunat ]; + }; + }; } diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 5d1fe8aa0d1..fa9b353f4d6 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, which, camlp4 }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -16,7 +16,13 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; - patchPhase = '' + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch; + sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb"; + }) + ]; + + postPatch = '' patch myocamlbuild.ml < aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.25"; + version = "2.4.26"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "1cl0bkqg6srb1sypga0cn8dcmdyxldavij73zmmkxvlz3kgw4zpq"; + sha1 = "b10b0f569a0e5adfef61d8c7f0813d42046e399a"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix new file mode 100644 index 00000000000..47abcb33ee7 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "consul_exporter-${version}"; + version = "0.3.0"; + + goPackagePath = "github.com/prometheus/consul_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "consul_exporter"; + rev = "v${version}"; + sha256 = "1zffbxyfmqpbdqkx5rb5vjgd9j4p4zcrh6jvn1zhbdzrcs7khnd9"; + }; + + meta = with stdenv.lib; { + description = "Prometheus exporter for Consul metrics"; + homepage = https://github.com/prometheus/consul_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ hectorj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix index b1f33ff99cf..8b17da99b9a 100644 --- a/pkgs/servers/openpts/default.nix +++ b/pkgs/servers/openpts/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "TCG Platform Trust Service (PTS)"; - homepage = "ttp://sourceforge.jp/projects/openpts"; + homepage = "http://sourceforge.jp/projects/openpts"; license = stdenv.lib.licenses.cpl10; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 7dc6029acb4..1d1dddd0c2a 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "elvish-${version}"; - version = "0.5"; + version = "0.9"; goPackagePath = "github.com/elves/elvish"; @@ -10,13 +10,11 @@ buildGoPackage rec { repo = "elvish"; owner = "elves"; rev = version; - sha256 = "1dk5f8a2wpgd5cw45ippvx46fxk0yap64skfpzpiqz8bkbnrwbz6"; + sha256 = "0alsv04iihrk1nffp6fmyzxid26dqhg1k45957c2ymyzyq9cglxj"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { - description = "A Novel unix shell in go language"; + description = "A friendly and expressive Unix shell"; homepage = https://github.com/elves/elvish; license = licenses.bsd2; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix deleted file mode 100644 index cff60bad0a9..00000000000 --- a/pkgs/shells/elvish/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/elves/getopt"; - fetch = { - type = "git"; - url = "https://github.com/elves/getopt"; - rev = "f91a7bf920995832d55a1182f26657bc975b9c24"; - sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; - }; - } -] diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish-foreign-env/default.nix index 477c103c095..76a979bcda1 100644 --- a/pkgs/shells/fish-foreign-env/default.nix +++ b/pkgs/shells/fish-foreign-env/default.nix @@ -11,15 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl"; }; - buildCommand = '' + installPhase = '' mkdir -p $out/share/fish-foreign-env/functions/ - cp $src/functions/* $out/share/fish-foreign-env/functions/ + cp functions/* $out/share/fish-foreign-env/functions/ sed -e "s|sed|${gnused}/bin/sed|" \ -e "s|bash|${bash}/bin/bash|" \ -e "s|\| tr|\| ${coreutils}/bin/tr|" \ -i $out/share/fish-foreign-env/functions/* ''; + patches = [ ./hide-path-warnings.patch ]; + meta = with stdenv.lib; { description = "A foreign environment interface for Fish shell"; license = licenses.mit; diff --git a/pkgs/shells/fish-foreign-env/hide-path-warnings.patch b/pkgs/shells/fish-foreign-env/hide-path-warnings.patch new file mode 100644 index 00000000000..b7ac4edc518 --- /dev/null +++ b/pkgs/shells/fish-foreign-env/hide-path-warnings.patch @@ -0,0 +1,16 @@ +diff --git a/functions/fenv.apply.fish b/functions/fenv.apply.fish +index 34a25e3..6837e7f 100644 +--- a/functions/fenv.apply.fish ++++ b/functions/fenv.apply.fish +@@ -30,8 +30,9 @@ function fenv.apply + + if test "$key" = 'PATH' + set value (echo $value | tr ':' '\n') ++ set -g -x $key $value ^/dev/null ++ else ++ set -g -x $key $value + end +- +- set -g -x $key $value + end + end diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix new file mode 100644 index 00000000000..4ab03b31fb9 --- /dev/null +++ b/pkgs/shells/ion/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +with rustPlatform; + +buildRustPackage rec { + name = "ion-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "redox-os"; + repo = "ion"; + rev = version; + sha256 = "0c2haw9qiwysyp1xj6qla8d6zpsdlygagzh86sk04c2b4ssyaca3"; + }; + + depsSha256 = "0w2jgbrcx57js8ihzs5acp6b1niw1c7khdxrv14y3z9mmm9j55hs"; + + meta = with stdenv.lib; { + description = "Modern system shell with simple (and powerful) syntax"; + homepage = https://github.com/redox-os/ion; + license = licenses.mit; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 7515a72fcfd..5848ee87b1b 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -61,11 +61,9 @@ rec { , buildPlatform, hostPlatform, targetPlatform } @ overrideArgs: let stdenv = overrideArgs.stdenv.override { - # TODO(@Ericson2314): Cannot do this for now because then Nix thinks the - # resulting derivation should be built on the host platform. - #hostPlatform = buildPlatform; - #targetPlatform = hostPlatform; - inherit cc; + inherit + buildPlatform hostPlatform targetPlatform + cc; allowedRequisites = null; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 125c4300975..c83714d01f2 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -14,21 +14,18 @@ in bootStages ++ [ # Build Packages (vanillaPackages: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = crossSystem; inherit config overlays; selfBuild = false; + stdenv = + assert vanillaPackages.hostPlatform == localSystem; + assert vanillaPackages.targetPlatform == localSystem; + vanillaPackages.stdenv.override { targetPlatform = crossSystem; }; # It's OK to change the built-time dependencies allowCustomOverrides = true; - inherit (vanillaPackages) stdenv; }) # Run Packages (buildPackages: { - buildPlatform = localSystem; - hostPlatform = crossSystem; - targetPlatform = crossSystem; inherit config overlays; selfBuild = false; stdenv = buildPackages.makeStdenvCross { diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index d5dc977b37a..b6ea8685f8e 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -15,11 +15,11 @@ in bootStages ++ [ # Additional stage, built using custom stdenv (vanillaPackages: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; - stdenv = config.replaceStdenv { pkgs = vanillaPackages; }; + stdenv = + assert vanillaPackages.hostPlatform == localSystem; + assert vanillaPackages.targetPlatform == localSystem; + config.replaceStdenv { pkgs = vanillaPackages; }; }) ] diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 1c0b42886ca..f6d9bcac510 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -68,6 +68,10 @@ in rec { name = "stdenv-darwin-boot-${toString step}"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { inherit shell; inherit (last) stdenv; @@ -96,9 +100,6 @@ in rec { ''; initialPath = [ bootstrapTools ]; - hostPlatform = localSystem; - targetPlatform = localSystem; - fetchurlBoot = import ../../build-support/fetchurl { stdenv = stage0.stdenv; curl = bootstrapTools; @@ -113,9 +114,6 @@ in rec { }; in { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = thisStdenv; }; @@ -285,6 +283,10 @@ in rec { name = "stdenv-darwin"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + preHook = commonPreHook + '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; @@ -292,9 +294,6 @@ in rec { stdenvSandboxProfile = binShClosure + libSystemProfile; extraSandboxProfile = binShClosure + libSystemProfile; - hostPlatform = localSystem; - targetPlatform = localSystem; - initialPath = import ../common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; @@ -348,9 +347,6 @@ in rec { stage3 stage4 (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = stdenvDarwin prevStage; }) diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 389a5b9985f..d15afe76189 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -35,6 +35,9 @@ let inherit (localSystem) system; in stdenv = import ../generic { name = "stdenv-freebsd-boot-1"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; inherit config; initialPath = [ "/" "/usr" ]; hostPlatform = localSystem; @@ -52,6 +55,9 @@ let inherit (localSystem) system; in stdenv = import ../generic { name = "stdenv-freebsd-boot-0"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; inherit config; initialPath = [ prevStage.bootstrapTools ]; inherit (prevStage.stdenv) @@ -62,12 +68,12 @@ let inherit (localSystem) system; in }) (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = import ../generic { name = "stdenv-freebsd-boot-3"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; inherit config; inherit (prevStage.stdenv) @@ -77,8 +83,6 @@ let inherit (localSystem) system; in nativeTools = true; nativePrefix = "/usr"; nativeLibc = true; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit (prevStage) stdenv; cc = { name = "clang-9.9.9"; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix new file mode 100644 index 00000000000..8b2cf01f169 --- /dev/null +++ b/pkgs/stdenv/generic/check-meta.nix @@ -0,0 +1,197 @@ +# Extend a derivation with checks for brokenness, license, etc. Throw a +# descriptive error when the check fails; return `derivationArg` otherwise. +# Note: no dependencies are checked in this step. + +{ lib, config, system, meta, derivationArg, mkDerivationArg }: + +let + attrs = mkDerivationArg; # TODO: probably get rid of passing this one + + # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 + # for why this defaults to false, but I (@copumpkin) want to default it to true soon. + shouldCheckMeta = config.checkMeta or false; + + allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; + + whitelist = config.whitelistedLicenses or []; + blacklist = config.blacklistedLicenses or []; + + onlyLicenses = list: + lib.lists.all (license: + let l = lib.licenses.${license.shortName or "BROKEN"} or false; in + if license == l then true else + throw ''‘${showLicense license}’ is not an attribute of lib.licenses'' + ) list; + + areLicenseListsValid = + if lib.mutuallyExclusive whitelist blacklist then + assert onlyLicenses whitelist; assert onlyLicenses blacklist; true + else + throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive."; + + hasLicense = attrs: + attrs ? meta.license; + + hasWhitelistedLicense = assert areLicenseListsValid; attrs: + hasLicense attrs && builtins.elem attrs.meta.license whitelist; + + hasBlacklistedLicense = assert areLicenseListsValid; attrs: + hasLicense attrs && builtins.elem attrs.meta.license blacklist; + + allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + + isUnfree = licenses: lib.lists.any (l: + !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; + + # Alow granular checks to allow only some unfree packages + # Example: + # {pkgs, ...}: + # { + # allowUnfree = false; + # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); + # } + allowUnfreePredicate = config.allowUnfreePredicate or (x: false); + + # Check whether unfree packages are allowed and if not, whether the + # package has an unfree license and is not explicitely allowed by the + # `allowUNfreePredicate` function. + hasDeniedUnfreeLicense = attrs: + !allowUnfree && + hasLicense attrs && + isUnfree (lib.lists.toList attrs.meta.license) && + !allowUnfreePredicate attrs; + + allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []); + allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x; + + hasAllowedInsecure = attrs: + (attrs.meta.knownVulnerabilities or []) == [] || + allowInsecurePredicate attrs || + builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; + + showLicense = license: license.shortName or "unknown"; + + pos_str = meta.position or "«unknown-file»"; + + remediation = { + unfree = remediate_whitelist "Unfree"; + broken = remediate_whitelist "Broken"; + blacklisted = x: ""; + insecure = remediate_insecure; + unknown-meta = x: ""; + }; + remediate_whitelist = allow_attr: attrs: + '' + a) For `nixos-rebuild` you can set + { nixpkgs.config.allow${allow_attr} = true; } + in configuration.nix to override this. + + b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add + { allow${allow_attr} = true; } + to ~/.config/nixpkgs/config.nix. + ''; + + remediate_insecure = attrs: + '' + + Known issues: + + '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + '' + + You can install it anyway by whitelisting this package, using the + following methods: + + a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to + `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, + like so: + + { + nixpkgs.config.permittedInsecurePackages = [ + "${attrs.name or "«name-missing»"}" + ]; + } + + b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add + ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in + ~/.config/nixpkgs/config.nix, like so: + + { + permittedInsecurePackages = [ + "${attrs.name or "«name-missing»"}" + ]; + } + + ''; + + throwEvalHelp = { reason , errormsg ? "" }: + throw ('' + Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. + + '' + ((builtins.getAttr reason remediation) attrs)); + + metaTypes = with lib.types; rec { + # These keys are documented + description = str; + longDescription = str; + branch = str; + homepage = str; + downloadPage = str; + license = either (listOf lib.types.attrs) (either lib.types.attrs str); + maintainers = listOf str; + priority = int; + platforms = listOf str; + hydraPlatforms = listOf str; + broken = bool; + + # Weirder stuff that doesn't appear in the documentation? + version = str; + tag = str; + updateWalker = bool; + executables = listOf str; + outputsToInstall = listOf str; + position = str; + repositories = attrsOf str; + isBuildPythonPackage = platforms; + schedulingPriority = str; + downloadURLRegexp = str; + isFcitxEngine = bool; + isIbusEngine = bool; + }; + + checkMetaAttr = k: v: + if metaTypes?${k} then + if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}" + else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; + checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; + + # Check if a derivation is valid, that is whether it passes checks for + # e.g brokenness or license. + # + # Return { valid: Bool } and additionally + # { reason: String; errormsg: String } if it is not valid, where + # reason is one of "unfree", "blacklisted" or "broken". + checkValidity = attrs: + if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then + { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } + else if hasBlacklistedLicense attrs then + { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } + else if !allowBroken && attrs.meta.broken or false then + { valid = false; reason = "broken"; errormsg = "is marked as broken"; } + else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then + { valid = false; reason = "broken"; errormsg = "is not supported on ‘${system}’"; } + else if !(hasAllowedInsecure attrs) then + { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } + else let res = checkMeta (attrs.meta or {}); in if res != [] then + { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } + else { valid = true; }; + + # Throw an error if trying to evaluate an non-valid derivation + validityCondition = + let v = checkValidity attrs; + in if !v.valid + then throwEvalHelp (removeAttrs v ["valid"]) + else true; + +in + assert validityCondition; + derivationArg diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index ce9beb2bbc6..a5d3c5a8ff5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -15,89 +15,32 @@ let lib = import ../../../lib; in lib.makeOverridable ( , stdenvSandboxProfile ? "" , extraSandboxProfile ? "" -, # The platforms here do *not* correspond to the stage the stdenv is - # used in, but rather the previous one, in which it was built. We - # use the latter two platforms, like a cross compiler, because the - # stand environment is a build tool if you squint at it, and because - # neither of these are used when building stdenv so we know the - # build platform is irrelevant. - hostPlatform, targetPlatform + ## Platform parameters + ## + ## The "build" "host" "target" terminology below comes from GNU Autotools. See + ## its documentation for more information on what those words mean. Note that + ## each should always be defined, even when not cross compiling. + ## + ## For purposes of bootstrapping, think of each stage as a "sliding window" + ## over a list of platforms. Specifically, the host platform of the previous + ## stage becomes the build platform of the current one, and likewise the + ## target platform of the previous stage becomes the host platform of the + ## current one. + ## + +, # The platform on which packages are built. Consists of `system`, a + # string (e.g.,`i686-linux') identifying the most import attributes of the + # build platform, and `platform` a set of other details. + buildPlatform + +, # The platform on which packages run. + hostPlatform + +, # The platform which build tools (especially compilers) build for in this stage, + targetPlatform }: let - inherit (targetPlatform) system; - - # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 - # for why this defaults to false, but I (@copumpkin) want to default it to true soon. - shouldCheckMeta = config.checkMeta or false; - - allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; - - whitelist = config.whitelistedLicenses or []; - blacklist = config.blacklistedLicenses or []; - - ifDarwin = attrs: if system == "x86_64-darwin" then attrs else {}; - - onlyLicenses = list: - lib.lists.all (license: - let l = lib.licenses.${license.shortName or "BROKEN"} or false; in - if license == l then true else - throw ''‘${showLicense license}’ is not an attribute of lib.licenses'' - ) list; - - mutuallyExclusive = a: b: - (builtins.length a) == 0 || - (!(builtins.elem (builtins.head a) b) && - mutuallyExclusive (builtins.tail a) b); - - areLicenseListsValid = - if mutuallyExclusive whitelist blacklist then - assert onlyLicenses whitelist; assert onlyLicenses blacklist; true - else - throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive."; - - hasLicense = attrs: - attrs ? meta.license; - - hasWhitelistedLicense = assert areLicenseListsValid; attrs: - hasLicense attrs && builtins.elem attrs.meta.license whitelist; - - hasBlacklistedLicense = assert areLicenseListsValid; attrs: - hasLicense attrs && builtins.elem attrs.meta.license blacklist; - - allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; - - isUnfree = licenses: lib.lists.any (l: - !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; - - # Alow granular checks to allow only some unfree packages - # Example: - # {pkgs, ...}: - # { - # allowUnfree = false; - # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); - # } - allowUnfreePredicate = config.allowUnfreePredicate or (x: false); - - # Check whether unfree packages are allowed and if not, whether the - # package has an unfree license and is not explicitely allowed by the - # `allowUNfreePredicate` function. - hasDeniedUnfreeLicense = attrs: - !allowUnfree && - hasLicense attrs && - isUnfree (lib.lists.toList attrs.meta.license) && - !allowUnfreePredicate attrs; - - allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []); - allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x; - - hasAllowedInsecure = attrs: - (attrs.meta.knownVulnerabilities or []) == [] || - allowInsecurePredicate attrs || - builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; - - showLicense = license: license.shortName or "unknown"; - defaultNativeBuildInputs = extraBuildInputs ++ [ ../../build-support/setup-hooks/move-docs.sh ../../build-support/setup-hooks/compress-man-pages.sh @@ -106,7 +49,7 @@ let ] # FIXME this on Darwin; see # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369 - ++ lib.optional result.isLinux ../../build-support/setup-hooks/audit-tmpdir.sh + ++ lib.optional hostPlatform.isLinux ../../build-support/setup-hooks/audit-tmpdir.sh ++ [ ../../build-support/setup-hooks/multiple-outputs.sh ../../build-support/setup-hooks/move-sbin.sh @@ -115,272 +58,16 @@ let cc ]; - # `mkDerivation` wraps the builtin `derivation` function to - # produce derivations that use this stdenv and its shell. - # - # See also: - # - # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv - # Details on how to use this mkDerivation function - # - # * https://nixos.org/nix/manual/#ssec-derivation - # Explanation about derivations in general - mkDerivation = - { nativeBuildInputs ? [] - , buildInputs ? [] - - , propagatedNativeBuildInputs ? [] - , propagatedBuildInputs ? [] - - , crossConfig ? null - , meta ? {} - , passthru ? {} - , pos ? null # position used in error messages and for meta.position - , separateDebugInfo ? false - , outputs ? [ "out" ] - , __impureHostDeps ? [] - , __propagatedImpureHostDeps ? [] - , sandboxProfile ? "" - , propagatedSandboxProfile ? "" - , ... } @ attrs: - let - dependencies = [ - (map (drv: drv.nativeDrv or drv) nativeBuildInputs) - (map (drv: drv.crossDrv or drv) buildInputs) - ]; - propagatedDependencies = [ - (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) - (map (drv: drv.crossDrv or drv) propagatedBuildInputs) - ]; - in let - pos' = - if pos != null then - pos - else if attrs.meta.description or null != null then - builtins.unsafeGetAttrPos "description" attrs.meta - else - builtins.unsafeGetAttrPos "name" attrs; - pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»"; - - - remediation = { - unfree = remediate_whitelist "Unfree"; - broken = remediate_whitelist "Broken"; - blacklisted = x: ""; - insecure = remediate_insecure; - unknown-meta = x: ""; - }; - remediate_whitelist = allow_attr: attrs: - '' - a) For `nixos-rebuild` you can set - { nixpkgs.config.allow${allow_attr} = true; } - in configuration.nix to override this. - - b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add - { allow${allow_attr} = true; } - to ~/.config/nixpkgs/config.nix. - ''; - - remediate_insecure = attrs: - '' - - Known issues: - - '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + '' - - You can install it anyway by whitelisting this package, using the - following methods: - - a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to - `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, - like so: - - { - nixpkgs.config.permittedInsecurePackages = [ - "${attrs.name or "«name-missing»"}" - ]; - } - - b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add - ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in - ~/.config/nixpkgs/config.nix, like so: - - { - permittedInsecurePackages = [ - "${attrs.name or "«name-missing»"}" - ]; - } - - ''; - - - throwEvalHelp = { reason , errormsg ? "" }: - throw ('' - Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate. - - '' + ((builtins.getAttr reason remediation) attrs)); - - metaTypes = with lib.types; rec { - # These keys are documented - description = str; - longDescription = str; - branch = str; - homepage = str; - downloadPage = str; - license = either (listOf lib.types.attrs) (either lib.types.attrs str); - maintainers = listOf str; - priority = int; - platforms = listOf str; - hydraPlatforms = listOf str; - broken = bool; - - # Weirder stuff that doesn't appear in the documentation? - version = str; - tag = str; - updateWalker = bool; - executables = listOf str; - outputsToInstall = listOf str; - position = str; - repositories = attrsOf str; - isBuildPythonPackage = platforms; - schedulingPriority = str; - downloadURLRegexp = str; - isFcitxEngine = bool; - isIbusEngine = bool; - }; - - checkMetaAttr = k: v: - if metaTypes?${k} then - if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}" - else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; - checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; - - # Check if a derivation is valid, that is whether it passes checks for - # e.g brokenness or license. - # - # Return { valid: Bool } and additionally - # { reason: String; errormsg: String } if it is not valid, where - # reason is one of "unfree", "blacklisted" or "broken". - checkValidity = attrs: - if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then - { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } - else if hasBlacklistedLicense attrs then - { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } - else if !allowBroken && attrs.meta.broken or false then - { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then - { valid = false; reason = "broken"; errormsg = "is not supported on ‘${result.system}’"; } - else if !(hasAllowedInsecure attrs) then - { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } - else let res = checkMeta (attrs.meta or {}); in if res != [] then - { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } - else { valid = true; }; - - outputs' = - outputs ++ - (if separateDebugInfo then assert targetPlatform.isLinux; [ "debug" ] else []); - - dependencies' = let - justMap = map lib.chooseDevOutputs dependencies; - nativeBuildInputs = lib.elemAt justMap 0 - ++ lib.optional targetPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh; - buildInputs = lib.elemAt justMap 1 - # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`. - ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh; - in [ nativeBuildInputs buildInputs ]; - - propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies; - in - - # Throw an error if trying to evaluate an non-valid derivation - assert let v = checkValidity attrs; - in if !v.valid - then throwEvalHelp (removeAttrs v ["valid"]) - else true; - - lib.addPassthru (derivation ( - (removeAttrs attrs - ["meta" "passthru" "crossAttrs" "pos" - "__impureHostDeps" "__propagatedImpureHostDeps" - "sandboxProfile" "propagatedSandboxProfile"]) - // (let - # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild. - computedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')); - computedPropagatedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies')); - computedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'))); - computedPropagatedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies'))); - in - { - builder = attrs.realBuilder or shell; - args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; - stdenv = result; - system = result.system; - userHook = config.stdenv.userHook or null; - __ignoreNulls = true; - - nativeBuildInputs = lib.elemAt dependencies' 0; - buildInputs = lib.elemAt dependencies' 1; - - propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0; - propagatedBuildInputs = lib.elemAt propagatedDependencies' 1; - } // ifDarwin { - # TODO: remove lib.unique once nix has a list canonicalization primitive - __sandboxProfile = - let profiles = [ extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; - final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); - in final; - __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); - __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [ - "/dev/zero" - "/dev/random" - "/dev/urandom" - "/bin/sh" - ]; - __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; - } // (if outputs' != [ "out" ] then { - outputs = outputs'; - } else { })))) ( - { - overrideAttrs = f: mkDerivation (attrs // (f attrs)); - # The meta attribute is passed in the resulting attribute set, - # but it's not part of the actual derivation, i.e., it's not - # passed to the builder and is not a dependency. But since we - # include it in the result, it *is* available to nix-env for queries. - meta = { } - # If the packager hasn't specified `outputsToInstall`, choose a default, - # which is the name of `p.bin or p.out or p`; - # if he has specified it, it will be overridden below in `// meta`. - # Note: This default probably shouldn't be globally configurable. - # Services and users should specify outputs explicitly, - # unless they are comfortable with this default. - // { outputsToInstall = - let - outs = outputs'; # the value passed to derivation primitive - hasOutput = out: builtins.elem out outs; - in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )]; - } - // meta - # Fill `meta.position` to identify the source location of the package. - // lib.optionalAttrs (pos' != null) - { position = pos'.file + ":" + toString pos'.line; } - ; - inherit passthru; - } // - # Pass through extra attributes that are not inputs, but - # should be made available to Nix expressions using the - # derivation (e.g., in assertions). - passthru); - # The stdenv that we are producing. - result = + stdenv = derivation ( (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) // { - inherit system name; + inherit name; + + # Nix itself uses the `system` field of a derivation to decide where to + # build it. This is a bit confusing for cross compilation. + inherit (buildPlatform) system; builder = shell; @@ -390,7 +77,7 @@ let inherit preHook initialPath shell defaultNativeBuildInputs; } - // ifDarwin { + // lib.optionalAttrs buildPlatform.isDarwin { __sandboxProfile = stdenvSandboxProfile; __impureHostDeps = __stdenvImpureHostDeps; }) @@ -402,6 +89,10 @@ let platforms = lib.platforms.all; }; + inherit buildPlatform hostPlatform targetPlatform; + + inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile; + # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD @@ -412,7 +103,9 @@ let # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; - inherit mkDerivation; + inherit (import ./make-derivation.nix { + inherit lib config stdenv; + }) mkDerivation; # For convenience, bring in the library functions in lib/ so # packages don't have to do that themselves. @@ -431,4 +124,4 @@ let # like curl = if stdenv ? curl then stdenv.curl else ...). // extraAttrs; -in result) +in stdenv) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix new file mode 100644 index 00000000000..31b0428eeb2 --- /dev/null +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -0,0 +1,150 @@ +{ lib, config, stdenv }: + +rec { + # `mkDerivation` wraps the builtin `derivation` function to + # produce derivations that use this stdenv and its shell. + # + # See also: + # + # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv + # Details on how to use this mkDerivation function + # + # * https://nixos.org/nix/manual/#ssec-derivation + # Explanation about derivations in general + mkDerivation = + { nativeBuildInputs ? [] + , buildInputs ? [] + + , propagatedNativeBuildInputs ? [] + , propagatedBuildInputs ? [] + + , crossConfig ? null + , meta ? {} + , passthru ? {} + , pos ? # position used in error messages and for meta.position + (if attrs.meta.description or null != null + then builtins.unsafeGetAttrPos "description" attrs.meta + else builtins.unsafeGetAttrPos "name" attrs) + , separateDebugInfo ? false + , outputs ? [ "out" ] + , __impureHostDeps ? [] + , __propagatedImpureHostDeps ? [] + , sandboxProfile ? "" + , propagatedSandboxProfile ? "" + , ... } @ attrs: + let + dependencies = [ + (map (drv: drv.nativeDrv or drv) nativeBuildInputs) + (map (drv: drv.crossDrv or drv) buildInputs) + ]; + propagatedDependencies = [ + (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) + (map (drv: drv.crossDrv or drv) propagatedBuildInputs) + ]; + in let + + outputs' = + outputs ++ + (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []); + + dependencies' = let + justMap = map lib.chooseDevOutputs dependencies; + nativeBuildInputs = lib.elemAt justMap 0 + ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh; + buildInputs = lib.elemAt justMap 1 + # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`. + ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh; + in [ nativeBuildInputs buildInputs ]; + + propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies; + + derivationArg = + (removeAttrs attrs + ["meta" "passthru" "crossAttrs" "pos" + "__impureHostDeps" "__propagatedImpureHostDeps" + "sandboxProfile" "propagatedSandboxProfile"]) + // (let + # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild. + computedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')); + computedPropagatedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies')); + computedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'))); + computedPropagatedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies'))); + in + { + builder = attrs.realBuilder or stdenv.shell; + args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; + inherit stdenv; + inherit (stdenv) system; + userHook = config.stdenv.userHook or null; + __ignoreNulls = true; + + nativeBuildInputs = lib.elemAt dependencies' 0; + buildInputs = lib.elemAt dependencies' 1; + + propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0; + propagatedBuildInputs = lib.elemAt propagatedDependencies' 1; + } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + # TODO: remove lib.unique once nix has a list canonicalization primitive + __sandboxProfile = + let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; + final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); + in final; + __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); + __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ stdenv.__extraImpureHostDeps ++ [ + "/dev/zero" + "/dev/random" + "/dev/urandom" + "/bin/sh" + ]; + __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; + } // (if outputs' != [ "out" ] then { + outputs = outputs'; + } else { })); + + # The meta attribute is passed in the resulting attribute set, + # but it's not part of the actual derivation, i.e., it's not + # passed to the builder and is not a dependency. But since we + # include it in the result, it *is* available to nix-env for queries. + meta = { } + # If the packager hasn't specified `outputsToInstall`, choose a default, + # which is the name of `p.bin or p.out or p`; + # if he has specified it, it will be overridden below in `// meta`. + # Note: This default probably shouldn't be globally configurable. + # Services and users should specify outputs explicitly, + # unless they are comfortable with this default. + // { outputsToInstall = + let + outs = outputs'; # the value passed to derivation primitive + hasOutput = out: builtins.elem out outs; + in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )]; + } + // attrs.meta or {} + # Fill `meta.position` to identify the source location of the package. + // lib.optionalAttrs (pos != null) + { position = pos.file + ":" + toString pos.line; } + ; + + in + + lib.addPassthru + (derivation (import ./check-meta.nix + { + inherit lib config meta derivationArg; + mkDerivationArg = attrs; + # Nix itself uses the `system` field of a derivation to decide where + # to build it. This is a bit confusing for cross compilation. + inherit (stdenv) system; + })) + ( { + overrideAttrs = f: mkDerivation (attrs // (f attrs)); + inherit meta passthru; + } // + # Pass through extra attributes that are not inputs, but + # should be made available to Nix expressions using the + # derivation (e.g., in assertions). + passthru); +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index c2879d93e17..c475d2d1e92 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -52,8 +52,11 @@ let let thisStdenv = import ../generic { - inherit config extraBuildInputs; name = "stdenv-linux-boot"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config extraBuildInputs; preHook = '' # Don't patch #!/interpreter because it leads to retained @@ -64,9 +67,6 @@ let shell = "${bootstrapTools}/bin/bash"; initialPath = [bootstrapTools]; - hostPlatform = localSystem; - targetPlatform = localSystem; - fetchurlBoot = import ../../build-support/fetchurl/boot.nix { inherit system; }; @@ -102,9 +102,6 @@ let }; in { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = thisStdenv; }; @@ -269,11 +266,11 @@ in # dependency (`nix-store -qR') on bootstrapTools or the first # binutils built. (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = import ../generic rec { + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; inherit config; preHook = '' @@ -286,9 +283,6 @@ in initialPath = ((import ../common-path.nix) {pkgs = prevStage;}); - hostPlatform = localSystem; - targetPlatform = localSystem; - extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 31973c2cdc5..02734f2f3e5 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -81,6 +81,7 @@ let { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }: import ../generic { + buildPlatform = localSystem; hostPlatform = localSystem; targetPlatform = localSystem; @@ -125,8 +126,6 @@ in "i686-solaris" = "/usr/gnu"; "x86_64-solaris" = "/opt/local/gcc47"; }.${system} or "/usr"; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit stdenv; }; @@ -140,9 +139,6 @@ in # First build a stdenv based only on tools outside the store. (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = makeStdenv { inherit (prevStage) cc fetchurl; @@ -152,9 +148,6 @@ in # Using that, build a stdenv that adds the ‘xz’ command (which most systems # don't have, so we mustn't rely on the native environment providing it). (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = makeStdenv { inherit (prevStage.stdenv) cc fetchurl; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 7ab797ce91b..aaf6c523ea4 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -10,10 +10,13 @@ bootStages ++ [ (prevStage: let inherit (prevStage) stdenv; in { - inherit (prevStage) buildPlatform hostPlatform targetPlatform; inherit config overlays; stdenv = import ../generic rec { + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config; preHook = '' @@ -30,8 +33,6 @@ bootStages ++ [ nativeTools = false; nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr"; nativeLibc = true; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit stdenv; inherit (prevStage) binutils coreutils gnugrep; cc = prevStage.gcc.cc; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 896cdd50973..a35e473ec36 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + patchFlags = "-p1 -F3"; + patches = [ ./CVE-2014-8139.diff ./CVE-2014-8140.diff diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix new file mode 100644 index 00000000000..6524bedf939 --- /dev/null +++ b/pkgs/tools/audio/ezstream/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "ezstream-${version}"; + version = "0.6.0"; + + src = fetchurl { + url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${name}.tar.gz"; + sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9"; + }; + + buildInputs = [ libiconv libshout taglib libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A command line source client for Icecast media streaming servers"; + longDescription = '' + Ezstream is a command line source client for Icecast media + streaming servers. It began as the successor of the old "shout" + utility, and has since gained a lot of useful features. + + In its basic mode of operation, it streams media files or data + from standard input without reencoding and thus requires only + very little CPU resources. + ''; + homepage = http://icecast.org/ezstream/; + license = licenses.gpl2; + maintainers = [ maintainers.barrucadu ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 525aa2fec28..d9b01eb5239 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { # This should be fine on all platforms so apply universally patchPhase = "sed -i s/-O1/-O2/ configure"; + postInstall = '' + install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs + ''; + meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 0259af7a63e..929c6690a26 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mergerfs-${version}"; - version = "2.22.1"; + version = "2.23.0"; # not using fetchFromGitHub because of changelog being built with git log src = fetchgit { url = "https://github.com/trapexit/mergerfs"; rev = "refs/tags/${version}"; - sha256 = "12dm64l74wyagbwxsz57p8j3dwl9hgi0j3b6i0pn9m5ar7qrnv00"; + sha256 = "0k4nn0f4c355q7hnni7iia8qi9m0khvyd04hx1hmlrnf0zsi9mfw"; deepClone = true; leaveDotGit = true; }; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 4dd49e02e0e..110125727bf 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -21,15 +21,15 @@ let ''; in buildRustPackage rec { name = "exa-${version}"; - version = "0.6.0"; + version = "0.7.0"; - depsSha256 = "0c1vyl1c67xq18ss0xs5cjdfn892jpwj6ml51dfppzfyns3namm4"; + depsSha256 = "0j320hhf2vqaha137pjj4pyiw6d3p5h3nhy3pl9vna1g5mnl1sn7"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; rev = "v${version}"; - sha256 = "0065gj4pbbppbnwp23s6bb7zlz428nrir00d0kz7axydxk6swhyv"; + sha256 = "0i9psgna2wwv9qyw9cif4qznqiyi16vl763hpm2yr195aj700339"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 6db3278fade..d74e2b4e12a 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - kconfig, kinit + kconfig, kcrash, kinit }: let @@ -21,5 +21,5 @@ mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ kconfig kinit ]; + propagatedBuildInputs = [ kconfig kcrash kinit ]; } diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index af5a45902bb..a1c1eccdd88 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchurl, lib , extra-cmake-modules, kdoctools, wrapGAppsHook -, kconfig, kinit, kpmcore -, kcrash, eject, libatasmart }: +, kconfig, kcrash, kinit, kpmcore +, eject, libatasmart }: let pname = "partitionmanager"; diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index cd872fd966e..a3fdca001d9 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchFromGitHub, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework + baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework }: let @@ -23,7 +23,7 @@ in mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ]; + propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami knewstuff plasma-framework ]; pathsToLink = [ "/etc/xdg/peruse.knsrc"]; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index b879ef002b1..524dc01cbe7 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,24 +1,19 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gx-${version}"; - version = "20160601-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "f84ddf792ceb329e20c857731154798e1ce87314"; + version = "0.12.0"; + rev = "refs/tags/v${version}"; goPackagePath = "github.com/whyrusleeping/gx"; src = fetchgit { inherit rev; url = "https://github.com/whyrusleeping/gx"; - sha256 = "10a6p9ba526jr6m66x3vsa3xsjlnzv7yma8vyp8d0bf0hs44bpih"; + sha256 = "0pvf0j14xnzy01fxilja8xbki0i0g7h7y20jzw74ds5a7ywsdx8r"; }; - prePatch = '' - substituteInPlace tests/lib/random-dep.go \ - --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random" - ''; - goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix index 19372f807c2..c34d142c385 100644 --- a/pkgs/tools/package-management/gx/deps.nix +++ b/pkgs/tools/package-management/gx/deps.nix @@ -1,29 +1,11 @@ [ { - goPackagePath = "github.com/anacrolix/missinggo"; + goPackagePath = "github.com/agl/ed25519"; fetch = { type = "git"; - url = "https://github.com/anacrolix/missinggo"; - rev = "e40875155efce3d98562ca9e265e152c364ada3e"; - sha256 = "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg"; - }; - } - { - goPackagePath = "github.com/anacrolix/sync"; - fetch = { - type = "git"; - url = "https://github.com/anacrolix/sync"; - rev = "812602587b72df6a2a4f6e30536adc75394a374b"; - sha256 = "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l"; - }; - } - { - goPackagePath = "github.com/anacrolix/utp"; - fetch = { - type = "git"; - url = "https://github.com/anacrolix/utp"; - rev = "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0"; - sha256 = "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7"; + url = "https://github.com/agl/ed25519"; + rev = "5312a61534124124185d41f09206b9fef1d88403"; + sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i"; }; } { @@ -31,17 +13,17 @@ fetch = { type = "git"; url = "https://github.com/blang/semver"; - rev = "aea32c919a18e5ef4537bbd283ff29594b1b0165"; - sha256 = "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"; + rev = "4a1e882c79dcf4ec00d2e29fac74b9c8938d5052"; + sha256 = "07rk2jzmppw1v06qvsn11l1mwkyg6y9y06jfik316zq8glfh8b3m"; }; } { - goPackagePath = "github.com/bradfitz/iter"; + goPackagePath = "github.com/btcsuite/btcd"; fetch = { type = "git"; - url = "https://github.com/bradfitz/iter"; - rev = "454541ec3da2a73fc34fd049b19ee5777bf19345"; - sha256 = "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"; + url = "https://github.com/btcsuite/btcd"; + rev = "9822ffad6802d3b902442b727a238230194d961f"; + sha256 = "0mk3qxpn29gsbkvk6rj6jzsw3fn2z51afq890wpk4qz029kvip2h"; }; } { @@ -49,8 +31,26 @@ fetch = { type = "git"; url = "https://github.com/codegangsta/cli"; - rev = "e5bef42c62aa7d25aba4880dc02b7624f01e9e19"; - sha256 = "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"; + rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2"; + sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "1817cd4bea52af76542157eeabd74b057d1a199e"; + sha256 = "0hfxcg87ag0zdfarbymfx2qmhcdzm8br39sxvhfc7n37rqdcsh9n"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "dda3e8acadcc9affc16faf33fbb229db78399245"; + sha256 = "1f1lm6bgwnrd985n1aagqw0bxfx37z71fwfcijiz9k258vj4wlga"; }; } { @@ -58,8 +58,26 @@ fetch = { type = "git"; url = "https://github.com/ipfs/go-ipfs-api"; - rev = "7c354892da3abdaafb6ac576c100b259b1a73dac"; - sha256 = "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"; + rev = "2da86eb64d56571c123c02ae82140c7b4b95f72a"; + sha256 = "1ljlzjig0qv2mjzyk2piid12b4043584qskx6ikbz5i16cnbvqsq"; + }; + } + { + goPackagePath = "github.com/ipfs/go-ipfs-util"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-ipfs-util"; + rev = "f25fcc891281327394bb48000ef0970d11baff2b"; + sha256 = "1a79ggx0ma9ny39kjm0gzicrn541gyis4fn7kmkkfjjfaj8v5l3y"; + }; + } + { + goPackagePath = "github.com/ipfs/go-log"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-log"; + rev = "48d644b006ba26f1793bffc46396e981801078e3"; + sha256 = "0q2bk2s2v626ikm2pjalq4qg4n53yyf1bb81jbljb23iijxrqsbr"; }; } { @@ -71,33 +89,6 @@ sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"; }; } - { - goPackagePath = "github.com/jbenet/go-multiaddr"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-multiaddr"; - rev = "f3dff105e44513821be8fbe91c89ef15eff1b4d4"; - sha256 = "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7"; - }; - } - { - goPackagePath = "github.com/jbenet/go-multiaddr-net"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-multiaddr-net"; - rev = "d4cfd691db9f50e430528f682ca603237b0eaae0"; - sha256 = "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90"; - }; - } - { - goPackagePath = "github.com/jbenet/go-multihash"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-multihash"; - rev = "e8d2374934f16a971d1e94a864514a21ac74bf7f"; - sha256 = "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp"; - }; - } { goPackagePath = "github.com/jbenet/go-os-rename"; fetch = { @@ -108,21 +99,12 @@ }; } { - goPackagePath = "github.com/jbenet/go-random"; + goPackagePath = "github.com/jbenet/goprocess"; fetch = { type = "git"; - url = "https://github.com/jbenet/go-random"; - rev = "384f606e91f542a98e779e652eed88051618f0f7"; - sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; - }; - } - { - goPackagePath = "github.com/jbenet/go-random-files"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-random-files"; - rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; - sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; + url = "https://github.com/jbenet/goprocess"; + rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; + sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; }; } { @@ -134,13 +116,139 @@ sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; }; } + { + goPackagePath = "github.com/libp2p/go-floodsub"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-floodsub"; + rev = "a922092abea58f07c32eabe303ec817569578740"; + sha256 = "0wbi67jyfvrzfsb9lkrhjgg9k66yk5sww7nvihhc9rdnblygigs3"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-crypto"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-crypto"; + rev = "e89e1de117dd65c6129d99d1d853f48bc847cf17"; + sha256 = "1lb0qzspx99sqbdxbf9dczwcmmirl4h26q9x3v6ris253zmqcbyw"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-host"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-host"; + rev = "c1fc482de113ce7e4cdc9453a1c1c0fe4164d985"; + sha256 = "1hiz5j64s248vml7i4gwjvz59g7l08zjfklhrbmk0cjxwhx9ypy0"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-interface-conn"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-interface-conn"; + rev = "95afdbf0c900237f3b9104f1f7cfd3d56175a241"; + sha256 = "0dv0jc08hfzb8gsi14c2ivancq7pxs8d482l4rw89mg04m2pgnaa"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-net"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-net"; + rev = "2680a9894c7aabada540f728a53d7c1a16a1a44a"; + sha256 = "1k44dz2dk7ahlfls6vk747jy8kbxmjhqyni8zw2wiz6sfm5hyw10"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-peer"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-peer"; + rev = "166a39e33e7a2a47a4bf999264f254ecaa4fe232"; + sha256 = "0kgv1n2c8rfz92vk014sqm1bla7a99w18ydyphjjhc96fmlbrzgl"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-peerstore"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-peerstore"; + rev = "744a149e48eb42e032540507c8545d12cc3b7f6f"; + sha256 = "1bcmqkdlvvxdz9dbqrcfmvhx0wnnk94fb2yl9ys1nx7mnqgl64y8"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-protocol"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-protocol"; + rev = "40488c03777c16bfcd65da2f675b192863cbc2dc"; + sha256 = "1mvhi8pdfyn3lb1j1y4iz2mggnf0dz7ccbmrbij739v6cpjfwwbb"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-transport"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-transport"; + rev = "5d3cb5861b59c26052a5fe184e45c381ec17e22d"; + sha256 = "1v63gavw98f6hs151mqk0bbdl46a9ci9m2pcx807wxdsmfphynar"; + }; + } + { + goPackagePath = "github.com/libp2p/go-maddr-filter"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-maddr-filter"; + rev = "90aacb5ee155f0d6f3fa8b34d775de842606c0b1"; + sha256 = "0ijs599hppj78dg2v7rcglqs82pysygq84yabpis5b99fjp9bay0"; + }; + } { goPackagePath = "github.com/mitchellh/go-homedir"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "1111e456ffea841564ac0fa5f69c26ef44dafec9"; - sha256 = "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multiaddr"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multiaddr"; + rev = "33741da7b3f5773a599d4a03c333704fc560ef34"; + sha256 = "0idhv960k68jvh0frhh28dw46p527m2g67rjwjh6r5va5sd8qjcd"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multiaddr-net"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multiaddr-net"; + rev = "a7b93d11855f04f56908e1385991eb6a400fcc43"; + sha256 = "1q0d8asxxhxhm774xn29n1x6zni6pmm78lvm3652ipyj026y243k"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multihash"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multihash"; + rev = "a52a6a4768da72eba89ea7f59f70e9d42ddd3072"; + sha256 = "0r6fmzvg4vjwc5wzfqn7jjxndcw8n0galdx6f524yd9bcfdlph5b"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multistream"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multistream"; + rev = "b8f1996688ab586031517919b49b1967fca8d5d9"; + sha256 = "0y2hl78lmnd0rbryfmscgxa6kmjdfz00pz60ymhg8k4cifqai0x2"; }; } { @@ -148,8 +256,26 @@ fetch = { type = "git"; url = "https://github.com/sabhiram/go-git-ignore"; - rev = "228fcfa2a06e870a3ef238d54c45ea847f492a37"; - sha256 = "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"; + rev = "87c28ffedb6cb7ff29ae89e0440e9ddee0d95a9e"; + sha256 = "1qysvwjvbzq1wms09dm0sban58xq22bbkwpd7qnk28r99g6267rl"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "0d12bf811670bf6a1a63828dfbd003eded177fce"; + sha256 = "0fv74n0cvgnxpfd04xyiry6ii1ag7mhwwk0kwplpvnbwi8y9yq1x"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-logging"; + rev = "0457bb6b88fc1973573aaf6b5145d8d3ae972390"; + sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn"; }; } { @@ -166,8 +292,26 @@ fetch = { type = "git"; url = "https://github.com/whyrusleeping/json-filter"; - rev = "e9937f5649231265a56d0a419f062530425401a1"; - sha256 = "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"; + rev = "ff25329a9528f01c5175414f16cc0a6a162a5b8b"; + sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/mafmt"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/mafmt"; + rev = "15300f9d3a2d71db61951a8705d5ea8878764837"; + sha256 = "0fiwrj8pla9y8q0m4ifyrh8gacmrz278h2zihdbqbk2b17b002yr"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/progmeter"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/progmeter"; + rev = "974d8fe8cd87585865b1370184050e89d606e817"; + sha256 = "05njc5minpaxzwb6yg5zjr52ar4ar7qkiml45zsrp2ny92dyx07j"; }; } { @@ -188,13 +332,31 @@ sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"; }; } + { + goPackagePath = "github.com/whyrusleeping/timecache"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/timecache"; + rev = "cfcb2f1abfee846c430233aef0b630a946e0a5a6"; + sha256 = "0nnra7ivq7cj34rj2ib8hgfdpik3smr1hy7x18svhfin8z1xsj2s"; + }; + } { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "f3241ce8505855877cc8a9717bd61a0f7c4ea83c"; - sha256 = "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"; + rev = "a48ac81e47fd6f9ed1258f3b60ae9e75f93cb7ed"; + sha256 = "0zpgwc362rghm3fv0s964dqmw6krixzxww2qxhnik9hvf7srapjd"; + }; + } + { + goPackagePath = "leb.io/hashland"; + fetch = { + type = "git"; + url = "https://github.com/tildeleb/hashland"; + rev = "e13accbe55f7fa03c73c74ace4cca4c425e47260"; + sha256 = "1ygfp7kjnm964w2bv61bsyxpw5y6vy6k4pra1lhd5r3nhlxgs31g"; }; } ] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index aa5acfa22d5..6a9589f9ac2 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -5,15 +5,15 @@ buildGoPackage rec { name = "gx-go-${version}"; - version = "20160611-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "639fc0be1a153c59d8946904cceecf0b66ab2944"; + version = "1.5.0"; + rev = "refs/tags/v${version}"; goPackagePath = "github.com/whyrusleeping/gx-go"; src = fetchgit { inherit rev; url = "https://github.com/whyrusleeping/gx-go"; - sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l"; + sha256 = "0bg4h5lzs293qmlsr9n257vjpr5w6bxb4ampb25gsn3fgy3rvsis"; }; goDeps = ../deps.nix; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index daa02497d0f..2d663175ec9 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,23 +1,28 @@ -{ stdenv, pythonPackages, fetchurl, makeWrapper, pandoc +{ stdenv, python3Packages, fetchurl, makeWrapper, pandoc , coreutils, iptables, nettools, openssh, procps }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "sshuttle-${version}"; - version = "0.78.0"; + version = "0.78.3"; src = fetchurl { - sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b"; + sha256 = "12xyq5h77b57cnkljdk8qyjxzys512b73019s20x6ck5brj1m8wa"; url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; patches = [ ./sudo.patch ]; - propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ]; - nativeBuildInputs = [ makeWrapper pandoc pythonPackages.setuptools_scm ]; + nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ]; buildInputs = [ coreutils openssh ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; + checkInputs = with python3Packages; [ mock pytest pytestrunner ]; + + # Tests only run with Python 3. Server-side Python 2 still works if client + # uses Python 3, so it should be fine. + doCheck = true; + postInstall = let mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); in '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6961e85f829..b62908e2798 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -545,6 +545,8 @@ with pkgs; enpass = callPackage ../tools/security/enpass { }; + ezstream = callPackage ../tools/audio/ezstream { }; + genymotion = callPackage ../development/mobile/genymotion { }; grc = callPackage ../tools/misc/grc { }; @@ -2069,6 +2071,8 @@ with pkgs; git-lfs = callPackage ../applications/version-management/git-lfs { }; + git-ftp = callPackage ../development/tools/git-ftp { }; + git-series = callPackage ../development/tools/git-series { }; git-up = callPackage ../applications/version-management/git-up { }; @@ -5030,6 +5034,8 @@ with pkgs; fish-foreign-env = callPackage ../shells/fish-foreign-env { }; + ion = callPackage ../shells/ion { }; + mksh = callPackage ../shells/mksh { }; oh = callPackage ../shells/oh { }; @@ -6038,8 +6044,14 @@ with pkgs; inherit (beam.interpreters) erlang erlang_odbc erlang_javac erlang_odbc_javac - erlangR17 erlangR18 erlangR19 erlangR20 - erlang_basho_R16B02 elixir lfe; + elixir elixir_1_5_rc elixir_1_4 elixir_1_3 + lfe + erlangR16 erlangR16_odbc + erlang_basho_R16B02 erlang_basho_R16B02_odbc + erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac + erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac + erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac + erlangR20 erlangR20_odbc erlangR20_javac erlangR20_odbc_javac; inherit (beam.packages.erlang) rebar rebar3-open rebar3 @@ -6119,7 +6131,8 @@ with pkgs; luaPackages = lua52Packages; - luajit = callPackage ../development/interpreters/luajit {}; + inherit (callPackages ../development/interpreters/luajit {}) + luajit luajit_2_0 luajit_2_1; luarocks = luaPackages.luarocks; @@ -6568,7 +6581,7 @@ with pkgs; pythonPackages = python2Packages; }; buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view ]); + buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view ]); buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; @@ -11321,6 +11334,7 @@ with pkgs; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; + prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; @@ -13100,6 +13114,8 @@ with pkgs; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; + ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {}; + tzdata = callPackage ../data/misc/tzdata { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; @@ -14550,8 +14566,6 @@ with pkgs; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; - - configFile = config.i3.configFile or null; }; i3-gaps = callPackage ../applications/window-managers/i3/gaps.nix { }; @@ -15061,9 +15075,7 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocaml = ocamlPackages_4_01_0.ocaml; - }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; MMA = callPackage ../applications/audio/MMA { }; @@ -15724,7 +15736,7 @@ with pkgs; }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils; + inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; @@ -17927,6 +17939,10 @@ with pkgs; abella = callPackage ../applications/science/logic/abella {}; + acgtk = callPackage ../applications/science/logic/acgtk { + ocamlPackages = ocamlPackages_4_03; + }; + alt-ergo = callPackage ../applications/science/logic/alt-ergo { ocamlPackages = ocamlPackages_4_02; }; @@ -18095,6 +18111,8 @@ with pkgs; picosat = callPackage ../applications/science/logic/picosat {}; + libpoly = callPackage ../applications/science/logic/poly/default.nix {}; + prooftree = (with ocamlPackages_4_01_0; callPackage ../applications/science/logic/prooftree { camlp5 = camlp5_transitional; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index acdbea67332..8d01ad36139 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -56,7 +56,8 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR19.elixir`. - elixir = packages.erlang.elixir; + inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3; + lfe = packages.erlang.lfe; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 71aef7544dd..f33b397958c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -311,24 +311,23 @@ let lrexlib = buildLuaPackage rec { name = "lrexlib-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = fetchzip { - url = "https://github.com/rrthomas/lrexlib/archive/150c251be57c4e569da0f48bf6b01fbca97179fe.zip"; - sha256 = "0acb3258681bjq61piz331r99bdff6cnkjaigq5phg3699iz5h75"; + url = "https://github.com/rrthomas/lrexlib/archive/rel-2-8-0.zip"; + sha256 = "1c62ny41b1ih6iddw5qn81gr6dqwfffzdp7q6m8x09zzcdz78zhr"; }; buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ]; buildPhase = let - luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua"; + luaVariable = ''LUA_PATH="${luastdlib}/share/lua/${lua.luaversion}/?/init.lua;${luastdlib}/share/lua/${lua.luaversion}/?.lua"''; - pcreVariable = "PCRE_DIR=${pcre.dev}"; + pcreVariable = "PCRE_DIR=${pcre.out} PCRE_INCDIR=${pcre.dev}/include"; onigVariable = "ONIG_DIR=${oniguruma}"; gnuVariable = "GNU_INCDIR=${gnulib}/lib"; treVariable = "TRE_DIR=${tre}"; posixVariable = "POSIX_DIR=${glibc.dev}"; in '' - sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \ - -i Makefile + sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' -i Makefile ${luaVariable} make ''; @@ -341,7 +340,6 @@ let homepage = "https://github.com/lua-stdlib/lua-stdlib/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; - broken = true; }; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fea8fe05bab..d7a6c6cb63d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -15,8 +15,6 @@ let buildOcaml = callPackage ../build-support/ocaml { }; - acgtk = callPackage ../applications/science/logic/acgtk { }; - alcotest = callPackage ../development/ocaml-modules/alcotest {}; angstrom = callPackage ../development/ocaml-modules/angstrom { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e772e40620..0bd8b0c5b0d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10719,16 +10719,16 @@ let self = _self // overrides; _self = with self; { }; PDFAPI2 = buildPerlPackage rec { - name = "PDF-API2-2.030"; + name = "PDF-API2-2.033"; src = fetchurl { url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz"; - sha256 = "a802c25c1f00b093778223fc7aea94ebd87a9abdb915151746b8ee5d4a358769"; + sha256 = "9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0"; }; + buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; meta = { description = "Facilitates the creation and modification of PDF files"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ maintainers.rycee ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 232f0693ab9..1ad11bbd4cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13512,15 +13512,15 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; mechanize = buildPythonPackage (rec { - name = "mechanize-0.2.5"; + name = "mechanize-0.3.5"; disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/m/mechanize/${name}.tar.gz"; - sha256 = "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf"; + sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl"; }; - propagatedBuildInputs = with self; [ clientform ]; + propagatedBuildInputs = with self; [ clientform html5lib ]; doCheck = false; @@ -25169,30 +25169,7 @@ in { }; }; - virtualenv = buildPythonPackage rec { - name = "virtualenv-15.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/virtualenv/${name}.tar.gz"; - sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d"; - }; - - pythonPath = [ self.recursivePthLoader ]; - - patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; - - propagatedBuildInputs = with self; [ ]; - - # Tarball doesn't contain tests - doCheck = false; - - meta = { - description = "A tool to create isolated Python environments"; - homepage = http://www.virtualenv.org; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - }; - }; + virtualenv = callPackage ../development/python-modules/virtualenv { }; virtualenv-clone = buildPythonPackage rec { name = "virtualenv-clone-0.2.5"; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 2a8f4ff4b3c..617fa0c30ce 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -18,30 +18,6 @@ , # Use to reevaluate Nixpkgs; a dirty hack that should be removed nixpkgsFun - ## Platform parameters - ## - ## The "build" "host" "target" terminology below comes from GNU Autotools. See - ## its documentation for more information on what those words mean. Note that - ## each should always be defined, even when not cross compiling. - ## - ## For purposes of bootstrapping, think of each stage as a "sliding window" - ## over a list of platforms. Specifically, the host platform of the previous - ## stage becomes the build platform of the current one, and likewise the - ## target platform of the previous stage becomes the host platform of the - ## current one. - ## - -, # The platform on which packages are built. Consists of `system`, a - # string (e.g.,`i686-linux') identifying the most import attributes of the - # build platform, and `platform` a set of other details. - buildPlatform - -, # The platform on which packages run. - hostPlatform - -, # The platform which build tools (especially compilers) build for in this stage, - targetPlatform - ## Other parameters ## @@ -69,10 +45,10 @@ , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for files # in standard system directories (/usr/include, etc.) - noSysDirs ? buildPlatform.system != "x86_64-freebsd" - && buildPlatform.system != "i686-freebsd" - && buildPlatform.system != "x86_64-solaris" - && buildPlatform.system != "x86_64-kfreebsd-gnu" + noSysDirs ? stdenv.buildPlatform.system != "x86_64-freebsd" + && stdenv.buildPlatform.system != "i686-freebsd" + && stdenv.buildPlatform.system != "x86_64-solaris" + && stdenv.buildPlatform.system != "x86_64-kfreebsd-gnu" , # The configuration attribute set config @@ -98,19 +74,18 @@ let // { recurseForDerivations = false; }; __targetPackages = (if __targetPackages == null then self else __targetPackages) // { recurseForDerivations = false; }; - inherit stdenv - buildPlatform hostPlatform targetPlatform; + inherit stdenv; }; # The old identifiers for cross-compiling. These should eventually be removed, # and the packages that rely on them refactored accordingly. platformCompat = self: super: let - # TODO(@Ericson2314) this causes infinite recursion - #inherit (self) buildPlatform hostPlatform targetPlatform; + inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; in { stdenv = super.stdenv // { - inherit (buildPlatform) platform; + inherit (super.stdenv.buildPlatform) platform; }; + inherit buildPlatform hostPlatform targetPlatform; inherit (buildPlatform) system platform; };