MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into staging

Browse source 
Hydra: ?compare=1415011
This commit is contained in:
Vladimír Čunát 2017-12-01 09:18:58 +01:00
commit 9f8c3f77ea
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
54 changed files with 1459 additions and 1369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/package-notes.xml
View file

@ -667,11 +667,13 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
<section xml:id="sec-weechat">
<title>Weechat</title>
<para>
Weechat can currently be configured to include your choice of plugins.
To make use of this functionality, install an expression that overrides its configuration such as
Weechat can be configured to include your choice of plugins, reducing its
closure size from the default configuration which includes all available
plugins. To make use of this functionality, install an expression that
overrides its configuration such as
<programlisting>weechat.override {configure = {availablePlugins, ...}: {
plugins = with availablePlugins; [ python perl ];
}
plugins = with availablePlugins; [ python perl ];
}
}</programlisting>
</para>
<para>

3
nixos/modules/config/pulseaudio.nix
View file

@ -101,7 +101,8 @@ in {
each user that tries to use the sound system. The server runs
with user privileges. This is the recommended and most secure
way to use PulseAudio. If true, one system-wide PulseAudio
server is launched on boot, running as the user "pulse".
server is launched on boot, running as the user "pulse", and
only users in the "audio" group will have access to the server.
Please read the PulseAudio documentation for more details.
'';
};

4
nixos/modules/services/web-apps/nexus.nix
View file

@ -11,7 +11,7 @@ in
{
options = {
services.nexus = {
enable = mkEnableOption "SonarType Nexus3 OSS service";
enable = mkEnableOption "Sonatype Nexus3 OSS service";
user = mkOption {
type = types.str;
@ -54,7 +54,7 @@ in
users.extraGroups."${cfg.group}" = {};
systemd.services.nexus = {
description = "SonarType Nexus3";
description = "Sonatype Nexus3";
wantedBy = [ "multi-user.target" ];

25
nixos/modules/services/x11/xserver.nix
View file

@ -578,6 +578,22 @@ in
target = "X11/xkb";
}
])
# localectl looks into 00-keyboard.conf
++ [
{
text = ''
Section "InputClass"
Identifier "Keyboard catchall"
MatchIsKeyboard "on"
Option "XkbModel" "${cfg.xkbModel}"
Option "XkbLayout" "${cfg.layout}"
Option "XkbOptions" "${cfg.xkbOptions}"
Option "XkbVariant" "${cfg.xkbVariant}"
EndSection
'';
target = "X11/xorg.conf.d/00-keyboard.conf";
}
]
# Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in
[{
@ -697,15 +713,6 @@ in
${cfg.monitorSection}
EndSection
Section "InputClass"
Identifier "Keyboard catchall"
MatchIsKeyboard "on"
Option "XkbModel" "${cfg.xkbModel}"
Option "XkbLayout" "${cfg.layout}"
Option "XkbOptions" "${cfg.xkbOptions}"
Option "XkbVariant" "${cfg.xkbVariant}"
EndSection
# Additional "InputClass" sections
${flip concatMapStrings cfg.inputClassSections (inputClassSection: ''
Section "InputClass"

3
nixos/modules/virtualisation/amazon-image.nix
View file

@ -152,5 +152,8 @@ let cfg = config.ec2; in
environment.systemPackages = [ pkgs.cryptsetup ];
boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
# EC2 has its own NTP server provided by the hypervisor
networking.timeServers = [ "169.254.169.123" ];
};
}

16
pkgs/applications/audio/mhwaveedit/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk2, libjack2, ladspaH
{ stdenv, fetchurl, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
, vorbis-tools }:
@ -7,12 +7,18 @@ stdenv.mkDerivation rec {
version = "1.4.23";
src = fetchurl {
url = "http://download.gna.org/mhwaveedit/${name}.tar.bz2";
sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3";
url = "https://github.com/magnush/mhwaveedit/archive/v${version}.tar.gz";
sha256 = "1lvd54d8kpxwl4gihhznx1b5skhibz4vfxi9k2kwqg808jfgz37l";
};
buildInputs = [ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile
pkgconfig libpulseaudio makeWrapper ];
nativeBuildInputs = [ autoreconfHook ];
preAutoreconf = "(cd docgen && sh gendocs.sh)";
buildInputs = [
SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile
pkgconfig libpulseaudio makeWrapper
];
configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";

44
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View file

@ -755,10 +755,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
version = "1.4";
version = "1.4.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.4.tar";
sha256 = "0fzsq1wdkb94dk67ligdwc7kyl0x9bifgl2qvvf0hsj4zws4pgjg";
url = "https://elpa.gnu.org/packages/el-search-1.4.0.4.tar";
sha256 = "1l3wb0g6ipyi8yimxah0z6r83376l22pb2s9ba6kxfmhsq5wyc8a";
};
packageRequires = [ emacs stream ];
meta = {
@ -848,10 +848,10 @@
}) {};
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
pname = "exwm";
version = "0.15";
version = "0.16";
src = fetchurl {
url = "https://elpa.gnu.org/packages/exwm-0.15.tar";
sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg";
url = "https://elpa.gnu.org/packages/exwm-0.16.tar";
sha256 = "0c4w5k9lzqj8yzhdqipdb4fs7ld2qklc6s137104jnfdvmrwcv2i";
};
packageRequires = [ xelb ];
meta = {
@ -929,6 +929,20 @@
license = lib.licenses.free;
};
}) {};
gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gle-mode";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gle-mode-1.1.el";
sha256 = "0p9glalhkf8i4486pjwvrb9z4lqxl6jcqfk6jrjl6b1xi72xmdi0";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/gle-mode.html";
license = lib.licenses.free;
};
}) {};
gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "gnome-c-style";
version = "0.1";
@ -945,10 +959,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar";
sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5";
url = "https://elpa.gnu.org/packages/gnorb-1.3.2.tar";
sha256 = "054z6bnfkf7qkgc9xynhzy9xrz780x4csj1r206jhslygjrlf1sj";
};
packageRequires = [ cl-lib ];
meta = {
@ -1053,10 +1067,10 @@
}) {};
hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "hyperbole";
version = "7.0.0";
version = "7.0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hyperbole-7.0.0.tar";
sha256 = "07cy40yfxwka1r6i01pgrf9a3n9ms5xw2x486jd803dhfkm3113b";
url = "https://elpa.gnu.org/packages/hyperbole-7.0.2.tar";
sha256 = "1hgwa740941a9s5wf1cqf76h3af8qbiiw9sc76biz6m3vx0hy1zs";
};
packageRequires = [ emacs ];
meta = {
@ -1570,10 +1584,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20171120";
version = "20171127";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20171120.tar";
sha256 = "0hxy061g1qd77pvx8mq5rb9avx139x4z5nmjhdq518xhg7kxmq6a";
url = "https://elpa.gnu.org/packages/org-20171127.tar";
sha256 = "18a77yzfkx7x1pckc9c274b2fpswrcqz19nansvbqdr1harzvd20";
};
packageRequires = [];
meta = {

2
pkgs/applications/editors/emacs-modes/elpa-packages.nix
View file

@ -36,6 +36,8 @@ self:
};
overrides = {
# upstream issue: missing footer
ebdb-i18n-chn = markBroken super.ebdb-i18n-chn;
el-search = markBroken super.el-search; # requires emacs-25
iterators = markBroken super.iterators; # requires emacs-25
midi-kbd = markBroken super.midi-kbd; # requires emacs-25

1183
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View file

File diff suppressed because it is too large Load diff

12
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file

@ -66,6 +66,9 @@ self:
# upstream issue: missing file header
elmine = markBroken super.elmine;
# upstream issue: missing dependency redshank
emr = markBroken super.emr;
ess-R-data-view = super.ess-R-data-view.override {
inherit (self.melpaPackages) ess ctable popup;
};
@ -74,6 +77,12 @@ self:
inherit (self.melpaPackages) ess popup;
};
# upstream issue: missing dependency highlight
evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
# upstream issue: missing dependency highlight
floobits = markBroken super.floobits;
# missing OCaml
flycheck-ocaml = markBroken super.flycheck-ocaml;
@ -147,6 +156,9 @@ self:
# upstream issue: missing file footer
seoul256-theme = markBroken super.seoul256-theme;
# upstream issue: missing dependency highlight
sonic-pi = markBroken super.sonic-pi;
spaceline = super.spaceline.override {
inherit (self.melpaPackages) powerline;
};

