colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Hydra: ?compare=1421760
This commit is contained in:
Vladimír Čunát 2017-12-29 10:13:33 +01:00
commit f29000b002
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
148 changed files with 5649 additions and 6475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/maintainers.nix
View File

@ -282,6 +282,7 @@
hodapp = "Chris Hodapp <hodapp87@gmail.com>";
hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
htr = "Hugo Tavares Reis <hugo@linux.com>";
hyphon81 = "Masato Yonekawa <zero812n@gmail.com>";
iand675 = "Ian Duncan <ian@iankduncan.com>";
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
iblech = "Ingo Blechschmidt <iblech@speicherleck.de>";
@ -324,6 +325,7 @@
joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
jonafato = "Jon Banafato <jon@jonafato.com>";
joncojonathan = "Jonathan Haddock <joncojonathan@gmail.com>";
jpdoyle = "Joe Doyle <joethedoyle@gmail.com>";
jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>";
jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
@ -432,6 +434,7 @@
mjanczyk = "Marcin Janczyk <m@dragonvr.pl>";
mjp = "Mike Playle <mike@mythik.co.uk>"; # github = "MikePlayle";
mlieberman85 = "Michael Lieberman <mlieberman85@gmail.com>";
moaxcp = "John Mercier <moaxcp@gmail.com>";
modulistic = "Pablo Costa <modulistic@gmail.com>";
mog = "Matthew O'Gorman <mog-lists@rldn.net>";
montag451 = "montag451 <montag451@laposte.net>";

27
nixos/modules/programs/rootston.nix
View File

@ -10,6 +10,7 @@ let
if [[ "$#" -ge 1 ]]; then
exec ${pkgs.rootston}/bin/rootston "$@"
else
${cfg.extraSessionCommands}
exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
fi
'';
@ -21,14 +22,28 @@ in {
Wayland compositor you should e.g. use Sway instead). You can manually
start the compositor by running "rootston" from a terminal'';
extraSessionCommands = mkOption {
type = types.lines;
default = "";
example = ''
# Define a keymap (US QWERTY is the default)
export XKB_DEFAULT_LAYOUT=de,us
export XKB_DEFAULT_VARIANT=nodeadkeys
export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
'';
description = ''
Shell commands executed just before rootston is started.
'';
};
extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [
xwayland rxvt_unicode dmenu
westonLite xwayland rofi
];
defaultText = literalExample ''
with pkgs; [
xwayland dmenu rxvt_unicode
westonLite xwayland rofi
]
'';
example = literalExample "[ ]";
@ -55,9 +70,8 @@ in {
Logo+q = close
Logo+m = maximize
Alt+Tab = next_window
Logo+Return = exec urxvt
# Note: Dmenu will only work properly while e.g. urxvt is running.
Logo+d = exec dmenu_run
Logo+Return = exec weston-terminal
Logo+d = exec rofi -show run
'';
description = ''
Default configuration for rootston (used when called without any
@ -82,7 +96,8 @@ in {
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
programs.dconf.enable = mkDefault true;
};
meta.maintainers = with lib.maintainers; [ primeos ];
meta.maintainers = with lib.maintainers; [ primeos gnidorah ];
}

11
nixos/modules/services/continuous-integration/buildkite-agent.nix
View File

@ -48,6 +48,15 @@ in
'';
};
hooksPath = mkOption {
type = types.path;
default = "${pkgs.buildkite-agent}/share/hooks";
defaultText = "${pkgs.buildkite-agent}/share/hooks";
description = ''
Path to the directory storing the hooks.
'';
};
meta-data = mkOption {
type = types.str;
default = "";
@ -114,8 +123,8 @@ in
token="$(cat ${toString cfg.tokenPath})"
name="${cfg.name}"
meta-data="${cfg.meta-data}"
hooks-path="${pkgs.buildkite-agent}/share/hooks"
build-path="${cfg.dataDir}/builds"
hooks-path="${cfg.hooks-path}"
bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh"
EOF
'';

6
nixos/modules/services/networking/nsd.nix
View File

@ -11,6 +11,8 @@ let
# build nsd with the options needed for the given config
nsdPkg = pkgs.nsd.override {
configFile = "${configFile}/nsd.conf";
bind8Stats = cfg.bind8Stats;
ipv6 = cfg.ipv6;
ratelimit = cfg.ratelimit.enable;
@ -788,6 +790,8 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ nsdPkg ];
users.extraGroups = singleton {
name = username;
gid = config.ids.gids.nsd;
@ -845,4 +849,6 @@ in
};
};
meta.maintainers = with lib.maintainers; [ hrdinka ];
}

2
nixos/modules/services/security/usbguard.nix
View File

@ -56,7 +56,7 @@ in {
};
rules = mkOption {
type = types.nullOr types.str;
type = types.nullOr types.lines;
default = null;
example = ''
allow with-interface equals { 08:*:* }

2
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -168,7 +168,7 @@ let
listenString = { addr, port, ssl, ... }:
"listen ${addr}:${toString port} "
+ optionalString ssl "ssl "
+ optionalString vhost.http2 "http2 "
+ optionalString (ssl && vhost.http2) "http2 "
+ optionalString vhost.default "default_server "
+ ";";

8
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -25,8 +25,8 @@ in
type = types.bool;
default = true;
description = ''
Enable support for Qt 4-based applications. Particularly, install the
Qt 4 version of the Breeze theme and a default backend for Phonon.
Enable support for Qt 4-based applications. Particularly, install a
default backend for Phonon.
'';
};
@ -142,11 +142,13 @@ in
kde-gtk-config breeze-gtk
qtvirtualkeyboard
libsForQt56.phonon-backend-gstreamer
libsForQt5.phonon-backend-gstreamer
]
++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ]
# Optional hardware support features
++ lib.optional config.hardware.bluetooth.enable bluedevil

48
pkgs/applications/audio/amarok/default.nix
View File

@ -1,48 +0,0 @@
{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig
, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod
, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
, lz4, lzo, snappy, libaio, pcre
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "amarok";
version = "2.8.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
sha256 = "1ilf9wdp3wna5pmvxill8x08rb9gw86qkc2zwm3xk9hpy8l9pf7l";
};
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
buildInputs = [
qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2
libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
lz4 lzo snappy libaio pcre
];
# This is already fixed upstream, will be release in 2.9
preConfigure = ''
sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
'';
cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
enableParallelBuilding = true;
propagatedUserEnvPkgs = [ qtscriptgenerator ];
meta = {
repositories.git = git://anongit.kde.org/amarok.git;
description = "Popular music player for KDE";
license = "GPL";
homepage = https://amarok.kde.org;
inherit (kdelibs4.meta) platforms;
};
}

37
pkgs/applications/audio/denemo/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchurl, pkgconfig
, libjack2, gettext, intltool, guile_2_0, lilypond
, glib, libxml2, librsvg, libsndfile, aubio
, gtk3, gtksourceview, evince, fluidsynth, rubberband
, portaudio, portmidi, fftw, makeWrapper }:
stdenv.mkDerivation rec {
name = "denemo-${version}";
version = "2.2.0";
src = fetchurl {
url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz";
sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh";
};
buildInputs = [
libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile
aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi
makeWrapper
];
postInstall = ''
wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin
'';
nativeBuildInputs = [
intltool
];
meta = with stdenv.lib; {
description = "Music notation and composition software used with lilypond";
homepage = http://denemo.org;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.olynch ];
};
}

4
pkgs/applications/audio/gradio/default.nix
View File

@ -17,7 +17,7 @@
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}:
let
version = "6.0.2";
version = "7.0";
in stdenv.mkDerivation rec {
name = "gradio-${version}";
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
owner = "haecker-felix";
repo = "gradio";
rev = "v${version}";
sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
sha256 = "0kn08k5dv7yh29ksywcpl6ifrp3p8zzk3p3hkbhzc8fpx84jn7r9";
};
nativeBuildInputs = [

31
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -135,10 +135,10 @@
arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "arbitools";
version = "0.71";
version = "0.91";
src = fetchurl {
url = "https://elpa.gnu.org/packages/arbitools-0.71.el";
sha256 = "1ghf5yla126n7xpn2sc2vg7q8arp7iv2z5f9r9l38vxm6dvnxp50";
url = "https://elpa.gnu.org/packages/arbitools-0.91.el";
sha256 = "0r0nbpwjxal40ydvx7hmjq56x12jcfqgld7yc4fjfz93wn8m40qf";
};
packageRequires = [ cl-lib ];
meta = {
@ -239,6 +239,19 @@
license = lib.licenses.free;
};
}) {};
bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "bbdb";
version = "3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bbdb-3.2.tar";
sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/bbdb.html";
license = lib.licenses.free;
};
}) {};
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
pname = "beacon";
version = "1.3.3";
@ -755,10 +768,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
version = "1.4.0.8";
version = "1.4.0.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.4.0.8.tar";
sha256 = "1gk42n04f1h2vc8sp86gvi795qgnvnh4cyyqfvy6sz1pfix76kfl";
url = "https://elpa.gnu.org/packages/el-search-1.4.0.11.tar";
sha256 = "12m468fxwfrwjkm0wcraafb7n9shh9fmw43nggc216ch3syxmfaw";
};
packageRequires = [ emacs stream ];
meta = {
@ -1584,10 +1597,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20171218";
version = "20171225";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20171218.tar";
sha256 = "0x3i9wdcl1nqdfhfinrs8bnhpjivm7s0akz90rwkh96d08kx0kpa";
url = "https://elpa.gnu.org/packages/org-20171225.tar";
sha256 = "0jq410l1d4gz8qz01kmpgf9n77hghnknbcmhhznnq4dxiypgigc2";
};
packageRequires = [];
meta = {

1519
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

518
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

@ -548,12 +548,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
version = "2.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "0bea9c7d800864b55d807c755254d03c796b1594";
sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6";
rev = "519b5cd886f484693fd69b226e307d56137b321b";
sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
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 = "2.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "0bea9c7d800864b55d807c755254d03c796b1594";
sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6";
rev = "519b5cd886f484693fd69b226e307d56137b321b";
sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@ -758,12 +758,12 @@
ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-jump-zap";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ace-jump-zap";
rev = "0acdd83a5abd59606495e67a4ee01f7856e5d359";
sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
rev = "1a9bf779d8f9225ede9ec482b840942bb58111df";
sha256 = "0r875w4aq3p091hcrpkpqsivn1q9hmq2ppa1rvxzdaq0rhl9kfz4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap";
@ -902,6 +902,27 @@
license = lib.licenses.free;
};
}) {};
adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "adafruit-wisdom";
version = "0.2.0";
src = fetchFromGitHub {
owner = "gonewest818";
repo = "adafruit-wisdom.el";
rev = "67e1fb17964c09514e7635dba85fb14b0926e49c";
sha256 = "097r31l4fpj4yd2ajv6zwgwn35fwn3c83qg9yzm2rjz1rdcwxlrw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom";
sha256 = "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad";
name = "adafruit-wisdom";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/adafruit-wisdom";
license = lib.licenses.free;
};
}) {};
add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-hooks";
@ -1648,12 +1669,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
version = "0.7.5";
version = "0.8.5";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
rev = "7d25d7e7f5370a82811c307550de5e36d4a7c2a6";
sha256 = "09crbgndhpm7mz5x01k0j8wsxga4gxraz4vgmbyb4m5b54h8jbpz";
rev = "942affd6b7538d1e829ee257bbd829cb4e860cce";
sha256 = "0njynjg7p7i5li668ldpvmnpc5w7bikcs4cmkf26vf5n714fvlc1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@ -2575,6 +2596,27 @@
license = lib.licenses.free;
};
}) {};
bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bazel-mode";
version = "1.0.0";
src = fetchFromGitHub {
owner = "codesuki";
repo = "bazel-mode";
rev = "6103da2dd9c9461e35a45fc0544ddf33410baa25";
sha256 = "0lbiih6lj7qf2h1l2nxcwfkhdzccrs01lcdqsyhp5hysp0zdcr66";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3945f7eba7d5f248cace11a7946262ac2500b01a/recipes/bazel-mode";
sha256 = "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586";
name = "bazel-mode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/bazel-mode";
license = lib.licenses.free;
};
}) {};
bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbcode-mode";
@ -4625,12 +4667,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
rev = "49862bfdd1540d443d278fadef16a83388b360cb";
sha256 = "0phpfsl00d39gp26mbf1n7r2210gk2407pqj3bng50sbip568jmp";
rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d";
sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@ -5231,27 +5273,6 @@
license = lib.licenses.free;
};
}) {};
company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-eshell-autosuggest";
version = "1.2.1";
src = fetchFromGitHub {
owner = "dieggsy";
repo = "company-eshell-autosuggest";
rev = "61d5999abcc6c24bf5285613a781ee7c7bc7b460";
sha256 = "182yvi41s0cwz6c2vi3il8yk3c8j490rgjn13dihw2n7xg86gjp9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest";
sha256 = "1bpjyr01rwl58fypfhzzml69wx7h2a044s4l58cxl3fw8lbjb13f";
name = "company-eshell-autosuggest";
};
packageRequires = [ company emacs ];
meta = {
homepage = "https://melpa.org/#/company-eshell-autosuggest";
license = lib.licenses.free;
};
}) {};
company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
melpaBuild {
pname = "company-ghc";
@ -5444,12 +5465,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
version = "2.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "0bea9c7d800864b55d807c755254d03c796b1594";
sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6";
rev = "519b5cd886f484693fd69b226e307d56137b321b";
sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@ -6017,12 +6038,12 @@
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-etags";
version = "1.3.6";
version = "1.3.7";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-etags";
rev = "80f291ce74d1612366b0a31fd7c46e83e16264c2";
sha256 = "0n59wrqmj32plx0fpf3nr5p7f29in4dsyygcnsbi74izw65dlbbc";
rev = "921fa5a062bda9a0f9226fdaa76530ad809ff7b9";
sha256 = "1qvp3ihchfwy57sfnnkk6m591s381w57ppig9c0izlbzw3n7hi7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@ -6056,6 +6077,27 @@
license = lib.licenses.free;
};
}) {};
counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-tramp";
version = "0.3.1";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-counsel-tramp";
rev = "d4c35e1aca724af6a0084362a027fdd70876d2c8";
sha256 = "0dflm700n9wzn2nrwlbrh1558zv0c9fzzrs43d1kqvzw98wihfz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
sha256 = "1ga57v6whnpigciw54k3hs0idq4cbl35qrysarik72f46by859v5";
name = "counsel-tramp";
};
packageRequires = [ counsel emacs ];
meta = {
homepage = "https://melpa.org/#/counsel-tramp";
license = lib.licenses.free;
};
}) {};
coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
melpaBuild {
pname = "coverage";
@ -6164,12 +6206,12 @@
cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
rev = "b1e11294bcf6dbdbb0c4b8714f1960dfef674913";
sha256 = "1kg9f1sbrv3x8mdfpp6v0hj2zpxkn0ayaxflvxqk64i9g1mxsvkg";
rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889";
sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@ -7025,12 +7067,12 @@
difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "difflib";
version = "0.3.7";
version = "0.3.8";
src = fetchFromGitHub {
owner = "dieggsy";
repo = "difflib.el";
rev = "56032966934dae5ac04764d2580d3dbadb0345ef";
sha256 = "18m67w0ly4wlm417l3hrkqb7jzd4zbzr9sasg01gpyhvxv73hh9m";
rev = "b08850251812d71e62fd6956081299590acdf37b";
sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib";
@ -8228,12 +8270,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
version = "2.6.19";
version = "2.7.19";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
rev = "16bebdbff275db41d673d0c04046198a35b8d97d";
sha256 = "082594g0g1c4dwr9z1dib1dyn3hhhc741qnzfmg5bxcyx8pz06c7";
rev = "1a8c4286ac1d92114dbda9042ed831cc83175db9";
sha256 = "11vwzgy1dn4sj1yhnvvim6p9w3dl896azh3wlrmg8g6y6qfzblc7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -8249,12 +8291,12 @@
easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-jekyll";
version = "1.3.10";
version = "1.4.10";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-jekyll";
rev = "d894912cf65cf84244f27b1eb0186ad3344a661d";
sha256 = "0sbyq2lcvkbxj9asm1yhpfqlvzx56r1g2qjymbari9j9lzhcdzsw";
rev = "d5226405c035d0dd675cacfd514388c348a4559a";
sha256 = "1pmaa0ry1yd8d2pbn4srv5bf1hqss046zjl2p3ag1ag0qb35fh39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
@ -8732,12 +8774,12 @@
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egison-mode";
version = "3.7.9";
version = "3.7.10";
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
rev = "82f6ee43b8e35e6d04882d9c9942a22746fde0f1";
sha256 = "1scxkgq4ij33306fjydwcqs69x5hpfw9l52z1xcprg51s23f2hgh";
rev = "b7c073e0a29c9632d82b501849e270d62304e22f";
sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@ -9521,85 +9563,85 @@
license = lib.licenses.free;
};
}) {};
emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
melpaBuild {
pname = "emacsql";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
name = "emacsql";
};
packageRequires = [ cl-lib emacs finalize ];
packageRequires = [ cl-generic cl-lib emacs finalize ];
meta = {
homepage = "https://melpa.org/#/emacsql";
license = lib.licenses.free;
};
}) {};
emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
emacsql-mysql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-mysql";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
name = "emacsql-mysql";
};
packageRequires = [ cl-lib emacs emacsql ];
packageRequires = [ cl-generic cl-lib emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-mysql";
license = lib.licenses.free;
};
}) {};
emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
emacsql-psql = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
melpaBuild {
pname = "emacsql-psql";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
name = "emacsql-psql";
};
packageRequires = [ cl-lib emacs emacsql pg ];
packageRequires = [ cl-generic cl-lib emacs emacsql pg ];
meta = {
homepage = "https://melpa.org/#/emacsql-psql";
license = lib.licenses.free;
};
}) {};
emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-sqlite";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b";
sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674";
rev = "dcf0dda9391f3978896547582efb72b5632c2ffe";
sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
name = "emacsql-sqlite";
};
packageRequires = [ cl-lib emacs emacsql ];
packageRequires = [ cl-generic cl-lib emacs emacsql ];
meta = {
homepage = "https://melpa.org/#/emacsql-sqlite";
license = lib.licenses.free;
@ -9974,12 +10016,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
version = "2.0.1";
version = "2.0.2";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6";
sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg";
rev = "3d3ab18436ad6089496b3bce1d49c64a86965431";
sha256 = "0p821zwpiznjh736af5avnx9abssx0zbb9xhs74yhh1mcdi1whq7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@ -10296,12 +10338,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
version = "20.2.1";
version = "20.2.2";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
rev = "3a14bb468b1f3f1f5bef3c18291fe0498429a417";
sha256 = "1jj7ai35vvipvpvpqfvv1psvbjrky875g2lk42g40231vxcm7fww";
rev = "194513197e19cd592f3f5c2231510542f5193fe4";
sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -10460,6 +10502,27 @@
license = lib.licenses.free;
};
}) {};
esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-autosuggest";
version = "2.0.0";
src = fetchFromGitHub {
owner = "dieggsy";
repo = "esh-autosuggest";
rev = "a8a9381e76ea2e0d934bc70caa47f23209bcc155";
sha256 = "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc3776068d6928fc1661a27cccaeb8fb85577099/recipes/esh-autosuggest";
sha256 = "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx";
name = "esh-autosuggest";
};
packageRequires = [ company emacs ];
meta = {
homepage = "https://melpa.org/#/esh-autosuggest";
license = lib.licenses.free;
};
}) {};
esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-help";
@ -11321,6 +11384,27 @@
license = lib.licenses.free;
};
}) {};
evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-replace-with-char";
version = "1.0.0";
src = fetchFromGitHub {
owner = "ninrod";
repo = "evil-replace-with-char";
rev = "dddbbafdd620cc48dd0a257baf4010e1b415ebe8";
sha256 = "0gcmva2q1bxqp3p8cl1nf19kh4nkgfdm64havyzhnkwq18q84pxi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ac1b487e0fe193cc46c8b489686972ed6db3973/recipes/evil-replace-with-char";
sha256 = "0lgazw53j44rc72czwqxs6yaz67l9i1v52wbi7l9w958fnjra84r";
name = "evil-replace-with-char";
};
packageRequires = [ emacs evil ];
meta = {
homepage = "https://melpa.org/#/evil-replace-with-char";
license = lib.licenses.free;
};
}) {};
evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-rsi";
@ -11426,6 +11510,27 @@
license = lib.licenses.free;
};
}) {};
evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }:
melpaBuild {
pname = "evil-string-inflection";
version = "1.0.0";
src = fetchFromGitHub {
owner = "ninrod";
repo = "evil-string-inflection";
rev = "f6a3eca0f0fa8e56e6938e1dd48537eef1fae05f";
sha256 = "1akk0yylwcw4f91hprrrsijhbdcmrx1nnpgfyzpl4k5d4b30y8d5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0720a0f5b775fcee8d1cfa0defe80048e2dd0972/recipes/evil-string-inflection";
sha256 = "0w9x49c0gmv4waspa9fvbhf2adm19cixkwx7a7la9v4qy7da6akh";
name = "evil-string-inflection";
};
packageRequires = [ emacs evil string-inflection ];
meta = {
homepage = "https://melpa.org/#/evil-string-inflection";
license = lib.licenses.free;
};
}) {};
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-surround";
@ -12013,6 +12118,26 @@
license = lib.licenses.free;
};
}) {};
faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faustine";
version = "0.4";
src = fetchgit {
url = "https://bitbucket.org/yphil/faustine";
rev = "f186461e2bc38ec8ae38bd5ab727cc769218a168";
sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine";
sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb";
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";
@ -15493,6 +15618,27 @@
license = lib.licenses.free;
};
}) {};
go-fill-struct = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-fill-struct";
version = "0.1";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "go-fill-struct";
rev = "3c97c92e78f3629a7a1069404c7c641881c16d0e";
sha256 = "0ara9qqv31pr7dpcby6xp24llf79m0dmwrx4yv6w0bhxi197fmlx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c03d2382efd20e248b27b5505cdeed67d000f73/recipes/go-fill-struct";
sha256 = "19xxqb836saxigvwdqf4xv0y9zrl7csv97x0facgyjyiqmwhx3x7";
name = "go-fill-struct";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/go-fill-struct";
license = lib.licenses.free;
};
}) {};
go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-guru";
@ -16000,12 +16146,12 @@
grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grandshell-theme";
version = "1.2";
version = "1.3";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "grandshell-theme";
rev = "7a6350d46790cf00f7a627e8a407b6032ddbd414";
sha256 = "13gm1dn6bf7h06ynwpxhjawza5ma4q21ag5affb7kygx9ygm88hy";
rev = "22c8df52c0fb8899fa748fa2980947ab38b53380";
sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@ -16827,12 +16973,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
version = "2.8.6";
version = "2.8.7";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
rev = "cec6fb275fa37715bbcbf2abc716457521065068";
sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y";
rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161";
sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@ -17163,12 +17309,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
version = "2.8.6";
version = "2.8.7";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
rev = "cec6fb275fa37715bbcbf2abc716457521065068";
sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y";
rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161";
sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@ -17853,27 +17999,6 @@
license = lib.licenses.free;
};
}) {};
helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-package";
version = "0.3";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-helm-package";
rev = "117f5f26c96c0854aadaf9c52aaec961195d5798";
sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package";
sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
name = "helm-package";
};
packageRequires = [ cl-lib helm ];
meta = {
homepage = "https://melpa.org/#/helm-package";
license = lib.licenses.free;
};
}) {};
helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-pages";
@ -18297,12 +18422,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
version = "0.7.5";
version = "0.8.5";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
rev = "29d863d5e2a46cd2576895bc72754ad835ba9b30";
sha256 = "0sba7jjbw406gvb0h4wfda0yhp760fv5hlm1f3hmm9xqw7hs6n2f";
rev = "ee7f6a2c09df5fdc28b4d910840a7c56922059c3";
sha256 = "0lkzi6h6wkm19mn7v6wjy50kd96k6hw7jhx7pxwgfp577816c7c2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@ -18399,22 +18524,22 @@
license = lib.licenses.free;
};
}) {};
helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "helpful";
version = "0.4";
version = "0.5";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
rev = "dce09e9c338c8733254e10387ad0dc118a89bd82";
sha256 = "1y7afppn5y8c568d3mynb5fcf75zarv0gzzj0g5xhs5wzqic4yaz";
rev = "9fdbf5b24df28b046731db1c7a1cc90338d55dce";
sha256 = "13kw0i4vhd8fgwgchap5qxckvhs00ifr7z68whnd3xzklx3v47bj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
name = "helpful";
};
packageRequires = [ dash elisp-refs emacs s shut-up ];
packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ];
meta = {
homepage = "https://melpa.org/#/helpful";
license = lib.licenses.free;
@ -20225,6 +20350,27 @@
license = lib.licenses.free;
};
}) {};
ipython-shell-send = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ipython-shell-send";
version = "1.0.2";
src = fetchFromGitHub {
owner = "jackkamm";
repo = "ipython-shell-send-el";
rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
sha256 = "07im2f3890yxpcy4qz1bihi68aslam7qir4vqf05bhqlgaqzamv8";
name = "ipython-shell-send";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/ipython-shell-send";
license = lib.licenses.free;
};
}) {};
ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ir-black-theme";
@ -20856,12 +21002,12 @@
js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-auto-format-mode";
version = "1.0.2";
version = "1.0.4";
src = fetchFromGitHub {
owner = "ybiquitous";
repo = "js-auto-format-mode";
rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb";
sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j";
rev = "cad63f1760e765298cc91e3503ac46c8771da4be";
sha256 = "1pg4ghfi0fzmnwrw3y4z3gy031psxvzjydwm4jbdrm33ais7919g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@ -21297,12 +21443,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-themes";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "ogdenwebb";
repo = "emacs-kaolin-themes";
rev = "f9e5b87ea26cc86b926586fac91a5a8c66ffc783";
sha256 = "15141id9zgasa423azpg84dswd924l0ji7a1q44nq5bvjpjdm9g8";
rev = "d4a1cbae1fc77192e5844291821709c82c9dc455";
sha256 = "04k2yz3vrj1h0zf6cz0jd97fg8zah2j980l5ycsgyy0dk9ysink8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@ -22291,12 +22437,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
version = "2.19.2";
version = "2.20.0";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
rev = "2a3b716056aad04ef8668856323a4b8678173fab";
sha256 = "1dbx9wn7xca02sf72y76s31b5sjcmmargjhn90ygiqzbxapm0xcb";
rev = "056a021b082fbe9d3f85e0b3cb493c70318ee2f2";
sha256 = "0bi7hxri7rn2rsiqmq82q3bdygirrpk8knjx3kxiw6hgmp3g1gr5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@ -22966,22 +23112,22 @@
license = lib.licenses.free;
};
}) {};
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
melpaBuild {
pname = "magithub";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794";
sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i";
rev = "08a1c1341d0982248ec86e1697fa1b6418cd80f5";
sha256 = "062xghazkm8lh207fpqp7csd3nwgkz47g831hqa94iz28n97x0pq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
name = "magithub";
};
packageRequires = [ emacs ghub-plus magit s ];
packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ];
meta = {
homepage = "https://melpa.org/#/magithub";
license = lib.licenses.free;
@ -23648,12 +23794,12 @@
metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "metaweblog";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "punchagan";
repo = "metaweblog";
rev = "2200eacde17edb66bbdde9c0b6b65481f40d498b";
sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k";
rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
@ -24361,12 +24507,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "msvc";
version = "1.3.6";
version = "1.3.7";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "msvc";
rev = "093f6d4eecfbfc67650644ebb637a4f1c31c08fa";
sha256 = "0pvxrgpbwn748rs25hhvlvxcm83vrysk7wf8lpm6ly8xm07yj14i";
rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3";
sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@ -24484,6 +24630,26 @@
license = lib.licenses.free;
};
}) {};
multi-project = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-project";
version = "0.0.26";
src = fetchhg {
url = "https://bitbucket.com/ellisvelo/multi-project";
rev = "a6e7c1542c0b";
sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
name = "multi-project";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/multi-project";
license = lib.licenses.free;
};
}) {};
multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-term";
@ -25852,8 +26018,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
rev = "b0c61e91d1b600875ad2eae06fe72a179a3028b6";
sha256 = "1b0y20r9rimarfa1zgid78jh1zyzykdxd07n3vzam6ds9diygzxd";
rev = "95f56022edf9fcaba8402db05a6927af050b12a8";
sha256 = "133maq29hfjaq4vilz9wvr9vjkschkpydkw2197sscv7whfzv78j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@ -26772,12 +26938,12 @@
org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-repo-todo";
version = "0.0.2";
version = "0.0.3";
src = fetchFromGitHub {
owner = "waymondo";
repo = "org-repo-todo";
rev = "904a26089d87db59a40421d6f857b189e70dfbe3";
sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
rev = "cba6145c6821fd2bbd96a1c9ef2346c281b76ad2";
sha256 = "0b57qy87sa8qcki16rgh16ldziay57yd7f98cpinaq0adcrqywy0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17b602004628e17dae0f46f2b33be0afb05f729/recipes/org-repo-todo";
@ -27516,12 +27682,12 @@
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-hugo";
version = "0.6";
version = "0.7";
src = fetchFromGitHub {
owner = "kaushalmodi";
repo = "ox-hugo";
rev = "1213df6c6d9adcd706306523a5ce0c66d118b4c7";
sha256 = "1j4b7f5bgpc8vhmxprqriy3688i3lp3fgvxcnnnb2v0sjq1pbac8";
rev = "b47f6f79603adb4f505500ed83150afca7601cfc";
sha256 = "1xlkmiwgxsai0hsx9r1gx88bdj72vxaq0icr399ksnwba58rwmr1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@ -29765,12 +29931,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
version = "3.5.0.1";
version = "3.5.1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
rev = "457f6a607ce167132b833c049b0eaf3a9c4b3f5f";
sha256 = "10pchdarigxrgy9akv2vdkkmjlxcly88ybycvbkwljpr98xg9xjp";
rev = "106ffc04be1abf3ff3399f54ccf149815b287dd9";
sha256 = "17cwwp2ja8rv7nrvaxrxsdb4a2f5gg7zdx85qn2vb92az1fc2lzn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@ -34846,6 +35012,27 @@
license = lib.licenses.free;
};
}) {};
system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "system-packages";
version = "1.0.0";
src = fetchFromGitHub {
owner = "jabranham";
repo = "system-packages";
rev = "149c253583e8b4d56a851b1e91e456260749cdea";
sha256 = "1c0q9c0wq9kskg8p6mnh6mnkivlabb46aqfcs7ms21497ndlmlsv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1";
name = "system-packages";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/system-packages";
license = lib.licenses.free;
};
}) {};
system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "system-specific-settings";
@ -35665,6 +35852,27 @@
license = lib.licenses.free;
};
}) {};
total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "total-lines";
version = "0.2.0";
src = fetchFromGitHub {
owner = "hinrik";
repo = "total-lines";
rev = "58a9fb0ffca63e3dfb3b27c7d91b4630e422903b";
sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines";
sha256 = "0zpli7gsb56fc3pzb3b2bs7dzr9glkixbzgl4p2kc249vz3jqajh";
name = "total-lines";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/total-lines";
license = lib.licenses.free;
};
}) {};
tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tox";
@ -36870,12 +37078,12 @@
vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vlf";
version = "1.7";
version = "1.7.1";
src = fetchFromGitHub {
owner = "m00natic";
repo = "vlfi";
rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43";
sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
rev = "a01e9ed416cd81ccddebebbf05d4ca80060b07dc";
sha256 = "0ziz08ylhkqwj2rp6h1z1yi309f6791b9r91nvr255l2331481pm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";

8
pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
View File

@ -86,7 +86,7 @@ self:
};
# upstream issue: doesn't build
eterm-256color = markBroken super.emacs-256color;
eterm-256color = markBroken super.eterm-256color;
# upstream issue: missing dependency highlight
evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
@ -118,6 +118,9 @@ self:
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
# upstream issue: recipe fails
insert-shebang = markBroken super.insert-shebang;
# Expects bash to be at /bin/bash
ivy-rtags = markBroken super.ivy-rtags;
@ -161,6 +164,9 @@ self:
# upstream issue: missing file header
qiita = markBroken super.qiita;
# upstream issue: missing file header
rcirc-menu = markBroken super.rcirc-menu;
# upstream issue: missing file header
speech-tagger = markBroken super.speech-tagger;

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 = "20171218";
version = "20171225";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20171218.tar";
sha256 = "01w09hl1l03bxa31af6k433h6i2cwaxwd1v6n87zjnbwwlli2la6";
url = "http://orgmode.org/elpa/org-20171225.tar";
sha256 = "1wp1mbp0b8vygrlx0bb79d9zb91kca13nlhrxh59h9w496jj30dy";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20171218";
version = "20171225";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20171218.tar";
sha256 = "1dndmv99sjl2nknlj76235yygdpwgq61gp3mqgsihjyr9irsp58d";
url = "http://orgmode.org/elpa/org-plus-contrib-20171225.tar";
sha256 = "10d44sqm9sh8gjy7xlnpqhyq35yxdijjm2322khc5bylvq60ianc";
};
packageRequires = [];
meta = {

3
pkgs/applications/graphics/digikam/default.nix
View File

@ -83,7 +83,8 @@ mkDerivation rec {
qtsvg
qtwebkit
kcalcore
# https://bugs.kde.org/show_bug.cgi?id=387960
#kcalcore
kconfigwidgets
kcoreaddons
kfilemetadata

4
pkgs/applications/graphics/yed/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yEd-${version}";
version = "3.17.1";
version = "3.17.2";
src = requireFile {
name = "${name}.zip";
url = "https://www.yworks.com/en/products/yfiles/yed/";
sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl";
sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2";
};
nativeBuildInputs = [ unzip makeWrapper ];

49
pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch Normal file
View File

@ -0,0 +1,49 @@
From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 22 Dec 2017 17:36:03 +0300
Subject: [PATCH] Revert "Make Akonadi installation properly relocatable"
This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
---
CMakeLists.txt | 3 ---
KF5AkonadiConfig.cmake.in | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9788bea94..15bad00fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -285,9 +285,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
- AKONADI_INCLUDE_DIR
- KF5Akonadi_DATA_DIR
)
install(FILES
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
index 75abede50..10f039376 100644
--- a/KF5AkonadiConfig.cmake.in
+++ b/KF5AkonadiConfig.cmake.in
@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@")
find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@")
find_dependency(Qt5Network "@QT_REQUIRED_VERSION@")
-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
find_dependency(Boost "@Boost_MINIMUM_VERSION@")
@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
--
2.15.1

1
pkgs/applications/kde/akonadi/series
View File

@ -1,2 +1,3 @@
akonadi-paths.patch
akonadi-timestamps.patch
0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch

4
pkgs/applications/kde/akonadiconsole.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
ktextwidgets, kxmlgui, messagelib, qtbase,
ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian
}:
mkDerivation {
@ -16,6 +16,6 @@ mkDerivation {
buildInputs = [
akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
messagelib qtbase libkdepim
messagelib qtbase libkdepim akonadi-search xapian
];
}

6
pkgs/applications/kde/default.nix
View File

@ -63,7 +63,6 @@ let
kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
};
in {
kdelibs = callPackage ./kdelibs { inherit attica phonon; };
akonadi = callPackage ./akonadi {};
akonadi-calendar = callPackage ./akonadi-calendar.nix {};
akonadi-contacts = callPackage ./akonadi-contacts.nix {};
@ -102,6 +101,7 @@ let
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
keditbookmarks = callPackage ./keditbookmarks.nix {};
kget = callPackage ./kget.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kholidays = callPackage ./kholidays.nix {};
@ -124,6 +124,7 @@ let
kontactinterface = callPackage ./kontactinterface.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
ksmtp = callPackage ./ksmtp {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};
@ -135,6 +136,7 @@ let
libkdcraw = callPackage ./libkdcraw.nix {};
libkdepim = callPackage ./libkdepim.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
libkgapi = callPackage ./libkgapi.nix {};
libkipi = callPackage ./libkipi.nix {};
libkleo = callPackage ./libkleo.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
@ -154,8 +156,6 @@ let
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
syndication = callPackage ./syndication.nix {};
l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
};
in lib.makeScope libsForQt5.newScope packages

2
pkgs/applications/kde/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/applications/17.12.0/ -A '*.tar.xz' )