300
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View file

@ -527,12 +527,12 @@
ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ac-octave";
version = "0.6";
version = "0.7";
src = fetchFromGitHub {
owner = "coldnew";
repo = "ac-octave";
rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c";
sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih";
rev = "6d09b94a86f43de84c60e9a699b5e1be61c0f138";
sha256 = "1kg5q0bw0ymynsn3j7bjavb6wr8b0bjwm6jfj254g80y1inn4bp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave";
@ -548,12 +548,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
version = "1.8.1";
version = "1.9";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
rev = "16e6647115d848085a99e77a21a3db51bec4a288";
sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@ -569,12 +569,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
version = "1.8.1";
version = "1.9";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
rev = "16e6647115d848085a99e77a21a3db51bec4a288";
sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@ -611,12 +611,12 @@
ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ac-rtags";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@ -1648,12 +1648,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
version = "0.5.4";
version = "0.6.4";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43";
sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m";
rev = "86b198afd03f2baffb1efe24c7a89e71100356ea";
sha256 = "1320zdv6q1cnnvl8s25ymjvd3kz2an98bicansq5bhf413n7fhgb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@ -2722,6 +2722,27 @@
license = lib.licenses.free;
};
}) {};
benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "benchmark-init";
version = "1.0";
src = fetchFromGitHub {
owner = "dholm";
repo = "benchmark-init-el";
rev = "7a0f263282bbc86b01b662636306f22813082647";
sha256 = "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0/recipes/benchmark-init";
sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
name = "benchmark-init";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/benchmark-init";
license = lib.licenses.free;
};
}) {};
benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "benchstat";
@ -4604,12 +4625,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362";
sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l";
rev = "49862bfdd1540d443d278fadef16a83388b360cb";
sha256 = "0phpfsl00d39gp26mbf1n7r2210gk2407pqj3bng50sbip568jmp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@ -4688,12 +4709,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
version = "3.10.0pre5";
version = "3.10.0";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
rev = "78f5d571e4b07cc71d44c78ff36a335693298ccb";
sha256 = "1wrbpcfmvhmamxbv7iar6w29i7axzi1im99xd4vrhy4fc1rkk566";
rev = "7746fdb2fe0177341aadeafec2ae73aa08ddfaf6";
sha256 = "0byicha5rfcgx644hh9hvcy7z9q3kbkd0f4b33bcw8jd20pvgmk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -5423,12 +5444,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
version = "1.8.1";
version = "1.9";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
rev = "16e6647115d848085a99e77a21a3db51bec4a288";
sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@ -5492,12 +5513,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@ -7591,12 +7612,12 @@
docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild {
pname = "docker";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c";
sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz";
rev = "9ffeff244318ed119279d0a44784b7f690d1393d";
sha256 = "13c7x9pf6690w8l1jqnjf0bi9np9ndzmw1n6imy9cks8bpqbkdyd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@ -7743,6 +7764,27 @@
license = lib.licenses.free;
};
}) {};
dotenv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dotenv-mode";
version = "0.2.1";
src = fetchFromGitHub {
owner = "preetpalS";
repo = "emacs-dotenv-mode";
rev = "8d45b98beb04f486eb13d71765589e7dccb8ffa9";
sha256 = "00hm097m1jn3pb6k3r2jhkhn1zaf6skcwv1v4dxlvdx8by1md49q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fc022c54b90933e70dcedb6a85167c2d9d7ba79/recipes/dotenv-mode";
sha256 = "1lwfzfri6vywcjkc9wassrz0rdrg0kvljxsm6b4smlnphp6pdbbs";
name = "dotenv-mode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/dotenv-mode";
license = lib.licenses.free;
};
}) {};
downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "downplay-mode";
@ -8165,12 +8207,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
version = "2.1.17";
version = "2.3.18";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
rev = "6fcbdcbbbfeb3939d2bd3848f83fe7c702294ad8";
sha256 = "0g486p9rhjc10mywxz7wizqwqcmi0wm7j4igxi85002ls958m7sm";
rev = "e4dc1057b02b6736221936e66c188cf71c01916d";
sha256 = "0knld86pl2im9mjy4s7mxxibdyc4sq9vhxg4jrndyrmldpjya4my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -8648,12 +8690,12 @@
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egison-mode";
version = "3.7.3";
version = "3.7.9";
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
rev = "269e2e0c38d8ac0eef636954ebfd980b93be4438";
sha256 = "1v7rsp24lhryc5swi1415vmvgzgcrx997kyiqr7qsk5nvzxxfzw3";
rev = "82f6ee43b8e35e6d04882d9c9942a22746fde0f1";
sha256 = "1scxkgq4ij33306fjydwcqs69x5hpfw9l52z1xcprg51s23f2hgh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@ -10212,12 +10254,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
version = "20.1.6";
version = "20.1.7";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
rev = "f021a71ad8ffd2d1f5548927944d2b08935511d1";
sha256 = "05fb4cxsz1q0vpfjdzga7ghmr8fhlk4b93d1768wibhc3q3xqk2c";
rev = "2302ea8ca97b8a9075e9234d15430c47d3a115c8";
sha256 = "0sbxl10d76bm7awxb9s07l9815jiwfg78bps07xj2ircxdr08pls";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -10694,12 +10736,12 @@
esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esxml";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "tali713";
repo = "esxml";
rev = "08fcc5d76abb90c194e181f267cf1d2a149b7a7c";
sha256 = "034lxfqn5yh78hz7i568vw8kyv3hlb699z2d1dffjiigc1lblgip";
rev = "5548ceba17deae0c3c6d0092672edc4de3c75ce3";
sha256 = "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
@ -11051,12 +11093,12 @@
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
version = "2.2.3";
version = "2.2.5";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
rev = "ceb13ad1b34eb0debe2472c024841bdddce9e593";
sha256 = "1wal8kwz1gx0cw1a91rf0d9wl490kjiilv6kwd779zf5041hnhwf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@ -11534,12 +11576,12 @@
exato = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
melpaBuild {
pname = "exato";
version = "0.0.3";
version = "0.0.5";
src = fetchFromGitHub {
owner = "ninrod";
repo = "exato";
rev = "082a2f7bb0afe38f5faede87d306049239d8eb95";
sha256 = "0gzyadh6bwzh6qkji0iijwld3l6p30jd8wfhw3ps4gg55w9ymb97";
rev = "ba21cd2c8d0588e1c70ba89ebad6df247605e03f";
sha256 = "12xqysbdnkvz220qf0jz2v40809hcmdmga10ac74yhg00h25nll6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/939efbcb9b40a2df5ef14e653fb242a8e37c72f9/recipes/exato";
@ -11701,12 +11743,12 @@
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
version = "0.7.5";
version = "0.7.7";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "eyebrowse";
rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20";
sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn";
rev = "7294ed5fbf5f38407b599a10a335b8c4ec15a8d5";
sha256 = "1lhpf88042mg9q328w2d328ka9pild4ppdynbn3rsib9zgxp8waq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@ -11890,12 +11932,12 @@
faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faust-mode";
version = "0.3";
version = "0.4";
src = fetchFromGitHub {
owner = "magnetophon";
repo = "emacs-faust-mode";
rev = "5e7390479d6f4c12186b39fd5c642050e1c62e40";
sha256 = "1g3xzzcnswh03plmrhcn6ib68kcx5b37af3lqfbfa6s0rwwldxap";
rev = "85f67bc4daabe6fd8dc6f5195c470716b543faa1";
sha256 = "0rmq6ca75x47hk2bpsk1j2ja62kpplgyanpiqq4hk6q259rd4lyv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode";
@ -11908,26 +11950,6 @@
license = lib.licenses.free;
};
}) {};
faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faustine";
version = "0.3";
src = fetchgit {
url = "https://bitbucket.org/yassinphilip/faustine";
rev = "43cf31284eabf0d831f8185a5ed217e56fdc2023";
sha256 = "1v78raszh8scac5m04g10rrc9cdflhgmkpbbqpf28zxk3dxcjpxm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine";
sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s";
name = "faustine";
};
packageRequires = [ emacs faust-mode ];
meta = {
homepage = "https://melpa.org/#/faustine";
license = lib.licenses.free;
};
}) {};
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
@ -12036,12 +12058,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
version = "5.4.4";
version = "5.4.5";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
rev = "8eedc930ec7fb187ebc3cec284e213054545db09";
sha256 = "0b8j1i1bshd4774c581lkc55vz4waz1c10pcdxa2vwgiaccjjnmz";
rev = "9e308e69883cb43e136a2e9d4f0db495b457b82d";
sha256 = "0bzbqm8wq8gbz0a18d35ksv0yf65giwcdxhrqzklsxgn9v7p73b8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@ -12946,12 +12968,12 @@
flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
melpaBuild {
pname = "flycheck-rtags";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@ -13828,12 +13850,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
rev = "37289bb68f01dd49b1192032ade6b0741d024a54";
sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5";
rev = "5c63d2f199e96bdf8fd60d375b2b6e305a5f9017";
sha256 = "0vxizl4pr0668b1d94wrl42li2709srvnn5likn8lskv2mv0bnvn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@ -15915,12 +15937,12 @@
graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
version = "0.9.8";
version = "0.9.9";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe";
sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz";
rev = "9dbd50e532ca45076e03db0f96a57d21528fc460";
sha256 = "0sqxnjmfbr0plahdmp87j8xpl3qkyimf9vkqall4ccljx8irdl6s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@ -16721,12 +16743,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
version = "2.8.5";
version = "2.8.6";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
rev = "2385b81edc706f7efc74f2aff4854399254cde17";
sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m";
rev = "cec6fb275fa37715bbcbf2abc716457521065068";
sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@ -17057,12 +17079,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
version = "2.8.5";
version = "2.8.6";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
rev = "2385b81edc706f7efc74f2aff4854399254cde17";
sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m";
rev = "cec6fb275fa37715bbcbf2abc716457521065068";
sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@ -18044,12 +18066,12 @@
helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
melpaBuild {
pname = "helm-rtags";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@ -18191,12 +18213,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
version = "0.5.4";
version = "0.6.4";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1";
sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y";
rev = "d90be189d8c2b742c9621ff28b1196be683cdb4c";
sha256 = "1hi7zw4p3w8a14fqv6w2bc0anrjb6d4vglwhmaz50qr2w3plxq15";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@ -20185,12 +20207,12 @@
iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iter2";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "doublep";
repo = "iter2";
rev = "ac1b4f10203d8093ae9f897039be97fd5ec65969";
sha256 = "098bsm5wc7nqk06awak2ar4nwd3xpqsdc9pb2n0px20ql6lxh4bh";
rev = "b0e8ecebe2d6807403a5eb1c75d68a4706259d4e";
sha256 = "038z7scy572n6cx0z59kiz59v7zqvn70wg2bwka5f3pglr67wzhp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
@ -20374,12 +20396,12 @@
ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ivy-rtags";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@ -21569,12 +21591,12 @@
kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "kubernetes";
version = "0.11.3";
version = "0.12.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@ -21590,12 +21612,12 @@
kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
melpaBuild {
pname = "kubernetes-evil";
version = "0.11.3";
version = "0.12.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
rev = "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c";
sha256 = "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@ -22570,8 +22592,8 @@
sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit";
sha256 = "03cmja9rcqc9250bsp1wwv94683mrcbnz1gjn8y7v62jlfi5qws5";
name = "magit";
};
packageRequires = [
@ -22737,16 +22759,16 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
version = "2.11.0";
version = "2.12.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5";
sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym";
repo = "magit-popup";
rev = "05a836caf02eba91fa26bdf5dd6fd183fe23937d";
sha256 = "08p57alfbkcsqkhnfjhfckqhans278ffjyhhhvgy8s7asa6as9kl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup";
sha256 = "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv";
name = "magit-popup";
};
packageRequires = [ async dash emacs ];
@ -23227,12 +23249,12 @@
material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "material-theme";
version = "1.1";
version = "1.2";
src = fetchFromGitHub {
owner = "cpaulik";
repo = "emacs-material-theme";
rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40";
sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0";
rev = "b66838d220ad380a16da1d8878936974b26f815d";
sha256 = "128zn4078b2av3vs8vrqa73fb53vrm64lqg0ks6kymnnmyvcz8v2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme";
@ -25746,8 +25768,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
rev = "af6039f5c02dc4664ce2baa96c1a6a1e5c7a61bb";
sha256 = "0cx1r7cl3jd0wr424xkf10y2rqngl8zcidyy04xw71ghfj79zhnr";
rev = "b0c61e91d1b600875ad2eae06fe72a179a3028b6";
sha256 = "1b0y20r9rimarfa1zgid78jh1zyzykdxd07n3vzam6ds9diygzxd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@ -28624,12 +28646,12 @@
phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "phpunit";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "phpunit.el";
rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f";
sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x";
rev = "a13706733f98be3639c47311fc820b3b50f4bc33";
sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@ -28789,22 +28811,22 @@
license = lib.licenses.free;
};
}) {};
plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
plain-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plain-theme";
version = "7";
version = "8";
src = fetchFromGitHub {
owner = "yegortimoshenko";
repo = "plain-theme";
rev = "7c376f5bf9d653bf12e414176284736cbdd19108";
sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a";
rev = "2609a811335d58cfb73a65d6307c156fe09037d3";
sha256 = "0g5vl4xigdm2pn2mnkwgj1kxdjr66w7ynr77bchy3ij6qvzdzkqd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
sha256 = "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8";
name = "plain-theme";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/plain-theme";
license = lib.licenses.free;
@ -31507,12 +31529,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
version = "2.15";
version = "2.16";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
rev = "7fa54d513fc716b2dc1055636b4728ab29dfdd3e";
sha256 = "1i0php9nnpgsmb4l1sc7qgxvdgg4hyviq68f4k41b9bcwab2hbl8";
rev = "8ef7554852541eced514c56d5e39d6073f7a2ef9";
sha256 = "0hh9m0ykw3r9h4gv4a99px00py1h5hs86043mp1m0nmkjibf6w56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@ -36254,12 +36276,12 @@
unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unify-opening";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "unify-opening";
rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf";
sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a";
rev = "502469ddba6d8d52159f53976265f7d956b6b17c";
sha256 = "0mni9vnbs50wvgnwfjwgzlwfff38h3wbrpr20nv84dmfh8ac0v61";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@ -37559,8 +37581,8 @@
version = "0.9.8";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
rev = "e80659fcc896";
sha256 = "01cmwv6xafk19gg6ixgiw9szmhmqk19i2jha5yafaa93pwgnc40v";
rev = "52fa9101d8c4";
sha256 = "1ijzd3xmygkkkwm0ckkmi576y93drcs63l6bsc8qz2pvjcn5k8sw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";

9
pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
View file

@ -65,6 +65,9 @@ self:
# upstream issue: missing file header
elmine = markBroken super.elmine;
# upstream issue: missing dependency redshank
emr = markBroken super.emr;
ess-R-data-view = super.ess-R-data-view.override {
inherit (self.melpaPackages) ess ctable popup;
};
@ -73,6 +76,12 @@ self:
inherit (self.melpaPackages) ess popup;
};
# upstream issue: missing dependency highlight
evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
# upstream issue: missing dependency highlight
floobits = markBroken super.floobits;
# missing OCaml
flycheck-ocaml = markBroken super.flycheck-ocaml;

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View file

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20171120";
version = "20171127";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20171120.tar";
sha256 = "1xpfs0bz5lb4jmzd0kk5mgl2yfk0hb6hk788x9rn7i1n1dnz4mdy";
url = "http://orgmode.org/elpa/org-20171127.tar";
sha256 = "0q9mbkyridz6zxkpcm7yk76iyliij1wy5sqqpcd8s6y5zy52zqwl";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20171120";
version = "20171127";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20171120.tar";
sha256 = "1ivrdxfvxiqj3ydc9d9vmh8wcb4ydavrn9mprx74kg4g084v9y26";
url = "http://orgmode.org/elpa/org-plus-contrib-20171127.tar";
sha256 = "0759g1lnwm9fz130cigvq5y4gigbk3wdc5yvz34blnl57ghir2k8";
};
packageRequires = [];
meta = {

4
pkgs/applications/misc/hubstaff/default.nix
View file

@ -4,7 +4,7 @@
let
version = "1.2.14-36df5e3";
version = "1.2.15-590e8bc";
rpath = stdenv.lib.makeLibraryPath
[ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh";
sha256 = "0yzhxk9zppj94llnf8naa6ca61f7c8jaj6b1m25zffnnz37m1sdb";
sha256 = "142q8xvwn5gdmpv5x25py2lindr74jqncf8vvw22yb9nj5aqqsi6";
};
nativeBuildInputs = [ unzip makeWrapper ];

15
pkgs/applications/misc/kitty/default.nix
View file

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, glew, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper }:
{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification }:
with python3Packages;
buildPythonApplication rec {
version = "0.4.2";
version = "0.5.0";
name = "kitty-${version}";
format = "other";
@ -10,13 +10,18 @@ buildPythonApplication rec {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "058676r2b83mjggbfc701v3vlviaslf7qciz8sm8lcda82k01wfp";
sha256 = "1w202rsgswagb3kiqbwg4xixcglip2hhz6wj1qx9x2whi4zl1l68";
};
buildInputs = [ glew fontconfig glfw ncurses libunistring ];
buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz ];
nativeBuildInputs = [ pkgconfig ];
postPatch = ''
substituteInPlace kitty/utils.py \
--replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'"
'';
buildPhase = ''
python3 setup.py linux-package
'';
@ -25,7 +30,7 @@ buildPythonApplication rec {
runHook preInstall
mkdir -p $out
cp -r linux-package/{bin,share,lib} $out
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick ]}"
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}"
runHook postInstall
'';

762
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

8
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -6,10 +6,10 @@ rec {
firefox = common rec {
pname = "firefox";
version = "57.0";
version = "57.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "bd99ff97a2a6f824e6fbd36fd00193903159e309506b1e6945dcbc43a17a95aaa54a05f32131c56872e8860878ba6063008667955550f03aa8c7084f834d14fc";
sha512 = "8cbfe0ad2c0f935dbc3a0ac4e855c489c83bf8c4506815dbae6e27f5d6a262ecf19ac82b6e81d52782559834fa14403116ecbf3acc8e3bc56b6c319e68316edd";
};
patches =
@ -32,10 +32,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
version = "52.5.0esr";
version = "52.5.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "fe724108ba538e590b87a5c1b817471d3cca9b038ba2755642e4d7b8ebb6174322be1fe074f24ef181946f9a027106b50b500d2fa541d8a99ef44905822eda18";
sha512 = "37318a9f82fa36fe390b85f536f26be9a6950a5143e74a218477adaffb89c77c1ffe17add4b79b26e320bb3138d418ccbb1371ca11e086d140143ba075947dc0";
};
patches =

2
pkgs/applications/networking/instant-messengers/quaternion/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "QMatrixClient";
repo = "Quaternion";
rev = "v${version}";
sha256 = "0an2nvwjs1hf7cb4maaj3rskhgsjgimzazsx53ndxskzwcssidvi";
sha256 = "1nbxlflm94pb19gdwb95z92kzg4px97dmp8av3mj4imk1ysnyrvi";
};
buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];