156
pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
View File

@ -11,85 +11,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme_p.h
QString author;
QString email;
Index: grantleetheme-17.04.0/src/grantleetheme.cpp
===================================================================
--- grantleetheme-17.04.0.orig/src/grantleetheme.cpp
+++ grantleetheme-17.04.0/src/grantleetheme.cpp
@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr
, description(other.description)
, name(other.name)
, dirName(other.dirName)
- , absolutePath(other.absolutePath)
+ , absolutePaths(other.absolutePaths)
, author(other.author)
, email(other.email)
, loader(other.loader)
@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine()
void ThemePrivate::setupLoader()
{
- // Get the parent dir with themes, we set the theme directory separately
- QDir dir(absolutePath);
- dir.cdUp();
+ QStringList templateDirs;
+ for (const QString& path : absolutePaths) {
+ QDir dir(path);
+ dir.cdUp();
+ templateDirs << dir.absolutePath();
+ }
loader = QSharedPointer<Grantlee::FileSystemTemplateLoader>::create();
- loader->setTemplateDirs({ dir.absolutePath() });
+ loader->setTemplateDirs(templateDirs);
loader->setTheme(dirName);
if (!sEngine) {
@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
if (group.isValid()) {
d->dirName = dirName;
- d->absolutePath = themePath;
+ d->absolutePaths = QStringList(themePath);
d->name = group.readEntry("Name", QString());
d->description = group.readEntry("Description", QString());
d->themeFileName = group.readEntry("FileName", QString());
@@ -141,7 +142,7 @@ Theme::~Theme()
bool Theme::operator==(const Theme &other) const
{
- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
}
Theme &Theme::operator=(const Theme &other)
@@ -185,7 +186,12 @@ QString Theme::dirName() const
QString Theme::absolutePath() const
{
- return d->absolutePath;
+ return d->absolutePaths.first();
+}
+
+QStringList Theme::absolutePaths() const
+{
+ return d->absolutePaths;
}
QString Theme::author() const
@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem
return result;
}
+void Theme::addThemeDir(const QString& path)
+{
+ QDir dir(path);
+ dir.cdUp();
+ d->absolutePaths << dir.absolutePath();
+}
+
void Theme::addPluginPath(const QString &path)
{
if (!ThemePrivate::sEngine) {
Index: grantleetheme-17.04.0/src/grantleetheme.h
===================================================================
--- grantleetheme-17.04.0.orig/src/grantleetheme.h
@ -153,3 +74,80 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp
}
}
}
--- src/grantleetheme.cpp.orig 2017-12-22 16:11:39.863598126 +0300
+++ ./src/grantleetheme.cpp 2017-12-22 16:16:14.045664607 +0300
@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr
, description(other.description)
, name(other.name)
, dirName(other.dirName)
- , absolutePath(other.absolutePath)
+ , absolutePaths(other.absolutePaths)
, author(other.author)
, email(other.email)
, loader(other.loader)
@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
void ThemePrivate::setupLoader()
{
- // Get the parent dir with themes, we set the theme directory separately
- QDir dir(absolutePath);
- dir.cdUp();
+ QStringList templateDirs;
+ for (const QString& path : absolutePaths) {
+ QDir dir(path);
+ dir.cdUp();
+ templateDirs << dir.absolutePath();
+ }
loader = QSharedPointer<GrantleeTheme::QtResourceTemplateLoader>::create();
- loader->setTemplateDirs({ dir.absolutePath() });
+ loader->setTemplateDirs(templateDirs);
loader->setTheme(dirName);
if (!sEngine) {
@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c
KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
if (group.isValid()) {
d->dirName = dirName;
- d->absolutePath = themePath;
+ d->absolutePaths = QStringList(themePath);
d->name = group.readEntry("Name", QString());
d->description = group.readEntry("Description", QString());
d->themeFileName = group.readEntry("FileName", QString());
@@ -140,7 +143,7 @@ Theme::~Theme()
bool Theme::operator==(const Theme &other) const
{
- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
}
Theme &Theme::operator=(const Theme &other)
@@ -184,7 +187,12 @@ QString Theme::dirName() const
QString Theme::absolutePath() const
{
- return d->absolutePath;
+ return d->absolutePaths.first();
+}
+
+QStringList Theme::absolutePaths() const
+{
+ return d->absolutePaths;
}
QString Theme::author() const
@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem
return result;
}
+void Theme::addThemeDir(const QString& path)
+{
+ QDir dir(path);
+ dir.cdUp();
+ d->absolutePaths << dir.absolutePath();
+}
+
void Theme::addPluginPath(const QString &path)
{
if (!ThemePrivate::sEngine) {

27
pkgs/applications/kde/kde-locale-4.nix
View File

@ -1,27 +0,0 @@
name: args:
{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }:
mkDerivation (args // {
sname = "kde-l10n-${name}";
name = "kde-l10n-${name}-qt4";
outputs = [ "out" ];
nativeBuildInputs =
[ automoc4 cmake gettext perl ]
++ (args.nativeBuildInputs or []);
buildInputs =
[ kdelibs ]
++ (args.buildInputs or []);
preConfigure = ''
sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
${args.preConfigure or ""}
'';
preFixup = ''
propagatedBuildInputs=
propagatedNativeBuildInputs=
'';
})

56
pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
View File

@ -1,56 +0,0 @@
From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 7 Sep 2015 13:54:57 -0500
Subject: [PATCH 1/2] old kde4 cmake policies
---
cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index 7d54b9b..c435571 100644
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
@@ -345,6 +345,39 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3)
+cmake_policy(VERSION 2.4.5)
+
+# CMake 2.6, set compatibility behaviour to cmake 2.4
+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
+# resets the policy settings, so we get a lot of warnings
+
+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
+cmake_policy(SET CMP0000 OLD)
+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
+cmake_policy(SET CMP0002 OLD)
+# CMP0003: add the link paths to the link command as with cmake 2.4
+cmake_policy(SET CMP0003 OLD)
+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
+cmake_policy(SET CMP0005 OLD)
+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file
+# where this is done, macros and functions are executed with the policies as they
+# were when the were defined. Keep the OLD behaviour so we can set the policies here
+# for all KDE software without the big warning
+cmake_policy(SET CMP0011 OLD)
+
+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files
+# in this directory over those from CMAKE_MODULE_PATH
+cmake_policy(SET CMP0017 NEW)
+
+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake
+if (POLICY CMP0026)
+ cmake_policy(SET CMP0026 OLD)
+endif (POLICY CMP0026)
+
+
# Only do something if it hasn't been found yet
if(NOT KDE4_FOUND)
--
2.5.0

25
pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
View File

@ -1,25 +0,0 @@
From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 7 Sep 2015 13:56:03 -0500
Subject: [PATCH 2/2] polkit install path
---
kdecore/auth/ConfigureChecks.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
index 7cf9cb5..c8334ae 100644
--- a/kdecore/auth/ConfigureChecks.cmake
+++ b/kdecore/auth/ConfigureChecks.cmake
@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
"Where policy files generated by KAuth will be installed" FORCE)
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
--
2.5.0

47
pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
View File

@ -1,47 +0,0 @@
diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
index ab8f76d..2ae5089 100644
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
else
{
xdgdirList.clear();
- xdgdirList.append(QString::fromLatin1("/etc/xdg"));
-#ifdef Q_WS_WIN
- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
-#else
- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
-#endif
}
QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
}
} else {
xdgdirList = kdedirDataDirs;
-#ifndef Q_WS_WIN
- xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
- xdgdirList.append(QString::fromLatin1("/usr/share/"));
-#endif
}
localXdgDir = readEnvPath("XDG_DATA_HOME");
diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
index 4c9cad9..6849d45 100644
--- a/solid/solid/xdgbasedirs.cpp
+++ b/solid/solid/xdgbasedirs.cpp
@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
{
if ( qstrncmp( "data", resource, 4 ) == 0 ) {
if ( instance()->mDataDirs.isEmpty() ) {
- instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
+ instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
}
return instance()->mDataDirs;
} else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
if ( instance()->mConfigDirs.isEmpty() ) {
- instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
+ instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
}
return instance()->mConfigDirs;
}

49
pkgs/applications/kde/kdelibs/default.nix
View File

@ -1,49 +0,0 @@
{
mkDerivation, lib,
automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch
}:
mkDerivation {
name = "kdelibs";
outputs = [ "out" "dev" ];
outputInclude = "out";
setOutputFlags = false;
nativeBuildInputs = [
automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
];
buildInputs = [
attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
];
propagatedBuildInputs = [ qt4 soprano phonon strigi ];
patches = [
./0001-old-kde4-cmake-policies.patch
./0002-polkit-install-path.patch
./0003-remove_xdg_impurities.patch
];
# cmake does not detect path to `ilmbase`
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
"-DWITH_SOLID_UDISKS2=ON"
"-DKDE_DEFAULT_HOME=.kde"
];
meta = {
platforms = lib.platforms.linux;
homepage = http://www.kde.org;
license = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
}

4
pkgs/applications/kde/kdepim-runtime.nix
View File

@ -5,7 +5,7 @@
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
pimcommon, qtwebengine,
pimcommon, qtwebengine, libkgapi
}:
mkDerivation {
@ -19,7 +19,7 @@ mkDerivation {
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
pimcommon
pimcommon libkgapi
];
# Attempts to build some files before dependencies have been generated
enableParallelBuilding = false;

22
pkgs/applications/kde/kget.nix Normal file
View File

@ -0,0 +1,22 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
}:
mkDerivation {
name = "kget";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
];
meta = with lib; {
license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ peterhoeg ];
};
}

4
pkgs/applications/kde/kmailtransport.nix
View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp
}:
mkDerivation {
@ -11,7 +11,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ akonadi kcmutils ki18n kio ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}

25
pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch Normal file
View File

@ -0,0 +1,25 @@
From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 22 Dec 2017 19:32:47 +0300
Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 83c2bcb..5f6d47c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
REQUIRED_HEADERS KSMTP_HEADERS
)
-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
--
2.15.1

17
pkgs/applications/kde/ksmtp/default.nix Normal file
View File

@ -0,0 +1,17 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcoreaddons, kio, kmime, cyrus_sasl
}:
mkDerivation {
name = "ksmtp";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons kio kmime ];
propagatedBuildInputs = [ cyrus_sasl ];
patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
}

181
pkgs/applications/kde/l10n.nix
View File

@ -1,181 +0,0 @@
{ callPackage, recurseIntoAttrs, lib }:
let
kdeLocale4 = import ./kde-locale-4.nix;
in
lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
ar = {
qt4 = callPackage (kdeLocale4 "ar" {}) {};
};
bg = {
qt4 = callPackage (kdeLocale4 "bg" {}) {};
};
bs = {
qt4 = callPackage (kdeLocale4 "bs" {}) {};
};
ca = {
qt4 = callPackage (kdeLocale4 "ca" {}) {};
};
ca_valencia = {
qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
};
cs = {
qt4 = callPackage (kdeLocale4 "cs" {}) {};
};
da = {
qt4 = callPackage (kdeLocale4 "da" {}) {};
};
de = {
qt4 = callPackage (kdeLocale4 "de" {}) {};
};
el = {
qt4 = callPackage (kdeLocale4 "el" {}) {};
};
en_GB = {
qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
};
eo = {
qt4 = callPackage (kdeLocale4 "eo" {}) {};
};
es = {
qt4 = callPackage (kdeLocale4 "es" {}) {};
};
et = {
qt4 = callPackage (kdeLocale4 "et" {}) {};
};
eu = {
qt4 = callPackage (kdeLocale4 "eu" {}) {};
};
fa = {
qt4 = callPackage (kdeLocale4 "fa" {}) {};
};
fi = {
qt4 = callPackage (kdeLocale4 "fi" {}) {};
};
fr = {
qt4 = callPackage (kdeLocale4 "fr" {}) {};
};
ga = {
qt4 = callPackage (kdeLocale4 "ga" {}) {};
};
gl = {
qt4 = callPackage (kdeLocale4 "gl" {}) {};
};
he = {
qt4 = callPackage (kdeLocale4 "he" {}) {};
};
hi = {
qt4 = callPackage (kdeLocale4 "hi" {}) {};
};
hr = {
qt4 = callPackage (kdeLocale4 "hr" {}) {};
};
hu = {
qt4 = callPackage (kdeLocale4 "hu" {}) {};
};
ia = {
qt4 = callPackage (kdeLocale4 "ia" {}) {};
};
id = {
qt4 = callPackage (kdeLocale4 "id" {}) {};
};
is = {
qt4 = callPackage (kdeLocale4 "is" {}) {};
};
it = {
qt4 = callPackage (kdeLocale4 "it" {}) {};
};
ja = {
qt4 = callPackage (kdeLocale4 "ja" {}) {};
};
kk = {
qt4 = callPackage (kdeLocale4 "kk" {}) {};
};
km = {
qt4 = callPackage (kdeLocale4 "km" {}) {};
};
ko = {
qt4 = callPackage (kdeLocale4 "ko" {}) {};
};
lt = {
qt4 = callPackage (kdeLocale4 "lt" {}) {};
};
lv = {
qt4 = callPackage (kdeLocale4 "lv" {}) {};
};
mr = {
qt4 = callPackage (kdeLocale4 "mr" {}) {};
};
nb = {
qt4 = callPackage (kdeLocale4 "nb" {}) {};
};
nds = {
qt4 = callPackage (kdeLocale4 "nds" {}) {};
};
nl = {
qt4 = callPackage (kdeLocale4 "nl" {}) {};
};
nn = {
qt4 = callPackage (kdeLocale4 "nn" {}) {};
};
pa = {
qt4 = callPackage (kdeLocale4 "pa" {}) {};
};
pl = {
qt4 = callPackage (kdeLocale4 "pl" {}) {};
};
pt = {
qt4 = callPackage (kdeLocale4 "pt" {}) {};
};
pt_BR = {
qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
};
ro = {
qt4 = callPackage (kdeLocale4 "ro" {}) {};
};
ru = {
qt4 = callPackage (kdeLocale4 "ru" {}) {};
};
sk = {
qt4 = callPackage (kdeLocale4 "sk" {}) {};
};
sl = {
qt4 = callPackage (kdeLocale4 "sl" {}) {};
};
sr = {
qt4 = callPackage (kdeLocale4 "sr" {
preConfigure = ''
patchShebangs \
4/sr/sr@latin/scripts/ts-pmap-compile.py \
4/sr/scripts/ts-pmap-compile.py \
4/sr/data/resolve-sr-hybrid \
4/sr/sr@ijekavian/scripts/ts-pmap-compile.py \
4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
'';
}) {};
};
sv = {
qt4 = callPackage (kdeLocale4 "sv" {}) {};
};
tr = {
qt4 = callPackage (kdeLocale4 "tr" {}) {};
};
ug = {
qt4 = callPackage (kdeLocale4 "ug" {}) {};
};
uk = {
qt4 = callPackage (kdeLocale4 "uk" {}) {};
};
wa = {
qt4 = callPackage (kdeLocale4 "wa" {}) {};
};
zh_CN = {
qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
};
zh_TW = {
qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
};
}