6
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -11,7 +11,7 @@
, rubySupport ? true, ruby
, tclSupport ? true, tcl
, extraBuildInputs ? []
, configure ? null
, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
, runCommand }:
let
@ -121,9 +121,9 @@ in if configure == null then weechat else
ln -s $plugin $out/plugins
done
'';
in writeScriptBin "weechat" ''
in (writeScriptBin "weechat" ''
#!${stdenv.shell}
export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
exec ${weechat}/bin/weechat "$@"
''
'') // { unwrapped = weechat; }

2
pkgs/applications/networking/mumble/default.nix
View file

@ -90,7 +90,7 @@ let
mkdir -p $out/share/icons{,/hicolor/scalable/apps}
cp icons/mumble.svg $out/share/icons
ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps
ln -s $out/share/icons/mumble.svg $out/share/icons/hicolor/scalable/apps
'';
} source;

16
pkgs/applications/science/biology/minc-tools/default.nix
View file

@ -1,12 +1,14 @@
{ stdenv, fetchurl, perl, cmake, flex, bison, libminc }:
{ stdenv, fetchFromGitHub, perl, cmake, flex, bison, libminc }:
stdenv.mkDerivation rec {
_name = "minc-tools";
name = "${_name}-2.3.00";
name = "${pname}-2.3.00";
pname = "minc-tools";
src = fetchurl {
url = "https://github.com/BIC-MNI/${_name}/archive/${_name}-2-3-00.tar.gz";
sha256 = "1d457vrwy2fl6ga2axnwn1cchkx2rmgixfzyb1zjxb06cxkfj1dm";
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = pname;
rev = builtins.replaceStrings [ "." ] [ "-" ] name;
sha256 = "0px5paprx4ds9aln3jdg1pywszgyz2aykgkdbj1y8gc1lwcizsl9";
};
nativeBuildInputs = [ cmake flex bison ] ++ (if doCheck then [ perl ] else [ ]);
@ -17,6 +19,8 @@ stdenv.mkDerivation rec {
checkPhase = "ctest";
doCheck = false;
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://github.com/BIC-MNI/minc-tools;
description = "Command-line utilities for working with MINC files";

4
pkgs/applications/science/math/R/default.nix
View file

@ -7,11 +7,11 @@
}:
stdenv.mkDerivation rec {
name = "R-3.4.2";
name = "R-3.4.3";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "0r0cv2kc3x5z9xycpnxx6fbvv22psw2m342jhpslbxkc8g1307lp";
sha256 = "09pl0w01fr09bsrwd7nz2r5psysj0z93w4chz3hm2havvqqvhg3s";
};
buildInputs = [

25
pkgs/desktops/lumina/default.nix
View file

@ -1,21 +1,23 @@
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils,
numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake,
qttools, poppler_qt5, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "lumina-${version}";
version = "1.3.0";
version = "1.4.0-p1";
src = fetchFromGitHub {
owner = "trueos";
repo = "lumina";
rev = "v${version}";
sha256 = "13kwlhv2qscrn52xvx0n1sqbl96fkcb5r1ixa0wazflx8dfl9ndn";
sha256 = "0jin0a2s6pjbpw7w1bz67dgqp0xlpw1a7nh8zv0qwdf954zczanp";
};
nativeBuildInputs = [
qmake
qttools
wrapGAppsHook
];
buildInputs = [
@ -26,6 +28,7 @@ stdenv.mkDerivation rec {
qtsvg
qtmultimedia
qtx11extras
poppler_qt5
fluxbox
xscreensaver
desktop_file_utils
@ -44,12 +47,24 @@ stdenv.mkDerivation rec {
'';
postPatch = ''
# Fix location of poppler-qt5.h
substituteInPlace src-qt5/desktop-utils/lumina-pdf/mainUI.h \
--replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>'
# Fix plugin dir
substituteInPlace src-qt5/core/lumina-theme-engine/lthemeengine.pri \
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
# Fix location of fluxbox styles
substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \
--replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox"
'';
qmakeFlags = [ "LINUX_DISTRO=NixOS" "CONFIG+=WITH_I18N" ];
qmakeFlags = [
"LINUX_DISTRO=NixOS"
"CONFIG+=WITH_I18N"
"LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
];
enableParallelBuilding = true;

18
pkgs/development/compilers/chez/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, coreutils, ncurses, libX11 }:
{ stdenv, fetchgit, coreutils, cctools, ncurses, libiconv, libX11 }:
stdenv.mkDerivation rec {
name = "chez-scheme-${version}";
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
enableParallelBuilding = true;
buildInputs = [ ncurses libX11 ];
nativeBuildInputs = [ coreutils ] ++ stdenv.lib.optional stdenv.isDarwin cctools;
buildInputs = [ ncurses libiconv libX11 ];
/* We patch out a very annoying 'feature' in ./configure, which
** tries to use 'git' to update submodules.
@ -27,11 +28,14 @@ stdenv.mkDerivation rec {
--replace "git submodule init && git submodule update || exit 1" "true"
substituteInPlace ./workarea \
--replace "/bin/ln" "${coreutils}/bin/ln" \
--replace "/bin/cp" "${coreutils}/bin/cp"
--replace "/bin/ln" ln \
--replace "/bin/cp" cp
substituteInPlace ./makefiles/installsh \
--replace "/usr/bin/true" "${coreutils}/bin/true"
substituteInPlace zlib/configure \
--replace "/usr/bin/libtool" libtool
'';
/* Don't use configureFlags, since that just implicitly appends
@ -42,11 +46,13 @@ stdenv.mkDerivation rec {
./configure --threads --installprefix=$out --installman=$out/share/man
'';
enableParallelBuilding = true;
meta = {
description = "A powerful and incredibly fast R6RS Scheme compiler";
homepage = "http://www.scheme.com";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
};
}

1
pkgs/development/compilers/julia/0.5.nix
View file

@ -160,7 +160,6 @@ stdenv.mkDerivation rec {
# Julia's tests require read/write access to $HOME
preCheck = ''
export HOME="$NIX_BUILD_TOP"
set
'';
preBuild = ''

1
pkgs/development/compilers/julia/0.6.nix
View file

@ -163,7 +163,6 @@ stdenv.mkDerivation rec {
# Julia's tests require read/write access to $HOME
preCheck = ''
export HOME="$NIX_BUILD_TOP"
set
'';
preBuild = ''

16
pkgs/development/libraries/libminc/default.nix
View file

@ -1,12 +1,14 @@
{ stdenv, fetchurl, cmake, zlib, netcdf, hdf5 }:
{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, hdf5 }:
stdenv.mkDerivation rec {
_name = "libminc";
name = "${_name}-2.3.00";
name = "${pname}-2.3.00";
pname = "libminc";
src = fetchurl {
url = "https://github.com/BIC-MNI/${_name}/archive/${_name}-2-3-00.tar.gz";
sha256 = "04ngqx4wkssxs9qqcgq2bvfs1cldcycmpcx587wy3b3m6lwf004c";
src = fetchFromGitHub {
owner = "BIC-MNI";
repo = pname;
rev = builtins.replaceStrings [ "." ] [ "-" ] name;
sha256 = "1gv1rq1q1brhglll2256cm6sns77ph6fvgbzk3ihkzq46y07yi9s";
};
nativeBuildInputs = [ cmake ];
@ -18,6 +20,8 @@ stdenv.mkDerivation rec {
checkPhase = "ctest";
doCheck = true;
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://github.com/BIC-MNI/libminc;
description = "Medical imaging library based on HDF5";

10
pkgs/development/libraries/nettle/3.3.nix Normal file
View file

@ -0,0 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.3";
src = fetchurl {
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526";
};
})

7
pkgs/development/libraries/qt-4.x/4.8/default.nix
View file

@ -126,16 +126,11 @@ stdenv.mkDerivation rec {
sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
'';
postConfigure = ''
echo "applying patch ${./parallel-build.patch}"
patch -p1 < ${./parallel-build.patch}
'';
prefixKey = "-prefix ";
configureFlags =
''
-v -no-separate-debug-info -release -no-fast -confirm-license -opensource
-v -no-separate-debug-info -release -fast -confirm-license -opensource
-${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
-qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked

6
pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch
View file

@ -1,6 +0,0 @@
--- a/tools/designer/src/lib/Makefile
+++ b/tools/designer/src/lib/Makefile
@@ -7167,2 +7167,3 @@ compiler_moc_header_clean:
.uic/release-shared/ui_qtgradientviewdialog.h \
+ .uic/release-shared/ui_qtgradientview.h \
../../../shared/qtgradienteditor/qtgradientviewdialog.h

1
pkgs/development/libraries/wiredtiger/default.nix
View file

@ -71,5 +71,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = intersectLists platforms.unix platforms.x86_64;
maintainers = with maintainers; [ wkennington ];
broken = true; # Broken by f689a6d1c6796c4a4f116ffec6c4624379e04bc9.
};
}

8
pkgs/development/ocaml-modules/ocamlnet/default.nix
View file

@ -1,5 +1,11 @@
{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
, gnutls, nettle }:
, gnutls, nettle_3_3 }:
# These overrides are just temporary, until ocamlnet supports nettle-3.4.
let gnutls_orig = gnutls; in
let gnutls = gnutls_orig.override { nettle = nettle_3_3; };
nettle = nettle_3_3;
in
let version = "4.1.4"; in

5
pkgs/development/ocaml-modules/re/default.nix
View file

@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild ounit ];
configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
configurePhase = "ocaml setup.ml -configure --prefix $out"
+ stdenv.lib.optionalString doCheck " --enable-tests";
buildPhase = "ocaml setup.ml -build";
doCheck = true;
doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06";
checkPhase = "ocaml setup.ml -test";
installPhase = "ocaml setup.ml -install";

2
pkgs/development/python-modules/ws4py/default.nix
View file

@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ asyncio cherrypy gevent tornado ];
checkPhase = ''
pytest test
pytest -k 'not test_timeout_when_no_registered_fds and not test_mainloop_can_be_stopped_when_no_websocket_were_registered'
'';
meta = with stdenv.lib; {

7
pkgs/development/r-modules/default.nix
View file

@ -279,7 +279,6 @@ let
ncdf4 = [ pkgs.netcdf ];
nloptr = [ pkgs.nlopt ];
odbc = [ pkgs.unixODBC ];
openssl = [ pkgs.openssl pkgs.openssl.dev ];
outbreaker = [ pkgs.gsl_1 ];
pander = [ pkgs.pandoc pkgs.which ];
pbdMPI = [ pkgs.openmpi ];
@ -837,10 +836,8 @@ let
});
openssl = old.openssl.overrideDerivation (attrs: {
OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include";
preConfigure = ''
sed -i.bak 's|^\( *PKG_LIBS_VERSIONED=\).*$|\1$PKG_LIBS|' configure
'';
PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include";
PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto";
});
Rserve = old.Rserve.overrideDerivation (attrs: {

5
pkgs/development/tools/rtags/default.nix
View file

@ -2,19 +2,18 @@
stdenv.mkDerivation rec {
name = "rtags-${version}";
version = "2.15";
version = "2.16";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ llvmPackages.llvm openssl emacs ]
++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
src = fetchgit {
rev = "refs/tags/v${version}";
fetchSubmodules = true;
url = "https://github.com/andersbakken/rtags.git";
sha256 = "12nnyav2q1ddkz9wm0aclhn7r74xj4ibrb0x05k7mcf694bg79c0";
sha256 = "15qmwkajw2zzfnw9hnv08p0asa6prg88nvqlxmv56c0dyhldjpkm";
# unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation
postFetch = ''

42
pkgs/games/gemrb/default.nix
View file

@ -1,37 +1,39 @@
{ stdenv, fetchurl, cmake, SDL, openal, zlib, libpng, python, libvorbis }:
assert stdenv.cc.libc != null;
{ stdenv, fetchFromGitHub, cmake
, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis }:
stdenv.mkDerivation rec {
name = "gemrb-0.8.1";
src = fetchurl {
url = "mirror://sourceforge/gemrb/${name}.tar.gz";
sha256 = "1g68pc0x4azy6zm5y7813g0qky96q796si9v3vafiy7sa8ph49kl";
name = "gemrb-${version}";
version = "0.8.5";
src = fetchFromGitHub {
owner = "gemrb";
repo = "gemrb";
rev = "v${version}";
sha256 = "0xkjsiawxz53rac26vqz9sfgva0syff8x8crabrpbpxgmbacih7a";
};
buildInputs = [ cmake python openal SDL zlib libpng libvorbis ];
# TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional
buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis ];
# Necessary to find libdl.
CMAKE_LIBRARY_PATH = "${stdenv.cc.libc.out}/lib";
nativeBuildInputs = [ cmake ];
# Can't have -werror because of the Vorbis header files.
cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON";
enableParallelBuilding = true;
# upstream prefers some symbols to remain
dontStrip = true;
cmakeFlags = [
"-DLAYOUT=opt"
];
meta = with stdenv.lib; {
description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate";
longDescription = ''
GemRB (Game engine made with pre-Rendered Background) is a portable open-source implementation of
Bioware's Infinity Engine. It was written to support pseudo-3D role playing games based on the
Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment).
GemRB (Game engine made with pre-Rendered Background) is a portable
open-source implementation of Bioware's Infinity Engine. It was written to
support pseudo-3D role playing games based on the Dungeons & Dragons
ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment).
'';
homepage = http://gemrb.org/;
license = licenses.gpl2;
platforms = stdenv.lib.platforms.all;
hydraPlatforms = [];
maintainer = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
}

44
pkgs/os-specific/linux/nvidia-x11/default.nix
View file

@ -2,6 +2,17 @@
let
generic = args: callPackage (import ./generic.nix args) { };
kernel = callPackage # a hacky way of extracting parameters from callPackage
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
maybePatch_drm_legacy =
lib.optional (lib.versionOlder "4.14" (kernel.version or "0"))
(fetchurl {
url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1"
+ "/packages/x11/driver/xf86-video-nvidia-legacy/patches/"
+ "xf86-video-nvidia-legacy-0010-kernel-4.14.patch";
sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5";
});
in
{
# Policy: use the highest stable version as the default (on our master).
@ -21,31 +32,23 @@ in
persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963";
};
legacy_340 = generic {
version = "340.102";
sha256_32bit = "0a484i37j00d0rc60q0bp6fd2wfrx2c4r32di9w5svqgmrfkvcb1";
sha256_64bit = "0nnz51d48a5fpnnmlz1znjp937k3nshdq46fw1qm8h00dkrd55ib";
settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598";
persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i";
version = "340.104";
sha256_32bit = "1l8w95qpxmkw33c4lsf5ar9w2fkhky4x23rlpqvp1j66wbw1b473";
sha256_64bit = "18k65gx6jg956zxyfz31xdp914sq3msn665a759bdbryksbk3wds";
settingsSha256 = "1vvpqimvld2iyfjgb9wvs7ca0b0f68jzfdpr0icbyxk4vhsq7sxk";
persistencedSha256 = "0zqws2vsrxbxhv6z0nn2galnghcsilcn3s0f70bpm6jqj9wzy7x8";
useGLVND = false;
patches = [
(fetchpatch {
name = "kernel-4.10.patch";
url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
})
# from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
# with datestamps removed
./fs52243.patch
];
patches = maybePatch_drm_legacy ++ [ ./vm_operations_struct-fault.patch ];
};
legacy_304 = generic {
version = "304.135";
sha256_32bit = "14qdl39wird04sqba94dcb77i63igmxxav62ndr4qyyavn8s3c2w";
sha256_64bit = "125mianhvq591np7y5jjrv9vmpbvixnkicr49ni48mcr0yjnjqkh";
settingsSha256 = "1y7swikdngq4nlwzkrq20yfah9zr31n1a5i6nw37awnp8xjilhzm";
version = "304.137";
sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a";
sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb";
settingsSha256 = "0i5znfq6jkabgi8xpcy12pdpww6a67i8mq60z1kjq36mmnb25pmi";
persistencedSha256 = null;
useGLVND = false;
useProfiles = false;
@ -63,7 +66,8 @@ in
sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
'';
in applyPatches [ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ];
in applyPatches [ "fix-typos" ];
patches = maybePatch_drm_legacy;
};
legacy_173 = callPackage ./legacy173.nix { };

14
pkgs/os-specific/linux/nvidia-x11/fs52243.patch
View file

@ -1,14 +0,0 @@
--- a/kernel/nv-drm.c
+++ b/kernel/nv-drm.c
@@ -115,7 +115,11 @@
};
static struct drm_driver nv_drm_driver = {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
+ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
+#else
.driver_features = DRIVER_GEM | DRIVER_PRIME,
+#endif
.load = nv_drm_load,
.unload = nv_drm_unload,
.fops = &nv_drm_fops,

31
pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch Normal file
View file

@ -0,0 +1,31 @@
https://devtalk.nvidia.com/default/topic/1025051/fully-working-patches-2-of-them-for-nvidia-driver-340-104-compiler-installer-file-and-linux-kernels-4-13-amp-4-14/?offset=5
--- a/kernel/uvm/nvidia_uvm_lite.c
+++ b/kernel/uvm/nvidia_uvm_lite.c
@@ -818,8 +818,15 @@ done:
}
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+#else
+int _fault(struct vm_fault *vmf)
+#endif
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+ struct vm_area_struct *vma = vmf->vma;
+#endif
#if defined(NV_VM_FAULT_HAS_ADDRESS)
unsigned long vaddr = vmf->address;
#else
@@ -866,7 +873,11 @@ static struct vm_operations_struct uvmlite_vma_ops =
// it's dealing with anonymous mapping (see handle_pte_fault).
//
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+#else
+int _sigbus_fault(struct vm_fault *vmf)
+#endif
{
vmf->page = NULL;
return VM_FAULT_SIGBUS;

4
pkgs/os-specific/linux/usbutils/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libusb1, hwdata }:
stdenv.mkDerivation rec {
name = "usbutils-008";
name = "usbutils-009";
src = fetchurl {
url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
sha256 = "132clk14j4nm8crln2jymdbbc2vhzar2j2hnxyh05m79pbq1lx24";
sha256 = "0q3iavmak2bs9xw486w4xfbjl0hbzii93ssgpr95mxmm9kjz1gwb";
};
nativeBuildInputs = [ pkgconfig ];

39
pkgs/servers/mail/exim/cve-2017-16943.patch
View file

@ -1,39 +0,0 @@
From 4e6ae6235c68de243b1c2419027472d7659aa2b4 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 24 Nov 2017 20:22:33 +0000
Subject: [PATCH] Avoid release of store if there have been later allocations.
Bug 2199
---
src/receive.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/receive.c b/src/receive.c
index e7e518a..d9b5001 100644
--- a/src/receive.c
+++ b/src/receive.c
@@ -1810,8 +1810,8 @@ for (;;)
(and sometimes lunatic messages can have ones that are 100s of K long) we
call store_release() for strings that have been copied - if the string is at
the start of a block (and therefore the only thing in it, because we aren't
- doing any other gets), the block gets freed. We can only do this because we
- know there are no other calls to store_get() going on. */
+ doing any other gets), the block gets freed. We can only do this release if
+ there were no allocations since the once that we want to free. */
if (ptr >= header_size - 4)
{
@@ -1820,9 +1820,10 @@ for (;;)
header_size *= 2;
if (!store_extend(next->text, oldsize, header_size))
{
+ BOOL release_ok = store_last_get[store_pool] == next->text;
uschar *newtext = store_get(header_size);
memcpy(newtext, next->text, ptr);
- store_release(next->text);
+ if (release_ok) store_release(next->text);
next->text = newtext;
}
}
--
1.9.1

15
pkgs/servers/mail/exim/default.nix
View file

@ -1,22 +1,13 @@
{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv, fetchpatch }:
{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
stdenv.mkDerivation rec {
name = "exim-4.89";
name = "exim-4.89.1";
src = fetchurl {
url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
sha256 = "09lndv34jsxwglq5zsh9y4xaqj5g37g9ca4x0zb25fvvm4f0lj8c";
sha256 = "157syn472gnp1x2lrazwdvqsg3zgwyv87952sq5rrnp220m3488s";
};
patches = [
(fetchpatch {
name = "CVE-2017-1000369.patch";
url = "https://anonscm.debian.org/git/pkg-exim4/exim4.git/plain/debian/patches/79_CVE-2017-1000369.patch?h=4.89-2%2bdeb9u1";
sha256 = "0v46zywgkv1rdqhybqqrd0rwkdaj6q1f4x0a3vm9p0wz8vad3023";
})
./cve-2017-16943.patch
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ coreutils db openssl pcre perl ];

17
pkgs/servers/x11/xorg/overrides.nix
View file

@ -357,6 +357,10 @@ in
"--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d"
"--with-udev-rules-dir=$(out)/lib/udev/rules.d"
];
meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"];
};
};
# Obsolete drivers that don't compile anymore.
@ -380,12 +384,21 @@ in
xf86videovmware = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"];
};
};
xf86videoqxl = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.spice_protocol ];
};
xf86videosiliconmotion = attrs: attrs // {
meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"];
};
};
xdriinfo = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [args.mesa];
};
@ -592,6 +605,10 @@ in
buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman];
nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros];
configureFlags = "--with-default-dri=3 --enable-tools";
meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"];
};
};
xf86videoxgi = attrs: attrs // {

4
pkgs/tools/admin/ansible/2.4.nix
View file

@ -6,12 +6,12 @@
pythonPackages.buildPythonPackage rec {
pname = "ansible";
version = "2.4.1.0";
version = "2.4.2.0";
name = "${pname}-${version}";
src = fetchurl {
url = "http://releases.ansible.com/ansible/${name}.tar.gz";
sha256 = "0spv0kjaicwss4q52s727b6grdizcxpa0bbsfg26pgf5kjrayqfs";
sha256 = "0n3n9py4s3aykiii31xq8g4wmd6693jvby0424pjrg0bna01apri";
};
prePatch = ''

33
pkgs/tools/compression/zopfli/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
name = "zopfli-${version}";
@ -23,27 +23,26 @@ stdenv.mkDerivation rec {
name = "zopfli-bug-and-typo-fixes.patch";
url = "https://github.com/google/zopfli/commit/7190e08ecac2446c7c9157cfbdb7157b18912a92.patch";
})
(fetchpatch {
name = "zopfli-cmake.patch";
url = "https://github.com/google/zopfli/commit/7554e4d34e7000b0595aa606e7d72357cf46ba86.patch";
sha256 = "1pvfhir2083v1l042a4dy5byqdmad7sxnd4jrprl2hzzb2avxbbn";
})
];
enableParallelBuilding = false; # problems, easily reproducible
buildFlags = [
"zopfli"
"libzopfli"
"zopflipng"
"libzopflipng"
];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ];
installPhase = ''
mkdir -p $out/bin
install -m755 zopfli{,png} $out/bin
mkdir -p $out/lib
install -m755 libzopfli{,png}.so* $out/lib
mkdir -p $out/share/doc/zopfli
install -m644 README* $out/share/doc/zopfli
install -D -t $out/bin zopfli*
install -d $out/lib
cp -d libzopfli* $out/lib
install -Dm444 -t $out/share/doc/zopfli ../README*
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Very good, but slow, deflate or zlib compression";
@ -54,7 +53,7 @@ stdenv.mkDerivation rec {
This library can only compress, not decompress. Existing zlib or
deflate libraries can decompress the data.
'';
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.asl20;
maintainers = with maintainers; [ bobvanderlinden nckx ];
};