15
pkgs/applications/kde/libkgapi.nix Normal file
View File

@ -0,0 +1,15 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtwebengine, kio, kcalcore, kcontacts
}:
mkDerivation {
name = "libkgapi";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtwebengine kio kcalcore kcontacts ];
}

2240
pkgs/applications/kde/srcs.nix
View File

File diff suppressed because it is too large Load Diff

18
pkgs/applications/misc/calcurse/default.nix
View File

@ -1,20 +1,26 @@
{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }:
{ stdenv, fetchurl, ncurses, gettext, python3, python3Packages, makeWrapper }:
stdenv.mkDerivation rec {
name = "calcurse-${version}";
version = "4.2.2";
version = "4.3.0";
src = fetchurl {
url = "http://calcurse.org/files/${name}.tar.gz";
sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266";
sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i";
};
buildInputs = [ncurses gettext python3 ];
buildInputs = [ ncurses gettext python3 ];
nativeBuildInputs = [ makeWrapper ];
# Build Python environment with httplib2 for calcurse-caldav
pythonEnv = python3Packages.python.buildEnv.override {
extraLibs = [ python3Packages.httplib2 ];
};
propogatedBuildInputs = [ pythonEnv ];
postInstall = ''
makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav
'';
substituteInPlace $out/bin/calcurse-caldav --replace /usr/bin/python3 ${pythonEnv}/bin/python3
'';
meta = with stdenv.lib; {
description = "A calendar and scheduling application for the command line";

4
pkgs/applications/misc/jgmenu/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "jgmenu-${version}";
version = "0.7.5";
version = "0.7.6";
src = fetchFromGitHub {
owner = "johanmalm";
repo = "jgmenu";
rev = "v${version}";
sha256 = "1gml2g711pr6wakznlxjrlmz8kylkv0ydpvv0jx2y5qczp3rwk3a";
sha256 = "13bmvg9kqjng8jqc3xiif587l05ygk5b3k9xn2lq8yxcwxi9p30v";
};
nativeBuildInputs = [

26
pkgs/applications/misc/kgocode/default.nix
View File

@ -1,26 +0,0 @@
{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } :
stdenv.mkDerivation rec {
name = "kgocode-0.0.1";
buildInputs = [ cmake kdelibs4 automoc4 ];
src = fetchgit {
url = https://bitbucket.org/lucashnegri/kgocode.git;
rev = "024536e4b2f371db4f51c1d80fb6b444352ff6a6";
sha256 = "10q4nvx3wz5wl3wwpfprz26j4x59s41bpdgafbg6604im58hklal";
};
meta = with stdenv.lib; {
description = "Go code completion for Kate, KDevelop and others";
longDescription = ''
A plugin for KTextEditor (Kate, KDevelop, among others) that provides
basic code completion for the Go programming language.
Uses gocode as completion provider.
'';
homepage = https://bitbucket.org/lucashnegri/kgocode/overview;
maintainers = with maintainers; [ qknight ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

35
pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch Normal file
View File

@ -0,0 +1,35 @@
From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001
From: Sam Parkinson <sam@sam.today>
Date: Tue, 26 Dec 2017 14:46:27 +1100
Subject: [PATCH] Extend the python path; rather than replacing it
Some distros (i.e. NixOS) require the special PYTHONPATH, so that
the web extension has access to the python packages it wants (i.e. gi).
Previously, the PYTHONPATH was replaced with the web extension path;
meaning it would crash on NixOS. This instead prepends the web
extension path to the PYTHONPATH.
---
eolie/application.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/eolie/application.py b/eolie/application.py
index 3c21542..bed4e55 100644
--- a/eolie/application.py
+++ b/eolie/application.py
@@ -340,7 +340,11 @@ class Application(Gtk.Application):
self.settings = Settings.new()
# Init extensions
- GLib.setenv("PYTHONPATH", self.__extension_dir, True)
+ current_path = GLib.getenv("PYTHONPATH")
+ new_path = self.__extension_dir
+ if current_path:
+ new_path = new_path + ':' + current_path
+ GLib.setenv("PYTHONPATH", new_path, True)
# Create favicon path
if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR):
--
2.15.0

23
pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch Normal file
View File

@ -0,0 +1,23 @@
From a79d2dcd1b6275904193454fb9d68614813929f3 Mon Sep 17 00:00:00 2001
From: Sam Parkinson <sam@sam.today>
Date: Mon, 27 Nov 2017 11:17:35 +1100
Subject: [PATCH] Remove post install script - handle in nix config instead
---
meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/meson.build b/meson.build
index fc45296..2227f1f 100644
--- a/meson.build
+++ b/meson.build
@@ -53,5 +53,3 @@ configure_file(
configuration: conf,
install_dir: bindir
)
-
-meson.add_install_script('meson_post_install.py')
--
2.15.0

68
pkgs/applications/networking/browsers/eolie/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook
, git, glib, glib_networking, gsettings_desktop_schemas, gst_all_1, gtk3
, gtkspell3, libsecret, python36, python36Packages, webkitgtk }:
stdenv.mkDerivation rec {
name = "eolie-${version}";
version = "0.9.16";
src = fetchgit {
url = "https://gitlab.gnome.org/gnumdk/eolie";
rev = version;
sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
};
nativeBuildInputs = [
intltool
itstool
meson
ninja
pkgconfig
wrapGAppsHook
];
buildInputs = [
git # required to download ad blocking DB
glib_networking
gsettings_desktop_schemas
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
gtk3
gtkspell3
libsecret
python36
python36Packages.pygobject3
python36Packages.pycairo
python36Packages.dateutil
python36Packages.dbus-python
python36Packages.beautifulsoup4
python36Packages.pycrypto
python36Packages.requests
webkitgtk
];
wrapPrefixVariables = [ "PYTHONPATH" ];
enableParallelBuilding = true;
postInstall = ''
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
'';
patches = [
./0001-Remove-post-install-script-handle-in-nix-config-inst.patch
./0001-Extend-the-python-path-rather-than-replacing-it.patch
];
meta = with stdenv.lib; {
description = "A new GNOME web browser";
homepage = https://gitlab.gnome.org/gnumdk/eolie;
license = licenses.gpl3;
maintainers = [ maintainers.samdroid-apps ];
platforms = platforms.linux;
};
}

770
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

770
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

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.2";
version = "57.0.3";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "e66402c182fae579dc645de1570a2eba4f95953f608de668da07a1ee4f371041cbdb3e01ce6e4708d8fa3b6b3ebe5b79e03e48ced3605f66cb09ac49abf3bbcd";
sha512 = "1f887ab6bb16ef69bce56b689e761b3e09fc106b4bee7842be2c8e7eac05981f9922e9c3a8bd22b4935545cbbc10bf0a0c79df7800cd3c80fd4137070c9bfd09";
};
patches =
@ -32,10 +32,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
version = "52.5.2esr";
version = "52.5.3esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "bbc7dcc4cb392f06fe2e963a3b6372efcfbbcc1ca7218a3ef05885285fe00c9e87e0f8d307bd9363668327eb43542c0600443bd9e6744de64494b96dd00efa5a";
sha512 = "7b9c87905c53bc681dc6475e05596449fed88850f9dc07c8223d0d3edd2dd9d8a0dd88ebae1cd59eced2165696df9370de5e85cc03cded58ec4d0f622634417f";
};
patches =

6
pkgs/applications/networking/browsers/palemoon/default.nix
View File

@ -59,12 +59,18 @@ stdenv.mkDerivation rec {
echo > $MOZ_CONFIG "
. $src/build/mozconfig.common
ac_add_options --prefix=$out
ac_add_options --with-pthreads
ac_add_options --enable-application=browser
ac_add_options --enable-official-branding
ac_add_options --enable-optimize="-O2"
ac_add_options --enable-release
ac_add_options --enable-devtools
ac_add_options --enable-jemalloc
ac_add_options --enable-shared-js
ac_add_options --enable-strip
ac_add_options --disable-tests
ac_add_options --disable-installer
ac_add_options --disable-updaters
"
'';

13
pkgs/applications/networking/instant-messengers/kadu/cmake.patch
View File

@ -1,13 +0,0 @@
diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt
--- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-08-30 16:13:17.000000000 +0200
+++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-15 10:20:33.368716013 +0100
@@ -26,7 +26,7 @@
get_filename_component (_basename ${_current_MOC} NAME_WE)
set (_header ${_abs_FILE})
set (_moc ${_abs_PATH}/${_current_MOC})
- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
+ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
endforeach (_current_MOC_INC)
endif (_match)
Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~

46
pkgs/applications/networking/instant-messengers/kadu/default.nix
View File

@ -1,46 +0,0 @@
{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11,
alsaLib, aspell, libidn, qca2, phonon, pkgconfig }:
stdenv.mkDerivation {
name = "kadu-0.12.3";
src = fetchurl {
url = http://download.kadu.im/stable/kadu-0.12.3.tar.bz2;
sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
];
configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
preConfigure = ''
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig"
'';
cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'";
prePatch = ''
patchShebangs .
'';
# Disable the kadu plugins I wasn't able to get to work
patchPhase = ''
sed -i -e '/mpd_mediaplayer/d' \
-e '/encryption_ng/d' \
-e '/encryption_ng_simlite/d' Plugins.cmake
patch -p1 < ${./cmake.patch}
'';
NIX_LDFLAGS="-lX11";
meta = {
description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)";
homepage = http://www.kadu.net/w/English:Main_Page;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.piotr ];
};
}

33
pkgs/applications/networking/kget/default.nix
View File

@ -1,33 +0,0 @@
{
mkDerivation, lib, fetchFromGitHub,
extra-cmake-modules, kdoctools, makeWrapper,
kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
}:
let
pname = "kget";
version = "20170903";
in mkDerivation {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "KDE";
repo = pname;
rev = "739c0b399faf5a393c7436c0771662596b840fdc";
sha256 = "0rn6a4xd9zmf9sdjd5b4rh8yky6qm6ffjgjpn4snkdjsn6vm6y43";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
buildInputs = [
kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
];
enableParallelBuilding = true;
meta = with lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
}

4
pkgs/applications/networking/newsreaders/liferea/default.nix
View File

@ -6,13 +6,13 @@
let
pname = "liferea";
version = "1.12.0";
version = "1.12.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
sha256 = "02qzg85l2vrja2qwzdbrfa4z1lp5p6lp528bv74abmxz5wlpif70";
sha256 = "14qx3x2xjcnydc4ma8vdac63phas7jzwbjl4b9r5hf6vxv3mpvdq";
};
nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];

10
pkgs/applications/networking/pjsip/default.nix
View File

@ -2,15 +2,19 @@
stdenv.mkDerivation rec {
name = "pjsip-${version}";
version = "2.6";
version = "2.7.1";
src = fetchurl {
url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig";
sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr";
};
buildInputs = [ openssl libsamplerate alsaLib ];
preConfigure = ''
export LD=$CC
'';
postInstall = ''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
@ -25,7 +29,7 @@ stdenv.mkDerivation rec {
description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE";
homepage = http://pjsip.org/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
maintainers = with stdenv.lib.maintainers; [viric olynch];
platforms = with stdenv.lib.platforms; linux;
};
}

56
pkgs/applications/office/calligra/2.nix
View File