4
pkgs/tools/filesystems/xfsprogs/default.nix
View file

@ -9,12 +9,12 @@ in
stdenv.mkDerivation rec {
name = "xfsprogs-${version}";
version = "4.13.1";
version = "4.14.0";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git";
rev = "refs/tags/v${version}";
sha256 = "0h4wb8pp8wdcyqpz2ixlghz9yfd2sp9xa20s435g5rfp6ljrh6zb";
sha256 = "19mg3avm188xz215hqbbh7251q27qwm7g1xr8ffrjwvzmdq55rxj";
};
outputs = [ "bin" "dev" "out" "doc" ];

1
pkgs/tools/graphics/wkhtmltopdf/default.nix
View file

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo.
sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23";
};
postConfigure = ""; # The patch "parallel-build.patch" does not apply.
configureFlags =
''
-dbus-linked

4
pkgs/tools/misc/direnv/default.nix
View file

@ -2,14 +2,14 @@
buildGoPackage rec {
name = "direnv-${version}";
version = "2.13.2";
version = "2.13.3";
goPackagePath = "github.com/direnv/direnv";
src = fetchFromGitHub {
owner = "direnv";
repo = "direnv";
rev = "v${version}";
sha256 = "1lvpfqaa7hv8mf7pkj0vnidq4c3zjxlz34pk3w4y3n0v0pwfpy9z";
sha256 = "1scj13qg98p838d2jvn0ks893xvrdrlmvrrjqwvqm11xw0v8bzxr";
};
postConfigure = ''

4
pkgs/tools/misc/yle-dl/default.nix
View file

@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
name = "yle-dl-${version}";
version = "2.27";
version = "2.28";
src = fetchFromGitHub {
owner = "aajanki";
repo = "yle-dl";
rev = version;
sha256 = "1wxl074vxy7dlnk3ykcgnk3ms7bwh0zs7b9pxwhx5hsd894c8fpg";
sha256 = "1nb3gmkizgkd09slihc2iaf3rh1s7bdhy9zydkfghmqi7nv4mmq0";
};
propagatedBuildInputs = with pythonPackages; [ lxml pyamf pycrypto requests ];

2
pkgs/tools/networking/pssh/default.nix
View file

@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
'';
inherit (src.meta) homepage;
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ chris-martin ];
};
}

1
pkgs/top-level/aliases.nix
View file

@ -105,6 +105,7 @@ mapAliases (rec {
manpages = man-pages; # added 2015-12-06
man_db = man-db; # added 2016-05
midoriWrapper = midori; # added 2015-01
minc_tools = minc-tools; # 2017-12
mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
module_init_tools = kmod; # added 2016-04-22
mssys = ms-sys; # added 2015-12-13

11
pkgs/top-level/all-packages.nix
View file

@ -5457,7 +5457,9 @@ with pkgs;
ccl = callPackage ../development/compilers/ccl { };
chez = callPackage ../development/compilers/chez { };
chez = callPackage ../development/compilers/chez {
inherit (darwin) cctools;
};
clang = llvmPackages.clang;
@ -9471,7 +9473,9 @@ with pkgs;
libmilter = callPackage ../development/libraries/libmilter { };
libminc = callPackage ../development/libraries/libminc { };
libminc = callPackage ../development/libraries/libminc {
hdf5 = hdf5_1_8;
};
libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { };
@ -10044,6 +10048,7 @@ with pkgs;
};
nettle = callPackage ../development/libraries/nettle { };
nettle_3_3 = callPackage ../development/libraries/nettle/3.3.nix { };
newt = callPackage ../development/libraries/newt { };
@ -18594,7 +18599,7 @@ with pkgs;
mrbayes = callPackage ../applications/science/biology/mrbayes { };
minc_tools = callPackage ../applications/science/biology/minc-tools { };
minc-tools = callPackage ../applications/science/biology/minc-tools { };
ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };

4
pkgs/top-level/perl-packages.nix
View file

@ -2926,10 +2926,10 @@ let self = _self // overrides; _self = with self; {
};
CryptX = buildPerlPackage rec {
name = "CryptX-0.054";
name = "CryptX-0.055";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
sha256 = "f084a706f6ff032ca5c46ec6f90ba5b6a26ae8752584911830f6535bf76d8e57";
sha256 = "4d680e8356497fbd2c66114a2bfbde753d77930f997430ba077db66a4458cee9";
};
propagatedBuildInputs = [ JSONMaybeXS ];
meta = {