@ -1,56 +0,0 @@
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
, kactivities, okular, git, oxygen-icons5, makeWrapper
# TODO: not found
#, xbase, openjpeg
# TODO: package libWPS, Spnav, m2mml, LibEtonyek
}:
stdenv.mkDerivation rec {
name = "calligra-2.9.11";
src = fetchurl {
url = "mirror://kde/stable/${name}/${name}.tar.xz";
sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di";
};
nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
buildInputs = [
kdelibs4 lcms2 libpng eigen
exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
freetds fftw glew libkdcraw opencolorio kdepimlibs
kactivities okular git
];
enableParallelBuilding = true;
postInstall = ''
for i in $out/bin/*; do
wrapProgram $i \
--prefix PATH ':' "${pstoedit.out}/bin" \
--prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
done
'';
meta = with stdenv.lib; {
description = "A suite of productivity applications";
longDescription = ''
Calligra Suite is a set of applications written to help
you to accomplish your work. Calligra includes efficient
and capable office components: Words for text processing,
Sheets for computations, Stage for presentations, Plan for
planning, Flow for flowcharts, Kexi for database creation,
Krita for painting and raster drawing, and Karbon for
vector graphics.
'';
homepage = http://calligra.org;
maintainers = with maintainers; [ phreedom ebzzry ];
inherit (kdelibs4.meta) platforms;
license = licenses.gpl2;
broken = true;
};
}

12
pkgs/applications/office/calligra/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper,
boost, qtwebkit, qtx11extras, shared_mime_info,
breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
@ -23,6 +23,16 @@ mkDerivation rec {
sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
};
enableParallelBuilding = true;
patches = [
(fetchpatch {
name = "calligra-build-with-newer-kcalcore.patch";
url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff";
sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
buildInputs = [

7
pkgs/applications/office/libreoffice/still.nix
View File

@ -6,7 +6,7 @@
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen
@ -15,7 +15,6 @@
, defaultIconTheme, glib, ncurses
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
, withHelp ? true
, kdeIntegration ? false
}:
let
@ -187,7 +186,6 @@ in stdenv.mkDerivation rec {
"--disable-report-builder"
"--enable-python=system"
"--enable-dbus"
(lib.enableFeature kdeIntegration "kde4")
"--with-package-format=installed"
"--enable-epm"
"--with-jdk-home=${jdk.home}"
@ -250,8 +248,7 @@ in stdenv.mkDerivation rec {
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew ncurses
libodfgen CoinMP librdf_rasqal defaultIconTheme
]
++ lib.optional kdeIntegration kdelibs4;
];
nativeBuildInputs = [ wrapGAppsHook ];
passthru = {

20
pkgs/applications/office/zanshin/default.nix
View File

@ -1,6 +1,6 @@
{
mkDerivation, lib,
fetchurl, fetchpatch,
fetchFromGitHub,
extra-cmake-modules,
qtbase, boost,
akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap,
@ -9,22 +9,16 @@
mkDerivation rec {
pname = "zanshin";
version = "0.4.1";
version = "2017-11-25";
name = "${pname}-${version}";
src = fetchurl {
url = "https://files.kde.org/${pname}/${name}.tar.bz2";
sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as";
src = fetchFromGitHub {
owner = "KDE";
repo = "zanshin";
rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89";
sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m";
};
patches = [
(fetchpatch {
name = "zanshin-fix-qt59-build.patch";
url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1";
sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x";
})
];
nativeBuildInputs = [
extra-cmake-modules
];

3
pkgs/applications/science/logic/coq/default.nix
View File

@ -91,7 +91,8 @@ self = stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.lablgtk ];
buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ]
++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
postPatch = ''
UNAME=$(type -tp uname)

8
pkgs/applications/science/programming/fdr/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}:
stdenv.mkDerivation {
name = "fdr-4.2.0";
name = "fdr-4.2.3";
src = fetchurl {
url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3754-linux-x86_64.tar.gz;
sha256 = "d24492485db9b8b95c62c53a6396094f836ee079cfc743688a397503c3ec9bf8";
url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz;
sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88";
};
libPath = stdenv.lib.makeLibraryPath [
@ -28,7 +28,7 @@ stdenv.mkDerivation {
cp -r * "$out"
# Hack around lack of libtinfo in NixOS
ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
ln -s ${qtbase.out}/$qtPluginPrefix $out/lib/qt_plugins
ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins
ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof

4
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View File

@ -4,13 +4,13 @@ let
inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
in buildPythonApplication rec {
name = "git-cola-${version}";
version = "2.11";
version = "3.0";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "v${version}";
sha256 = "1prv8ib9jdkj5rgixj3hvkivwmbz5xvh8bmllrb1sb301yzi1s0g";
sha256 = "0jc360agrlhp1w9i725ffksvc6v95jnzzppjvza7ssip65gplrkx";
};
buildInputs = [ git gettext ];

1
pkgs/applications/window-managers/orbment/bemenu.nix
View File

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
description = "A dynamic menu library and client program inspired by dmenu";
homepage = src.meta.homepage;
license = with licenses; [ gpl3 lgpl3 ];
maintainers = with maintainers; [ gnidorah ];
platforms = platforms.linux;
};
}

4
pkgs/applications/window-managers/sway/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "sway-${version}";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh";
sha256 = "00prns3dnafd19ap774p8v994i3p185ji0dnp2xxbkgh2z7sbwpi";
};
nativeBuildInputs = [

20
pkgs/build-support/build-fhs-userenv/chrootenv.c
View File

@ -124,16 +124,6 @@ int nftw_remove(const char *path, const struct stat *sb, int type,
return remove(path);
}
char *root;
void root_cleanup() {
if (nftw(root, nftw_remove, getdtablesize(),
FTW_DEPTH | FTW_MOUNT | FTW_PHYS) < 0)
errorf(EX_IOERR, "nftw(%s)", root);
free(root);
}
#define REQUIREMENTS \
"Requires Linux version >= 3.19 built with CONFIG_USER_NS option.\n"
@ -158,6 +148,8 @@ int main(int argc, char *argv[]) {
if (temp == NULL)
temp = "/tmp";
char *root;
if (asprintf(&root, "%s/chrootenvXXXXXX", temp) < 0)
errorf(EX_IOERR, "asprintf");
@ -166,8 +158,6 @@ int main(int argc, char *argv[]) {
if (root == NULL)
errorf(EX_IOERR, "mkdtemp(%s)", root);
atexit(root_cleanup);
// Don't make root private so that privilege drops inside chroot are possible:
if (chmod(root, 0755) < 0)
errorf(EX_IOERR, "chmod(%s, 0755)", root);
@ -232,6 +222,12 @@ int main(int argc, char *argv[]) {
if (waitpid(cpid, &status, 0) < 0)
errorf(EX_OSERR, "waitpid(%d)", cpid);
if (nftw(root, nftw_remove, getdtablesize(),
FTW_DEPTH | FTW_MOUNT | FTW_PHYS) < 0)
errorf(EX_IOERR, "nftw(%s)", root);
free(root);
if (WIFEXITED(status)) {
return WEXITSTATUS(status);
} else if (WIFSIGNALED(status)) {

2
pkgs/build-support/build-pecl.nix
View File

@ -22,6 +22,4 @@ stdenv.mkDerivation (args // {
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
autoreconfPhase = "phpize";
preConfigure = "touch unix.h";
})

19
pkgs/desktops/kde-4.14/CVE-2014-8600.diff
View File

@ -1,19 +0,0 @@
--- a/kioslave/bookmarks/kio_bookmarks.cpp
+++ b/kioslave/bookmarks/kio_bookmarks.cpp
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <qregexp.h>
+#include <qtextdocument.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
@@ -197,7 +198,7 @@
echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size"));
} else {
echoHead();
- echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
+ echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>");
}
finished();
}

36
pkgs/desktops/kde-4.14/default.nix
View File

@ -1,36 +0,0 @@
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }:
let
branch = "4.14";
# Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package {
inherit release branch ignoreList extraSubpkgs callPackage;
};
# The list of igored individual modules
ignoreList = {
# Doesn't work yet
kdeutils = [ "ksecrets" ];
# kdeadmin/strigi-analyzer has no real code
kdeadmin = [ "strigi-analyzer" ];
# Most of kdebindings do not compile due to a bug in the buildsystem
kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
};
# Extra subpackages in the manifest format
extraSubpkgs = {};
in
kde.modules // kde.individual //
{
akonadi = callPackage ./support/akonadi { };
inherit release;
l10n = callPackage ./l10n {
inherit release branch;
inherit (kde.manifest) stable;
};
}

36
pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch
View File

@ -1,36 +0,0 @@
From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 7 Sep 2015 18:55:44 -0500
Subject: [PATCH] ksysguard disable signalplottertest
---
libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
index d472fd7..f178b71 100644
--- a/libs/ksysguard/tests/CMakeLists.txt
+++ b/libs/ksysguard/tests/CMakeLists.txt
@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
-
-
-# KGraphicsSignalPlotter benchmark
-set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
-target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
-
-
-# KSignalPlotter unit test
-set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
-kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
-target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
-
-
-
-
--
2.5.0

21
pkgs/desktops/kde-4.14/kactivities.nix
View File

@ -1,21 +0,0 @@
{ fetchurl, kde, kdelibs }:
kde {
src = fetchurl {
url = "mirror://kde/stable/4.13.3/src/kactivities-4.13.3.tar.xz";
sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7";
};
outputs = [ "out" "dev" ];
outputInclude = "out";
setOutputFlags = false;
propagatedBuildInputs = [ kdelibs ];
meta = {
description = "KDE activities library and daemon";
};
}

15
pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
View File

@ -1,15 +0,0 @@
{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }:
kde {
postPatch = ''
substituteInPlace konq-plugins/validators/tidy_validator.cpp \
--replace buffio.h tidybuffio.h
'';
buildInputs = [ kdelibs html-tidy kactivities libXt ];
meta = {
description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
license = stdenv.lib.licenses.gpl2;
};
}

71
pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
View File

@ -1,71 +0,0 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";}
{name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";}
{name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";}
{name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";}
{name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";}
{name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";}
{name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";}
{name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";}
{name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";}
{name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";}
];
versions=builtins.listToAttrs[
{name="baloo";value="4.14.3";}
{name="kactivities";value="4.13.3";}
{name="kde-baseapps";value="4.14.3";}
{name="kdepimlibs";value="4.14.3";}
{name="kde-runtime";value="4.14.3";}
{name="kfilemetadata";value="4.14.3";}
{name="libkcddb";value="4.14.3";}
{name="libkdcraw";value="4.14.3";}
{name="libkexiv2";value="4.14.3";}
{name="marble";value="4.14.3";}
{name="okular";value="4.14.3";}
{name="svgpart";value="4.14.3";}
];
modules=[
{
module="kdemultimedia";
split=true;
pkgs=[
{ name="libkcddb"; }
];
}
{
module="kdegraphics";
split=true;
pkgs=[
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdelibs";
split=true;
pkgs=[
{ name = "baloo"; }
{ name = "kfilemetadata"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="marble"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kde-baseapps"; sane="kde_baseapps"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdepimlibs"; split=false;}
];
}

138
pkgs/desktops/kde-4.14/kde-package/default.nix
View File

@ -1,138 +0,0 @@
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake_2_8, automoc4, perl, pkgconfig
, release, branch, ignoreList, extraSubpkgs
}:
let
inherit (stdenv.lib) filter fold;
inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
cmake = cmake_2_8;
in
rec {
manifest = import (./. + "/${release}.nix");
# src attribute for $name tarball
kdesrc = name: version: fetchurl {
url = "mirror://kde/" + (if manifest.stable then "" else "un")
+ "stable/${release}/src/${name}-${version}.tar.xz";
sha256 = getAttr name manifest.hashes;
};
# Default meta attribute
defMeta = {
homepage = http://www.kde.org;
inherit branch;
platforms = stdenv.lib.platforms.linux;
inherit (qt4.meta) maintainers;
};
# KDE package built from the whole tarball
# This function is used both for monolithic modules and modules which are
# released as individual tarballs
kdeMonoPkg = name:
let n_ = name; v_ = getAttr name manifest.versions; in
a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}:
stdenv.mkDerivation ({
name = "${name}-${version}";
src = kdesrc name version;
nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
meta = defMeta // meta;
enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ]));
# kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
# API.
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
# Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
kdeSubdirPkg = module:
{name, subdir ? name, sane ? name}:
let name_ = name; version_ = getAttr module manifest.versions; in
a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}:
stdenv.mkDerivation ({
name = "${name}-${release}";
src = kdesrc module version;
nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
cmakeFlags =
[ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
"-DBUILD_doc=TRUE"
"-DBUILD_${subdir}=TRUE"
] ++ cmakeFlags;
meta = defMeta // meta;
enableParallelBuilding = module.enableParallelBuilding or true;
} // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ]));
# A KDE monolithic module
kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
# Combine packages in one module.
# Arguments:
# * pkgFun --- a function of the following signature:
# module: manifest_attrs: manual_attrs: derivation;
# * module --- name of the module
# * pkgs --- list of packages in manifest format
combinePkgs = pkgFun: module: pkgs:
let
f = p@{name, ...}:
callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
list = map f pkgs;
attrs = listToAttrs (map
({name, sane ? name, ...}@p: { name = sane; value = f p; })
pkgs);
in
runCommand "${module}-${release}"
({passthru = attrs // {
propagatedUserEnvPackages = list;
projects = attrs;
};})
''
mkdir -pv $out/nix-support
printWords ${toString list} | tee $out/nix-support/propagated-user-env-packages
'';
# Given manifest module data, return the module
kdeModule = { module, sane ? module, split, pkgs ? [] }:
let
pkgs_ = filterPkgs module pkgs;
in
# Module is splitted by upstream
if split then combinePkgs kdeSplittedPkg module pkgs_
# Monolithic module
else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
# Module is splitted by us
else combinePkgs kdeSubdirPkg module pkgs_;
# The same, as nameValuePair with sane name
kdeModuleNV = a@{ module, sane ? module, ... }:
{ name = sane; value = kdeModule a; };
filterPkgs = module: (p:
removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
# Remove attrsets with x.name in subst. Optimized for empty subst.
removeNames = subst: big:
fold (s: out: filter (x: x.name != s) out) big subst;
allModules = listToAttrs (map kdeModuleNV manifest.modules);
modules =
let unsplit = filter (a: ! (a ? pkgs)) manifest.modules;
in listToAttrs (map kdeModuleNV unsplit);
splittedModuleList =
let
splitted = filter (a: a ? pkgs) manifest.modules;
names = map ({module, sane ? module, ...}: sane) splitted;
in
map (m: m.projects) (stdenv.lib.attrVals names allModules);
individual =
stdenv.lib.zipAttrsWith
(
name: list:
if tail list == []
then head list
else abort "Multiple modules define ${name}"
)
splittedModuleList;
}

173
pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh
View File

@ -1,173 +0,0 @@
#! /bin/sh
# Usage: download kde release to $dir, then run
# $0 $dir
dir="$1"
if [[ -z $(type -p xsltproc) ]]; then
echo "Please provide libxslt" >&2
exit 1
fi
release=$(ls "${dir}"/kdelibs-*.tar.xz | \
sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
# Detect release number & whether it is a stable release
if [[ $? -ne 0 || -z $release ]]; then
echo "'${dir}' is not a directory (or kdelibs...tar.xz doesn't exist)!" >&2
exit 1
fi
if [[ ${release##*.} -gt 50 ]]; then
stable="false"
else
stable="true"
fi
echo "Detected release ${release}" >&2
declare -A hash
declare -A version
declare -A modules
declare -a packages
declare -a top_level
if [[ ! -f ${dir}/kde_projects.xml ]]; then
if ! curl -o "${dir}/kde_projects.xml" -J http://projects.kde.org/kde_projects.xml; then
echo "Could not download http://projects.kde.org/kde_projects.xml to ${dir}/kde_projects.xml" >&2
exit 1
fi
fi
# xsltproc output declares -A module
eval `xsltproc kde-submodules.xslt ${dir}/kde_projects.xml`
module[kde-baseapps]=kde-baseapps
unset module[kactivities]
print_sane() {
echo "Called print_sane $1" >&2
sane="${1//[^a-z0-9_]/_}"
if [[ "$sane" != "$1" ]]; then
echo "Sane version is $sane" >&2
echo -n "sane=\"$sane\";"
fi
}
for i in `cd "${dir}"; ls *.tar.xz`; do
package=${i%.tar.xz}
v=${package##*-}
package=${i%-*}
packages+=( "$package" )
echo -n "${package}.. " >&2
hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
echo -n ${hash[$package]} >&2
version[$package]=$v
if [ -n "${module[$package]}" ]; then
m="${module[$package]}"
echo " (${m})" >&2
modules[$m]=1
else
top_level+=( "$package" )
echo " (top-level)" >&2
fi
nix-store --add-fixed sha256 "${dir}/${i}" >&2
done
print_pkg_hash() {
echo " {name=\"${1}\";value=\"${hash[$1]}\";}"
}
print_pkg_version() {
echo " {name=\"${1}\";value=\"${version[$1]}\";}"
}
print_hashes(){
echo "hashes=builtins.listToAttrs["
for p in "${packages[@]}"; do print_pkg_hash "$p"; done
echo "];"
}
print_versions(){
echo "versions=builtins.listToAttrs["
for p in "${packages[@]}"; do print_pkg_version "$p"; done
echo "];"
}
print_split_module(){
echo -n "$1:" >&2
echo -e "{\n module=\"$1\";"
print_sane "$1"
echo " split=true;"
echo " pkgs=["
for p in "${packages[@]}"; do
if [[ "${module[$p]}" == "$1" ]]; then
echo -n " { name=\"$p\"; "
print_sane "$p"
echo " }"
echo -n " $p" >&2
fi
done
echo " ];"
echo "}"
echo >&2
}
print_mono_module(){
echo -en "{ module=\"$1\"; "
print_sane "$1"
echo -n "$1 ... " >&2
pkg=$(cd "$dir"; echo "$1"-*.tar.xz)
pkg="${pkg%.tar.xz}"
echo -n " split=false;"
cml="$pkg/CMakeLists.txt"
tar -xf "${dir}/$pkg.tar.xz" "$cml"
if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
echo " is monolithic (has unconditionally added subdirs)" >&2
else
subdirs=( `grep '^[^#]*add_subdirectory' $cml |
sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
grep -v '\(doc\|cmake\)'` )
echo " seems splittable, subdirs: ${subdirs[*]}" >&2
echo -e "\n pkgs=["
for s in "${subdirs[@]}"; do
echo -en " {"
echo -n " name=\"${s//\//-}\"; "
print_sane "$s"
if [[ $s != "${s//\//-}" ]]; then
echo -n "subdir=\"$s\"; "
fi
echo "}"
done
echo -e " ];\n"
fi
else
echo " is monolithic (has no subdirs)" >&2
fi
rm $cml
rmdir "$pkg"
echo "}"
}
print_modules(){
echo "modules=["
echo "Printing modules splitted by upstream" >&2
for m in "${!modules[@]}"; do print_split_module "$m"; done
echo >&2
echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
for m in "${top_level[@]}"; do print_mono_module "$m"; done
echo "];"
}
echo "Writing ${release}.nix" >&2
exec > "${release}.nix"
echo "{stable=${stable};"
print_hashes
print_versions
print_modules
echo "}"

22
pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="text" />
<xsl:template match="/">
<xsl:for-each select="kdeprojects/component[@identifier='kde']">
<xsl:text>declare -A module </xsl:text>
<xsl:for-each select="module">
<xsl:variable name="module" select='@identifier' />
<xsl:for-each select=".//project[repo]">
<xsl:text>module["</xsl:text>
<xsl:value-of select='@identifier' />
<xsl:text>"]="</xsl:text>
<xsl:value-of select="$module" />
<xsl:text>" </xsl:text>
</xsl:for-each>
</xsl:for-each>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>

12
pkgs/desktops/kde-4.14/kdeedu/marble.nix
View File

@ -1,12 +0,0 @@
{ kde, kdelibs, gpsd }:
kde {
# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
buildInputs = [ kdelibs gpsd ];
meta = {
description = "Marble Virtual Globe";
};
}

11
pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix
View File

@ -1,11 +0,0 @@
{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }:
kde {
buildInputs = [ kdelibs libraw lcms2 ];
meta = {
description = "Library for decoding RAW images";
license = stdenv.lib.licenses.gpl2;
};
}

10
pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix
View File

@ -1,10 +0,0 @@
{ stdenv, kde, kdelibs, exiv2 }:
kde {
buildInputs = [ kdelibs exiv2 ];
meta = {
description = "Exiv2 support library";
license = stdenv.lib.licenses.gpl2;
};
}

17
pkgs/desktops/kde-4.14/kdegraphics/okular.nix
View File

@ -1,17 +0,0 @@
{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, poppler_qt4, qca2
, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
kde {
# TODO: package activeapp, qmobipocket
buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre poppler_qt4
qca2 qimageblitz libtiff kactivities libkexiv2 ];
nativeBuildInputs = [ pkgconfig ];
meta = {
description = "Okular, the KDE document viewer";
license = stdenv.lib.licenses.gpl2;
};
}

10
pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix
View File

@ -1,10 +0,0 @@
{ stdenv, kde, kdelibs }:
kde {
buildInputs = [ kdelibs ];
meta = {
description = "SVG KPart";
license = stdenv.lib.licenses.gpl2;
};
}

18
pkgs/desktops/kde-4.14/kdelibs/baloo.nix
View File

@ -1,18 +0,0 @@
{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata, boost
}:
kde {
# TODO: qmobipocket
buildInputs = [
kdelibs kdepimlibs xapian qjson akonadi kfilemetadata boost
];
nativeBuildInputs = [ pkgconfig doxygen ];
meta = {
description = "Baloo";
license = stdenv.lib.licenses.gpl2;
};
}

14
pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix
View File

@ -1,14 +0,0 @@
{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }:
kde {
buildInputs = [
kdelibs poppler_qt4 taglib exiv2 ffmpeg
];
nativeBuildInputs = [ pkgconfig doxygen ];
meta = {
description = "KFileMetaData";
license = stdenv.lib.licenses.gpl2;
};
}

8
pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix
View File

@ -1,8 +0,0 @@
{ kde, kdelibs }:
kde {
#todo: libmusicbrainz5
buildInputs = [ kdelibs ];
meta = {
description = "A library used to retrieve audio CD meta data from the internet";
};
}

35
pkgs/desktops/kde-4.14/kdepimlibs.nix
View File

@ -1,35 +0,0 @@
{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
, kdelibs, akonadi, libxslt
, shared_mime_info, shared_desktop_ontologies, qjson
, automoc4, cmake_2_8, perl
}:
kde {
outputs = [ "out" "dev" ];
outputInclude = "out";
setOutputFlags = false;
nativeBuildInputs = [ automoc4 cmake_2_8 perl pkgconfig ];
cmakeFlags = [
"-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3"
];
buildInputs =
[ boost gpgme libical libxslt qjson prison
openldap cyrus_sasl akonadi shared_desktop_ontologies
shared_mime_info
];
propagatedBuildInputs = [ kdelibs ];
# Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev.
postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake";
meta = {
description = "KDE PIM libraries";
license = "LGPL";
};
}

52
pkgs/desktops/kde-4.14/l10n/default.nix
View File

@ -1,52 +0,0 @@
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, kdelibs, gettext, release, branch, stable
}:
let
inherit (stdenv.lib) attrByPath singleton;
kdeL10nDerivation =
{ lang, saneName, sha256 }:
stdenv.mkDerivation rec {
name = "kde-l10n-${saneName}-${release}";
src = fetchurl {
url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
name = "${name}.tar.xz";
inherit sha256;
};
buildInputs = [ gettext kdelibs ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
cmakeFlags = [
"-Wno-dev"
];
meta = {
description = "KDE translation for ${lang}";
inherit branch;
license = "GPL";
platforms = stdenv.lib.platforms.linux;
inherit (kdelibs.meta) maintainers homepage;
};
};
kdeL10nRelease =
builtins.listToAttrs (
map ({lang, saneName, sha256}:
{
name = saneName;
value = kdeL10nDerivation { inherit lang saneName sha256; };
}
) (import (./manifest + "-${release}.nix"))
);
in
{
inherit kdeL10nDerivation;
recurseForDerivations = true;
} // kdeL10nRelease

32
pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh
View File

@ -1,32 +0,0 @@
#!/bin/sh
# Usage: download kde-l10n to $dir, then run
# $0 $dir
dir=$1
if [[ ! -d "${dir}" ]]; then
echo "${dir} is not a directory (or doesn't exist)!" >&2
exit 1
fi
release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
echo "Detected release ${release}" >&2
exec > "manifest-${release}.nix"
echo "["
for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
lang=${i%-${release}.tar.xz}
lang=${lang#kde-l10n-}
echo -n "${lang}.. " >&2
hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
echo "{"
echo " lang = \"${lang}\";"
echo " saneName = \"$(echo $lang | sed s^@^_^g)\";"
echo " sha256 = \"${hash}\";"
echo "}"
echo $hash >&2
done
echo "]"

267
pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix
View File

@ -1,267 +0,0 @@
[
{
lang = "ar";
saneName = "ar";
sha256 = "1amzzwa4zhwm0r1b1fdi0fjp883wpbjh12wn9q42g04xzza6nq04";
}
{
lang = "bg";
saneName = "bg";
sha256 = "1x1yx6lw86bwv2d7lcfb061k1pqgqw6abqwrga7pnzfmk2fcaawb";
}
{
lang = "bs";
saneName = "bs";
sha256 = "148195dk6wmymk6jib467a10w9jajh3bmx1igxl29l7vp33xpgng";
}
{
lang = "ca";
saneName = "ca";
sha256 = "04bgjfwr5pwn79lh3wixajswmccfcqll5dnjhf84zw7p09138m0v";
}
{
lang = "ca@valencia";
saneName = "ca_valencia";
sha256 = "0p257jjilkmjrq9ddvwfdh41911b2yrcrid1j31g7gg9gp7iriq4";
}
{
lang = "cs";
saneName = "cs";
sha256 = "0kjn9pq9p8bfja6ca4pcpqgli9k1mfyh77j6i8p28i37wfmgv0cn";
}
{
lang = "da";
saneName = "da";
sha256 = "1w0ylqnxkbqz6camk8045nrxpz1n4dbz8cgl559l31m7zacq1rmb";
}
{
lang = "de";
saneName = "de";
sha256 = "0i97h1jcm8lpv3pap7wiz8nvjwf00jav5z5ymsbklagvmbmwyfyk";
}
{
lang = "el";
saneName = "el";
sha256 = "1br19741hmn08g3vzmx8dilx2kdfbg5zv1rjxnigdfwi0zphqyw9";
}
{
lang = "en_GB";
saneName = "en_GB";
sha256 = "1flp57prc12ri2rhh6vwf6hb5mqj8w1sj94pnji02ylmkghcc466";
}
{
lang = "es";
saneName = "es";
sha256 = "0waccr5mih5nv4q31k6xn07iws2by8n67riij6k9nsfsrlrxv21g";
}
{
lang = "et";
saneName = "et";
sha256 = "1bqd4jaws8890r2zjzpf6pw1k9v7h2lr7xk1dzfs8ak7gny32fm9";
}
{
lang = "eu";
saneName = "eu";
sha256 = "0q4cac4vp1s7fda328xxyzhqll0iqinn5v9syb93xfj29kij4ja2";
}
{
lang = "fa";
saneName = "fa";
sha256 = "0avabmdm9bxyb5b5d0mrv8mmwp6j1r4ch7y0ab7b4zl380blw7d3";
}
{
lang = "fi";
saneName = "fi";
sha256 = "0lk0r03r2wmqpf8n9zvwpsbl7s11dipa8kc3lmkh1yrjk8c4z2sw";
}
{
lang = "fr";
saneName = "fr";
sha256 = "1gzwc6yj7x7x3jx0270ap5nf70ckl25lqccrxiyzwx3mqfxgfbx2";
}
{
lang = "ga";
saneName = "ga";
sha256 = "0bkf62cqj4rfgz81yj9jspv5jfa932hsyhk4kq0r2hqsm8gndddd";
}
{
lang = "gl";
saneName = "gl";
sha256 = "00m4m480fqls5i1cvdidkq3nb8xzqhgyqqp0zk3j3qybxfq98yg5";
}
{
lang = "he";
saneName = "he";
sha256 = "1488lk7jniv0hj77wcfxplxw10srp3df6lv6llss8b5m3yqb061a";
}
{
lang = "hi";
saneName = "hi";
sha256 = "16ni7257b1ch0wabncvq17569c57ncz7pzqgqm830bj8ldpk9zzv";
}
{
lang = "hr";
saneName = "hr";
sha256 = "1si90cnwjsvw553pmppb0aakfk7fan2jk44ag0j191kdiir2b3xk";
}
{
lang = "hu";
saneName = "hu";
sha256 = "1x2s2cd521ffp5azzrzq2w2cr4sjz6gpg1a1h9jg4749xwqfhc1a";
}
{
lang = "ia";
saneName = "ia";
sha256 = "1ybaihygv0lviw6bq3a6ki40glgs49gsk29abq4y95bi9ymlrryc";
}
{
lang = "id";
saneName = "id";
sha256 = "1s8zliwc737avc04n2l27rhhh9isz9ag81nsajai27yxif0ncn7x";
}
{
lang = "is";
saneName = "is";
sha256 = "1x2mag8jwlmbh8v8y3rmvp9n69sv2xfwwsxw7c9vb8qg4cybax1c";
}
{
lang = "it";
saneName = "it";
sha256 = "1ng2hzrbvcak3nhbmlb3h64a15h34zfrgabzwrjvi2b0fv8liycw";
}
{
lang = "ja";
saneName = "ja";
sha256 = "01klhf9bmha9x6s39r4wnd0hxn35jg5bh7h9rwqij3nf06rddfrj";
}
{
lang = "kk";
saneName = "kk";
sha256 = "149fi65z1x64svs00rn82njmw6l0pncgs4b5d66fb18ah3bjlfg2";
}
{
lang = "km";
saneName = "km";
sha256 = "17hjv0gi2fqa5gkjgmqkxb4k7z3zizrxax6inq8s03g4f2vfibaz";
}
{
lang = "ko";
saneName = "ko";
sha256 = "19yhacc0v5grxc35bmks9r4qy091qij26yfi2qvs3rca7cc374jp";
}
{
lang = "lt";
saneName = "lt";
sha256 = "0y0nkvqidc12paf8ghk4p6z213gxcyv27nvglk120l2602980idj";
}
{
lang = "lv";
saneName = "lv";
sha256 = "0msw54v8d9p08c7prw6m20w29qf8f0yb32s378knhsql6abv5gln";
}
{
lang = "mr";
saneName = "mr";
sha256 = "05kcm7x7jj4lppn6fd1jlzl37r3gs9wrz0cckwpscc2m6y2g7p55";
}
{
lang = "nb";
saneName = "nb";
sha256 = "0wsdr8yyjjik2h30xy7y38i5hagy4jya98cqjbcrrab35i677l9a";
}
{
lang = "nds";
saneName = "nds";
sha256 = "0lr5z1r8v3fkqpkcjvnml2s9jh50wmqsqiyls9ivr46ygwm8wcbq";
}
{
lang = "nl";
saneName = "nl";
sha256 = "09w8cniq3z11900axjcdlm24jbzjjsqcpdwpvhvc9z78hfsjqp36";
}
{
lang = "nn";
saneName = "nn";
sha256 = "1b304wg1143pk7ib8k451g2riq87c1h0611khslghy428q4rviwd";
}
{
lang = "pa";
saneName = "pa";
sha256 = "02y56ld5hiywph88khh55hqg0gpcvmqcqrbpsidzx3qdgh5j40nl";
}
{
lang = "pl";
saneName = "pl";
sha256 = "137mfrr7wza2pg4yzqqi93bsmsrjvj0ar27gi3lk1qh6zniwyjai";
}
{
lang = "pt";
saneName = "pt";
sha256 = "1zb454rg4pigkldg9jp97r2r7k8azwxbal77zscky2q6rbw0sjcn";
}
{
lang = "pt_BR";
saneName = "pt_BR";
sha256 = "1zrn09k99pfscnc5zyxh1jzyrbirhy8ilwacbgg913maaanjprny";
}
{
lang = "ro";
saneName = "ro";
sha256 = "1lkr14if7jmfcxmb10pf11a6xjxxqxrq45lwdx19kj3djgr5l4pc";
}
{
lang = "ru";
saneName = "ru";
sha256 = "1ldf4y9wck339n0jq8x43x9h57jvfg3qk0spfv9d5fw9qyxygwwi";
}
{
lang = "sk";
saneName = "sk";
sha256 = "1n4qjwvpkddwizl8k3gr1xwv8icwd6lqsg09cypax049g3q2sy4p";
}
{
lang = "sl";
saneName = "sl";
sha256 = "1k111r9ssprgali6sg3wpbvp635hb56ckmcgpdhyvk6bbkcbnbmr";
}
{
lang = "sr";
saneName = "sr";
sha256 = "0pini77jlnrv2fhl0j99wjxylwlj77bihcbfvnkf5bganffgwc11";
}
{
lang = "sv";
saneName = "sv";
sha256 = "0ykxy95a4q0pp5ibmw20ckg33b3h89g2m86p6fcfnqf6350nxs2v";
}
{
lang = "tr";
saneName = "tr";
sha256 = "15vcfpyc30ia6bsjgwv3zhydv2nlnmggr8i2yjpnb5dlynn3sywh";
}
{
lang = "ug";
saneName = "ug";
sha256 = "0qhzfbd3j0d7grg4ghzn7y5vrl031iz9krifv7dv6jgp68fzz1h0";
}
{
lang = "uk";
saneName = "uk";
sha256 = "03n2myhwx9lvm1vzqvrg2sgl3y1m0rrrskqa22m06fjmh4vxawhx";
}
{
lang = "wa";
saneName = "wa";
sha256 = "11b7gyy31n2zfhkaj304pd4lkr14sp1sgi4pzv86c824sr6lp01v";
}
{
lang = "zh_CN";
saneName = "zh_CN";
sha256 = "1r5gxadd94ckdpkwcchwa8k735g2y9x7bi6px6hm7qlxdbi9sjmq";
}
{
lang = "zh_TW";
saneName = "zh_TW";
sha256 = "04bvvb3na4arns483fz27npjs045hf3s53p2rkd2nvq9gwvn0kmi";
}
]

24
pkgs/desktops/kde-4.14/support/akonadi/default.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite, pkgconfig }:
stdenv.mkDerivation rec {
name = "akonadi-1.13.0";
src = fetchurl {
url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
sha256 = "8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2";
};
buildInputs = [ qt4 soprano libxslt boost sqlite ];
nativeBuildInputs = [ cmake automoc4 shared_mime_info pkgconfig ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "KDE PIM Storage Service";
license = "LGPL";
homepage = http://pim.kde.org/akonadi;
maintainers = [ maintainers.sander maintainers.phreedom ];
platforms = platforms.linux;
};
}

17
pkgs/desktops/plasma-5/breeze-qt4.nix
View File

@ -1,17 +0,0 @@
{
mkDerivation, lib,
automoc4, cmake, perl, pkgconfig,
kdelibs4, qt4, xproto
}:
mkDerivation {
name = "breeze-qt4";
sname = "breeze";
buildInputs = [ kdelibs4 qt4 xproto ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
outputs = [ "out" "dev" ];
cmakeFlags = [
"-DUSE_KDE4=ON"
"-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
];
}

1
pkgs/desktops/plasma-5/default.nix
View File

@ -100,7 +100,6 @@ let
in {
bluedevil = callPackage ./bluedevil.nix {};
breeze-gtk = callPackage ./breeze-gtk.nix {};
breeze-qt4 = callPackage ./breeze-qt4.nix {};
breeze-qt5 = callPackage ./breeze-qt5.nix {};
breeze-grub = callPackage ./breeze-grub.nix {};
breeze-plymouth = callPackage ./breeze-plymouth {};

5
pkgs/development/beam-modules/default.nix
View File

@ -44,6 +44,11 @@ let
# BEAM-based languages.
elixir = elixir_1_5;
elixir_1_6_rc = lib.callElixir ../interpreters/elixir/1.6.nix {
inherit rebar erlang;
debugInfo = true;
};
elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
inherit rebar erlang;
debugInfo = true;

31
pkgs/development/compilers/ghc/6.10.2-binary.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, fetchurl, perl
, libedit, ncurses5, gmp
, enableIntegerSimple ? false
}:
stdenv.mkDerivation rec {
@ -22,7 +23,11 @@ stdenv.mkDerivation rec {
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
buildInputs = [perl];
nativeBuildInputs = [ perl ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ libedit ncurses5 gmp ];
postUnpack =
# Strip is harmful, see also below. It's important that this happens
@ -40,17 +45,19 @@ stdenv.mkDerivation rec {
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${stdenv.lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \;
find . -type f -perm -0100 -exec patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
for prog in ld ar gcc strip ranlib; do
find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
done
'';
configurePhase = ''
./configure --prefix=$out --with-gmp-libraries=${stdenv.lib.getLib gmp}/lib --with-gmp-includes=${stdenv.lib.getDev gmp}/include
'';
configurePlatforms = [ ];
configureFlags = [
"--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
"--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
];
# Stripping combined with patchelf breaks the executables (they die
# with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
@ -63,7 +70,17 @@ stdenv.mkDerivation rec {
postInstall = ''
# bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way
sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp.out}/lib\",\2@" $out/lib/ghc-${version}/package.conf
'';
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
find "$out" -type f -executable \
-exec patchelf --set-rpath "${LD_LIBRARY_PATH}" {} \;
'';
doInstallCheck = true;
installCheckPhase = ''
# Sanity check, can ghc create executables?
cd $TMP
mkdir test-ghc; cd test-ghc

75
pkgs/development/compilers/ghc/7.0.4-binary.nix
View File

@ -3,6 +3,16 @@
, ncurses5, gmp, libiconv
}:
let
libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+ "LD_LIBRARY_PATH";
in
stdenv.mkDerivation rec {
version = "7.0.4";
@ -28,7 +38,11 @@ stdenv.mkDerivation rec {
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
buildInputs = [perl];
nativeBuildInputs = [ perl ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
${libEnvVar} = libPath;
postUnpack =
# GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
@ -57,41 +71,25 @@ stdenv.mkDerivation rec {
find . -name base.buildinfo \
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
'' +
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
# Rename needed libraries and binaries, fix interpreter
stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \;
find . -type f -perm -0100 -exec patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do
find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
done
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# not enough room in the object files for the full path to libiconv :(
fix () {
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1
}
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist/build/tmp
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist/build/tmp
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp
for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do
fix $(find . -type f -name $file)
done
for file in $(find . -name setup-config); do
substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
done
'';
configurePhase = ''
./configure --prefix=$out \
--with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \
${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
'';
configurePlatforms = [ ];
configureFlags = [
"--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
"--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
# Stripping combined with patchelf breaks the executables (they die
# with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
@ -101,7 +99,26 @@ stdenv.mkDerivation rec {
# calls install-strip ...
dontBuild = true;
postInstall = ''
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
find "$out" -type f -executable \
-exec patchelf --set-rpath "${libPath}" {} \;
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# not enough room in the object files for the full path to libiconv :(
for exe in $(find "$out" -type f -executable); do
isScript $exe && continue
ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
done
for file in $(find "$out" -name setup-config); do
substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
done
'';
doInstallCheck = true;
installCheckPhase = ''
# Sanity check, can ghc create executables?
cd $TMP
mkdir test-ghc; cd test-ghc

153
pkgs/development/compilers/ghc/7.10.3-binary.nix Normal file
View File

@ -0,0 +1,153 @@
{ stdenv
, fetchurl, perl
, ncurses5, gmp, libiconv
, gcc
}:
let
libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+ "LD_LIBRARY_PATH";
in
stdenv.mkDerivation rec {
version = "7.10.3";
name = "ghc-${version}-binary";
src = fetchurl ({
"i686-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-i386-deb7-linux.tar.bz2";
sha256 = "20b32912fb7e57910a3c908f99a9519b57a4872e1ea0f4f2265b2f7b30e8a3cd";
};
"x86_64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-deb8-linux.tar.bz2";
sha256 = "5e163c557e9236cce68be41c984eab0fcdbdc1602e39040ca9ae325e6bdec1c3";
};
"armv7-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.bz2";
sha256 = "2913763eef88e4d1843a1e4c34225afb1866310d1a1956c08a4131f4593518f6";
};
"x86_64-darwin" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-apple-darwin.tar.bz2";
sha256 = "4b537228d49b5ea0f8e8dbcc440a5b3c3cb19a92579d607291cc0041422fa5c3";
};
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
nativeBuildInputs = [ perl ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
${libEnvVar} = libPath;
postUnpack =
# GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
# during linking
stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
# not enough room in the object files for the full path to libiconv :(
for exe in $(find . -type f -executable); do
isScript $exe && continue
ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
done
'' +
# Some scripts used during the build need to have their shebangs patched
''
patchShebangs ghc-${version}/utils/
'' +
# Strip is harmful, see also below. It's important that this happens
# first. The GHC Cabal build system makes use of strip by default and
# has hardcoded paths to /usr/bin/strip in many places. We replace
# those below, making them point to our dummy script.
''
mkdir "$TMP/bin"
for i in strip; do
echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
chmod +x "$TMP/bin/$i"
done
PATH="$TMP/bin:$PATH"
'' +
# We have to patch the GMP paths for the integer-gmp package.
''
find . -name integer-gmp.buildinfo \
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
'' + stdenv.lib.optionalString stdenv.isDarwin ''
find . -name base.buildinfo \
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
'' +
# Rename needed libraries and binaries, fix interpreter
stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 -exec patchelf \
--replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
--replace-needed libtinfo.so libtinfo.so.5 \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
'';
configurePlatforms = [ ];
configureFlags = [
"--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
"--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
# Stripping combined with patchelf breaks the executables (they die
# with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
dontStrip = true;
# No building is necessary, but calling make without flags ironically
# calls install-strip ...
dontBuild = true;
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
for p in $(find "$out" -type f -executable); do
if isELF "$p"; then
echo "Patchelfing $p"
patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
fi
done
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# not enough room in the object files for the full path to libiconv :(
for exe in $(find "$out" -type f -executable); do
isScript $exe && continue
ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
done
for file in $(find "$out" -name setup-config); do
substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
done
'';
doInstallCheck = true;
installCheckPhase = ''
unset ${libEnvVar}
# Sanity check, can ghc create executables?
cd $TMP
mkdir test-ghc; cd test-ghc
cat > main.hs << EOF
{-# LANGUAGE TemplateHaskell #-}
module Main where
main = putStrLn \$([|"yes"|])
EOF
$out/bin/ghc --make main.hs || exit 1
echo compilation ok
[ $(./main) == "yes" ]
'';
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
}

81
pkgs/development/compilers/ghc/7.4.2-binary.nix
View File

@ -1,8 +1,18 @@
{ stdenv
, fetchurl, perl, makeWrapper
, fetchurl, perl
, ncurses5, gmp, libiconv
}:
let
libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+ "LD_LIBRARY_PATH";
in
stdenv.mkDerivation rec {
version = "7.4.2";
@ -28,7 +38,11 @@ stdenv.mkDerivation rec {
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
buildInputs = [perl];
nativeBuildInputs = [ perl ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
${libEnvVar} = libPath;
postUnpack =
# GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
@ -57,14 +71,11 @@ stdenv.mkDerivation rec {
find . -name base.buildinfo \
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
'' +
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
# Rename needed libraries and binaries, fix interpreter
stdenv.lib.optionalString stdenv.isLinux ''
mkdir -p "$out/lib"
ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \;
find . -type f -perm -0100 -exec patchelf \
--replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
@ -73,30 +84,13 @@ stdenv.mkDerivation rec {
for prog in ld ar gcc strip ranlib; do
find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
done
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# not enough room in the object files for the full path to libiconv :(
fix () {
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $1
}
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/ghc-pwd/dist-install/build/tmp
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/utils/hpc/dist-install/build/tmp
ln -s ${libiconv}/lib/libiconv.dylib ghc-${version}/ghc/stage2/build/tmp
for file in ghc-cabal ghc-pwd ghc-stage2 ghc-pkg haddock hsc2hs hpc; do
fix $(find . -type f -name $file)
done
for file in $(find . -name setup-config); do
substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
done
'';
configurePhase = ''
./configure --prefix=$out \
--with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \
${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
'';
configurePlatforms = [ ];
configureFlags = [
"--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
"--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
# Stripping combined with patchelf breaks the executables (they die
# with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
@ -106,15 +100,26 @@ stdenv.mkDerivation rec {
# calls install-strip ...
dontBuild = true;
preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/lib/ghc-${version}
mkdir -p $out/bin
ln -s ${libiconv}/lib/libiconv.dylib $out/bin
ln -s ${libiconv}/lib/libiconv.dylib $out/lib/ghc-${version}/libiconv.dylib
ln -s ${libiconv}/lib/libiconv.dylib utils/ghc-cabal/dist-install/build/tmp
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
find "$out" -type f -executable \
-exec patchelf --set-rpath "${libPath}" {} \;
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# not enough room in the object files for the full path to libiconv :(
for exe in $(find "$out" -type f -executable); do
isScript $exe && continue
ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
done
for file in $(find "$out" -name setup-config); do
substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
done
'';
postInstall = ''
doInstallCheck = true;
installCheckPhase = ''
# Sanity check, can ghc create executables?
cd $TMP
mkdir test-ghc; cd test-ghc

151
pkgs/development/compilers/ghc/7.8.4-binary.nix Normal file
View File

@ -0,0 +1,151 @@
{ stdenv
, fetchurl, perl
, ncurses5, gmp, libiconv
}:
let
libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+ "LD_LIBRARY_PATH";
in
stdenv.mkDerivation rec {
version = "7.8.4";
name = "ghc-${version}-binary";
src = fetchurl ({
"i686-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux-deb7.tar.bz2";
sha256 = "5da2cf45986f33319a92a666f1f0149915334a7b64b41892ab94f4557242b406";
};
"x86_64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux-deb7.tar.bz2";
sha256 = "20b5731d268613bbf6e977dbb192a3a3b7b78d954c35edbfca4fb36b652e24f7";
};
"x86_64-darwin" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2";
sha256 = "dfa161c2a136ee16214a49d5902e2377407c8292dbbdbb14fa0fa6b17220cae6";
};
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
nativeBuildInputs = [ perl ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
${libEnvVar} = libPath;
postUnpack =
# GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
# during linking
stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
# not enough room in the object files for the full path to libiconv :(
for exe in $(find . -type f -executable); do
isScript $exe && continue
ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
for file in $(find . -name setup-config); do
substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
done
done
'' +
# Some scripts used during the build need to have their shebangs patched
''
patchShebangs ghc-${version}/utils/
'' +
# Strip is harmful, see also below. It's important that this happens
# first. The GHC Cabal build system makes use of strip by default and
# has hardcoded paths to /usr/bin/strip in many places. We replace
# those below, making them point to our dummy script.
''
mkdir "$TMP/bin"
for i in strip; do
echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
chmod +x "$TMP/bin/$i"
done
PATH="$TMP/bin:$PATH"
'' +
# We have to patch the GMP paths for the integer-gmp package.
''
find . -name integer-gmp.buildinfo \
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
'' + stdenv.lib.optionalString stdenv.isDarwin ''
find . -name base.buildinfo \
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
'' +
# Rename needed libraries and binaries, fix interpreter
stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 -exec patchelf \
--replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
--replace-needed libtinfo.so libtinfo.so.5 \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
'';
configurePlatforms = [ ];
configureFlags = [
"--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
"--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
# Stripping combined with patchelf breaks the executables (they die
# with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
dontStrip = true;
# No building is necessary, but calling make without flags ironically
# calls install-strip ...
dontBuild = true;
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
for p in $(find "$out" -type f -executable); do
if isELF "$p"; then
echo "Patchelfing $p"
patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
fi
done
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# not enough room in the object files for the full path to libiconv :(
for exe in $(find "$out" -type f -executable); do
isScript $exe && continue
ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
done
for file in $(find "$out" -name setup-config); do
substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
done
'';
doInstallCheck = true;
installCheckPhase = ''
unset ${libEnvVar}
# Sanity check, can ghc create executables?
cd $TMP
mkdir test-ghc; cd test-ghc
cat > main.hs << EOF
{-# LANGUAGE TemplateHaskell #-}
module Main where
main = putStrLn \$([|"yes"|])
EOF
$out/bin/ghc --make main.hs || exit 1
echo compilation ok
[ $(./main) == "yes" ]
'';
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
}

156
pkgs/development/compilers/ghc/8.2.1-binary.nix Normal file
View File

@ -0,0 +1,156 @@
{ stdenv
, fetchurl, perl, gcc
, ncurses5, gmp, libiconv
}:
let
libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+ "LD_LIBRARY_PATH";
in
stdenv.mkDerivation rec {
version = "8.2.1";
name = "ghc-${version}-binary";
src = fetchurl ({
"i686-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "d86f9c157dd4161a8acb14062c131c8985a4f65fc856603c373502be1d50c95e";
};
"x86_64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130";
};
"armv7-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz";
sha256 = "0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019";
};
"aarch64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz";
sha256 = "61dab9c95ef9f9af8bce7338863fda3e42945eb46194b12d922b6d0dc245d0c2";
};
"x86_64-darwin" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "900c802025fb630060dbd30f9738e5d107a4ca5a50d5c1262cd3e69fe4467188";
};
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
nativeBuildInputs = [ perl ];
# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
${libEnvVar} = libPath;
postUnpack =
# GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
# during linking
stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
# not enough room in the object files for the full path to libiconv :(
for exe in $(find . -type f -executable); do
isScript $exe && continue
ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
done
'' +
# Some scripts used during the build need to have their shebangs patched
''
patchShebangs ghc-${version}/utils/
'' +
# Strip is harmful, see also below. It's important that this happens
# first. The GHC Cabal build system makes use of strip by default and
# has hardcoded paths to /usr/bin/strip in many places. We replace
# those below, making them point to our dummy script.
''
mkdir "$TMP/bin"
for i in strip; do
echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
chmod +x "$TMP/bin/$i"
done
PATH="$TMP/bin:$PATH"
'' +
# We have to patch the GMP paths for the integer-gmp package.
''
find . -name integer-gmp.buildinfo \
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
'' + stdenv.lib.optionalString stdenv.isDarwin ''
find . -name base.buildinfo \
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
'' +
# Rename needed libraries and binaries, fix interpreter
stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 -exec patchelf \
--replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
--replace-needed libtinfo.so libtinfo.so.5 \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
'';
configurePlatforms = [ ];
configureFlags = [
"--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
"--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
# Stripping combined with patchelf breaks the executables (they die
# with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
dontStrip = true;
# No building is necessary, but calling make without flags ironically
# calls install-strip ...
dontBuild = true;
# On Linux, use patchelf to modify the executables so that they can
# find editline/gmp.
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
for p in $(find "$out" -type f -executable); do
if isELF "$p"; then
echo "Patchelfing $p"
patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
fi
done
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# not enough room in the object files for the full path to libiconv :(
for exe in $(find "$out" -type f -executable); do
isScript $exe && continue
ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
done
for file in $(find "$out" -name setup-config); do
substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
done
'';
doInstallCheck = true;
installCheckPhase = ''
unset ${libEnvVar}
# Sanity check, can ghc create executables?
cd $TMP
mkdir test-ghc; cd test-ghc
cat > main.hs << EOF
{-# LANGUAGE TemplateHaskell #-}
module Main where
main = putStrLn \$([|"yes"|])
EOF
$out/bin/ghc --make main.hs || exit 1
echo compilation ok
[ $(./main) == "yes" ]
'';
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
}

27
pkgs/development/coq-modules/tlc/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl, coq }:
stdenv.mkDerivation rec {
version = "20171206";
name = "coq${coq.coq-version}-tlc-${version}";
src = fetchurl {
url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz";
sha256 = "1wc44qb5zmarafp56gdrbka8gllipqna9cj0a6d99jzb361xg4mf";
};
buildInputs = [ coq ];
installFlags = "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib";
meta = {
homepage = "http://www.chargueraud.org/softs/tlc/";
description = "A non-constructive library for Coq";
license = stdenv.lib.licenses.free;
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (coq.meta) platforms;
};
passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
};
}

4
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -952,8 +952,8 @@ self: super: {
hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; };
# These packages depend on each other, forming an infinite loop.
scalendar = null;
SCalendar = null;
scalendar = markBroken (super.scalendar.override { SCalendar = null; });
SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
# Needs QuickCheck <2.10, which we don't have.
edit-distance = doJailbreak super.edit-distance;

100
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 10.0
# LTS Haskell 10.1
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -70,11 +70,12 @@ default-package-overrides:
- aeson-compat ==0.3.7.1
- aeson-diff ==1.1.0.4
- aeson-extra ==0.4.1.0
- aeson-generic-compat ==0.0.1.0
- aeson-generic-compat ==0.0.1.1
- aeson-injector ==1.1.0.0
- aeson-pretty ==0.8.5
- aeson-qq ==0.8.2
- aeson-utils ==0.3.0.2
- aeson-yak ==0.1.1.3
- Agda ==2.5.3
- airship ==0.9.2
- alarmclock ==0.4.0.3
@ -87,7 +88,7 @@ default-package-overrides:
- alsa-pcm ==0.6.0.4
- alsa-seq ==0.6.0.7
- alternative-vector ==0.0.0
- alternators ==0.1.1.1
- alternators ==0.1.2.0
- ALUT ==2.4.0.2
- amazonka ==1.5.0
- amazonka-apigateway ==1.5.0
@ -190,7 +191,7 @@ default-package-overrides:
- apportionment ==0.0.0.2
- approximate ==0.3.1
- app-settings ==0.2.0.11
- arithmoi ==0.6.0.0
- arithmoi ==0.6.0.1
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
- arrow-list ==0.7
@ -224,7 +225,7 @@ default-package-overrides:
- authenticate ==1.3.4
- authenticate-oauth ==1.6
- auto ==0.4.3.1
- autoexporter ==1.1.2
- autoexporter ==1.1.3
- auto-update ==0.1.4
- avers ==0.0.17.1
- avers-api ==0.1.0
@ -350,7 +351,7 @@ default-package-overrides:
- cabal-doctest ==1.0.4
- cabal-file-th ==0.2.4
- cabal-rpm ==0.12
- cabal-toolkit ==0.0.3
- cabal-toolkit ==0.0.4
- cache ==0.1.0.0
- cairo ==0.13.4.2
- calendar-recycling ==0.0
@ -448,10 +449,10 @@ default-package-overrides:
- conduit-algorithms ==0.0.6.1
- conduit-combinators ==1.1.2
- conduit-connection ==0.1.0.3
- conduit-extra ==1.2.2
- conduit-extra ==1.2.3
- conduit-iconv ==0.1.1.2
- conduit-parse ==0.1.2.2
- conduit-throttle ==0.3.0.0
- conduit-throttle ==0.3.1.0
- ConfigFile ==1.1.4
- config-ini ==0.2.1.1
- configuration-tools ==0.3.0
@ -536,7 +537,7 @@ default-package-overrides:
- data-default-instances-containers ==0.0.1
- data-default-instances-dlist ==0.0.1
- data-default-instances-old-locale ==0.0.1
- data-diverse ==2.0.0.0
- data-diverse ==2.0.1.0
- data-diverse-lens ==1.0.0.1
- data-dword ==0.3.1.1
- data-endian ==0.1.1
@ -584,7 +585,7 @@ default-package-overrides:
- diagrams-canvas ==1.4
- diagrams-contrib ==1.4.1
- diagrams-core ==1.4.0.1
- diagrams-lib ==1.4.1.2
- diagrams-lib ==1.4.2
- diagrams-postscript ==1.4
- diagrams-solve ==0.1.1
- diagrams-svg ==1.4.1.1
@ -627,7 +628,7 @@ default-package-overrides:
- doctest-driver-gen ==0.1.0.1
- do-list ==1.0.1
- dom-parser ==3.0.0
- dotenv ==0.5.1.1
- dotenv ==0.5.2.0
- dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.2.0
- download ==0.3.2.6
@ -635,7 +636,7 @@ default-package-overrides:
- drawille ==0.1.2.0
- DRBG ==0.5.5
- drifter ==0.2.3
- drifter-postgresql ==0.2.0
- drifter-postgresql ==0.2.1
- dsp ==0.2.4
- dual-tree ==0.2.1
- dublincore-xml-conduit ==0.1.0.2
@ -762,7 +763,7 @@ default-package-overrides:
- flexible-defaults ==0.0.1.2
- FloatingHex ==0.4
- floatshow ==0.2.4
- flow ==1.0.9
- flow ==1.0.10
- fmlist ==0.9
- fmt ==0.5.0.0
- fn ==0.3.0.2
@ -789,7 +790,7 @@ default-package-overrides:
- free-vl ==0.1.4
- friday ==0.2.3.1
- friendly-time ==0.4.1
- frisby ==0.2.1
- frisby ==0.2.2
- from-sum ==0.2.1.0
- frontmatter ==0.1.0.2
- fsnotify ==0.2.1.1
@ -860,7 +861,7 @@ default-package-overrides:
- giphy-api ==0.5.2.0
- git ==0.2.1
- github ==0.18
- github-release ==1.1.0
- github-release ==1.1.2
- github-types ==0.2.1
- github-webhook-handler ==0.0.8
- github-webhook-handler-snap ==0.0.7
@ -1065,7 +1066,7 @@ default-package-overrides:
- haskell-tools-refactor ==1.0.0.2
- haskell-tools-rewrite ==1.0.0.2
- haskintex ==0.8.0.0
- hasmin ==1.0
- hasmin ==1.0.1
- hasql ==1.1.1
- hasql-migration ==0.1.3
- hasql-optparse-applicative ==0.2.4
@ -1093,7 +1094,7 @@ default-package-overrides:
- hedgehog ==0.5.1
- hedgehog-quickcheck ==0.1
- hedis ==0.9.12
- here ==1.2.11
- here ==1.2.12
- heredoc ==0.2.0.0
- heterocephalus ==1.0.5.1
- hex ==0.1.2
@ -1163,8 +1164,8 @@ default-package-overrides:
- hsebaysdk ==0.4.0.0
- hse-cpp ==0.2
- hsemail ==2
- HSet ==0.0.1
- hset ==2.2.0
- HSet ==0.0.1
- hsexif ==0.6.1.5
- hs-GeoIP ==0.3
- hsignal ==0.2.7.5
@ -1275,7 +1276,7 @@ default-package-overrides:
- imagesize-conduit ==1.1
- Imlib ==0.1.2
- immortal ==0.2.2.1
- importify ==1.0
- importify ==1.0.1
- include-file ==0.1.0.3
- incremental-parser ==0.2.5.2
- indentation-core ==0.0.0.1
@ -1311,12 +1312,12 @@ default-package-overrides:
- io-storage ==0.3
- io-streams ==1.5.0.1
- io-streams-haproxy ==1.0.0.2
- ip ==1.1.0
- ip ==1.1.1
- ip6addr ==0.5.3
- iproute ==1.7.1
- IPv6Addr ==1.0.1
- IPv6DB ==0.2.3
- ipython-kernel ==0.9.0.0
- ipython-kernel ==0.9.0.1
- irc ==0.6.1.0
- irc-client ==1.0.0.1
- irc-conduit ==0.2.2.4
@ -1372,7 +1373,7 @@ default-package-overrides:
- kraken ==0.1.0
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==0.4.6
- lackey ==0.4.7
- lame ==0.1.1
- language-c ==0.7.1
- language-c-quote ==0.12.1
@ -1432,8 +1433,8 @@ default-package-overrides:
- ListLike ==4.5.1
- listsafe ==0.1.0.1
- list-t ==1.0.0.1
- llvm-hs ==5.1.0
- llvm-hs-pure ==5.1.0
- llvm-hs ==5.1.2
- llvm-hs-pure ==5.1.1
- lmdb ==0.2.5
- load-env ==0.1.2
- loch-th ==0.2.1
@ -1452,12 +1453,12 @@ default-package-overrides:
- logging-facade-syslog ==1
- logict ==0.6.0.2
- log-postgres ==0.7.0.2
- log-warper ==1.8.2
- log-warper ==1.8.3
- loop ==0.3.0
- lrucache ==1.2.0.0
- lrucaching ==0.3.2
- lucid ==2.9.9
- lxd-client ==0.1.0.4
- lxd-client ==0.1.0.5
- lxd-client-config ==0.1.0.1
- lzma ==0.0.0.3
- lzma-conduit ==1.2.0
@ -1493,7 +1494,7 @@ default-package-overrides:
- med-module ==0.1.1
- megaparsec ==6.3.0
- mega-sdist ==0.3.0.5
- memory ==0.14.10
- memory ==0.14.11
- MemoTrie ==0.6.8
- mercury-api ==0.1.0.1
- mersenne-random-pure64 ==0.2.2.0
@ -1510,7 +1511,7 @@ default-package-overrides:
- microlens-mtl ==0.1.11.0
- microlens-platform ==0.3.9.0
- microlens-th ==0.4.1.1
- microsoft-translator ==0.1.0.0
- microsoft-translator ==0.1.1
- microspec ==0.1.0.0
- microstache ==1.0.1.1
- midi ==0.2.2.1
@ -1531,7 +1532,7 @@ default-package-overrides:
- mixed-types-num ==0.3.1.4
- mltool ==0.1.0.2
- mmap ==0.5.9
- mmark ==0.0.3.0
- mmark ==0.0.3.2
- mmark-ext ==0.0.1.1
- mmorph ==1.1.0
- mnist-idx ==0.1.2.8
@ -1579,7 +1580,7 @@ default-package-overrides:
- monoid-extras ==0.4.2
- monoid-subclasses ==0.4.4
- monoid-transformer ==0.0.3
- mono-traversable ==1.0.5.0
- mono-traversable ==1.0.6.0
- mono-traversable-instances ==0.1.0.0
- morte ==1.6.13
- mountpoints ==1.0.2
@ -1621,7 +1622,7 @@ default-package-overrides:
- nettle ==0.2.0
- netwire ==5.0.2
- netwire-input ==0.0.6
- netwire-input-glfw ==0.0.6
- netwire-input-glfw ==0.0.7
- network ==2.6.3.2
- network-anonymous-i2p ==0.10.0
- network-anonymous-tor ==0.11.0
@ -1670,7 +1671,7 @@ default-package-overrides:
- nvim-hs-contrib ==0.2.0
- nvim-hs-ghcid ==0.2.0
- nvvm ==0.8.0.1
- objective ==1.1.1
- objective ==1.1.2
- ObjectName ==1.1.0.1
- ochintin-daicho ==0.1.0.1
- oeis ==0.3.9
@ -1689,7 +1690,7 @@ default-package-overrides:
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.1
- OpenGL ==3.0.2.0
- OpenGLRaw ==3.2.6.0
- OpenGLRaw ==3.2.7.0
- openpgp-asciiarmor ==0.1
- opensource ==0.1.0.0
- openssl-streams ==1.2.1.3
@ -1710,7 +1711,7 @@ default-package-overrides:
- pagination ==0.2.1
- palette ==0.1.0.5
- pandoc ==2.0.5
- pandoc-citeproc ==0.12.1.1
- pandoc-citeproc ==0.12.2
- pandoc-types ==1.17.3
- pango ==0.13.4.0
- papillon ==0.1.0.5
@ -1807,7 +1808,7 @@ default-package-overrides:
- postgresql-schema ==0.1.14
- postgresql-simple ==0.5.3.0
- postgresql-simple-migration ==0.1.11.0
- postgresql-simple-queue ==1.0.0
- postgresql-simple-queue ==1.0.1
- postgresql-simple-url ==0.2.0.0
- postgresql-transactional ==1.1.1
- postgresql-typed ==0.5.2
@ -1907,8 +1908,8 @@ default-package-overrides:
- rank-product ==0.2.0.1
- Rasterific ==0.7.2.1
- rasterific-svg ==0.3.3
- ratel ==0.3.7
- ratel-wai ==0.3.1
- ratel ==0.3.8
- ratel-wai ==0.3.2
- ratio-int ==0.1.2
- rattletrap ==3.1.2
- rawfilepath ==0.2.4
@ -2096,11 +2097,11 @@ default-package-overrides:
- siphash ==1.0.3
- skein ==1.0.9.4
- skeletons ==0.4.0
- skylighting ==0.5
- skylighting ==0.5.0.1
- slack-web ==0.2.0.1
- slave-thread ==1.0.2
- slug ==0.1.7
- smallcheck ==1.1.3
- smallcheck ==1.1.3.1
- smoothie ==0.4.2.7
- smtp-mail ==0.1.4.6
- snap-blaze ==0.2.1.5
@ -2113,7 +2114,7 @@ default-package-overrides:
- soap-tls ==0.1.1.2
- socket ==0.8.0.1
- socket-activation ==0.1.0.2
- socks ==0.5.5
- socks ==0.5.6
- sort ==1.0.0.0
- sorted-list ==0.2.0.0
- sourcemap ==0.1.6
@ -2195,7 +2196,7 @@ default-package-overrides:
- stripe-haskell ==2.2.3
- stripe-http-streams ==2.2.3
- stripe-tests ==2.2.3
- strive ==4.0.1
- strive ==4.0.3
- structured-haskell-mode ==1.1.0
- stylish-haskell ==0.8.1.0
- sum-type-boilerplate ==0.1.1
@ -2231,7 +2232,7 @@ default-package-overrides:
- tasty-ant-xml ==1.1.1
- tasty-auto ==0.2.0.0
- tasty-dejafu ==0.7.1.1
- tasty-discover ==4.1.1
- tasty-discover ==4.1.2
- tasty-expected-failure ==0.11.0.4
- tasty-fail-fast ==0.0.3
- tasty-golden ==2.3.1.2
@ -2268,7 +2269,7 @@ default-package-overrides:
- test-framework-quickcheck2 ==0.3.0.4
- test-framework-smallcheck ==0.2
- test-framework-th ==0.2.4
- texmath ==0.10
- texmath ==0.10.1
- text ==1.2.2.2
- text-all ==0.4.1.1
- text-binary ==0.2.1.1
@ -2277,7 +2278,7 @@ default-package-overrides:
- text-generic-pretty ==1.2.1
- text-icu ==0.7.0.1
- text-latin1 ==0.3
- text-ldap ==0.1.1.8
- text-ldap ==0.1.1.10
- textlocal ==0.1.0.5
- text-manipulate ==0.2.0.1
- text-metrics ==0.3.0
@ -2365,7 +2366,7 @@ default-package-overrides:
- tuple-th ==0.2.5
- turtle ==1.4.5
- turtle-options ==0.1.0.4
- twitter-conduit ==0.2.2.2
- twitter-conduit ==0.2.3
- twitter-types ==0.7.2.2
- twitter-types-lens ==0.7.2
- type-aligned ==0.9.6
@ -2418,13 +2419,13 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.0.1
- unix-time ==0.3.7
- unliftio ==0.2.0.0
- unliftio ==0.2.1.0
- unliftio-core ==0.1.0.0
- unlit ==0.4.0.0
- unordered-containers ==0.2.8.0
- unordered-intmap ==0.1.0.0
- unsafe ==0.0
- uri-bytestring ==0.3.0.1
- uri-bytestring ==0.3.1.0
- uri-bytestring-aeson ==0.1.0.4
- uri-encode ==1.5.0.5
- uri-templater ==0.3.1.0
@ -2488,7 +2489,7 @@ default-package-overrides:
- wai-conduit ==3.0.0.3
- wai-cors ==0.2.6
- wai-eventsource ==3.0.0
- wai-extra ==3.0.20.2
- wai-extra ==3.0.21.0
- wai-handler-launch ==3.0.2.3
- wai-logger ==2.3.0
- wai-middleware-auth ==0.1.2.1
@ -2563,7 +2564,7 @@ default-package-overrides:
- writer-cps-morph ==0.1.0.2
- writer-cps-mtl ==0.1.1.4
- writer-cps-transformers ==0.1.1.3
- wuss ==1.1.5
- wuss ==1.1.6
- X11 ==1.8
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
@ -2612,6 +2613,7 @@ default-package-overrides:
- yesod-auth-basic ==0.1.0.2
- yesod-auth-fb ==1.8.1
- yesod-auth-hashdb ==1.6.2
- yesod-bin ==1.5.3
- yesod-core ==1.4.37.2
- yesod-csp ==0.2.4.0
- yesod-eventsource ==1.4.1

1488
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

7
pkgs/development/interpreters/elixir/1.6.nix Normal file
View File

@ -0,0 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
version = "1.6.0-rc.0";
sha256 = "1yfyp7y0mfdbh410xsfkq9a7ai2y22mjh2qn2cvpim76s96qjpw6";
minimumOTPVersion = "18";
}

4
pkgs/development/libraries/Xaw3d/default.nix
View File

@ -4,9 +4,9 @@ stdenv.mkDerivation {
name = "Xaw3d-1.6.2";
src = fetchurl {
urls = [
ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.tar.bz2
ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.2.tar.bz2
];
sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi";
sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [imake gccmakedep libXpm libXp bison flex];

Some files were not shown because too many files have changed in this diff Show More