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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Shea Levy 2018-03-24 01:34:53 -04:00
commit 0f854cd2d1
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
141 changed files with 2752 additions and 1454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/config/no-x-libs.nix
View File

@ -32,7 +32,6 @@ with lib;
networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; }; networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; };
networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; }; networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; };
networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; }; networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; };
networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; };
networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; }; networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; };
pinentry = pkgs.pinentry_ncurses; pinentry = pkgs.pinentry_ncurses;

8
nixos/modules/services/networking/networkmanager.nix
View File

@ -135,8 +135,7 @@ in {
default = { inherit networkmanager modemmanager wpa_supplicant default = { inherit networkmanager modemmanager wpa_supplicant
networkmanager-openvpn networkmanager-vpnc networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-pptp networkmanager-l2tp networkmanager-l2tp networkmanager-iodine; };
networkmanager-iodine; };
internal = true; internal = true;
}; };
@ -267,8 +266,6 @@ in {
message = "You can not use networking.networkmanager with networking.wireless"; message = "You can not use networking.networkmanager with networking.wireless";
}]; }];
boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
environment.etc = with cfg.basePackages; [ environment.etc = with cfg.basePackages; [
{ source = configFile; { source = configFile;
target = "NetworkManager/NetworkManager.conf"; target = "NetworkManager/NetworkManager.conf";
@ -285,9 +282,6 @@ in {
{ source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
} }
{ source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name";
}
{ source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
target = "NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name";
} }

3
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -182,8 +182,7 @@ in {
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant; { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc
networkmanager-openconnect networkmanager-fortisslvpn networkmanager-openconnect networkmanager-fortisslvpn
networkmanager-pptp networkmanager-iodine networkmanager-iodine networkmanager-l2tp; };
networkmanager-l2tp; };
# Needed for themes and backgrounds # Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];

2
nixos/tests/openldap.nix
View File

@ -28,8 +28,8 @@ import ./make-test.nix {
}; };
testScript = '' testScript = ''
$machine->succeed('systemctl status openldap.service');
$machine->waitForUnit('openldap.service'); $machine->waitForUnit('openldap.service');
$machine->succeed('systemctl status openldap.service');
$machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"'); $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"');
''; '';
} }

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

@ -2,13 +2,13 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.23.15"; version = "4.0.16";
pname = "fldigi"; pname = "fldigi";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz"; url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "1nxafk99fr6yb09cq3vdpzjcd85mnjwwl8rzccx21kla1ysihl5m"; sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7";
}; };
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio

23
pkgs/applications/audio/gtkpod/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag,
libvorbis, hicolor-icon-theme, gdk_pixbuf }: libvorbis, hicolor-icon-theme, gdk_pixbuf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,24 +11,17 @@ stdenv.mkDerivation rec {
sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
}; };
propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
buildInputs = [
nativeBuildInputs = [ pkgconfig ]; curl gettext perl perlXMLParser
buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta
gnome.gdl gnome.defaultIconTheme ];
hicolor-icon-theme ];
patchPhase = '' patchPhase = ''
sed -i 's/which/type -P/' scripts/*.sh sed -i 's/which/type -P/' scripts/*.sh
''; '';
preFixup = ''
wrapProgram "$out/bin/gtkpod" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "padthv1-${version}"; name = "padthv1-${version}";
version = "0.8.6"; version = "0.9.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/padthv1/${name}.tar.gz"; url = "mirror://sourceforge/padthv1/${name}.tar.gz";
sha256 = "1mikab2f9n5q1sfgnp3sbm1rf3v57k4085lsgh0a5gzga2h4hwxq"; sha256 = "0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh";
}; };
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "samplv1-${version}"; name = "samplv1-${version}";
version = "0.8.6"; version = "0.9.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz"; url = "mirror://sourceforge/samplv1/${name}.tar.gz";
sha256 = "035bq7yfg1yirsqk63zwkzjw9dxl52lrzq9y0w7nga0vb11xdfij"; sha256 = "0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk";
}; };
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];

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

@ -19,7 +19,7 @@ in buildPythonApplication rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
intltool wrapGAppsHook intltool wrapGAppsHook
gnome3.gnome-themes-standard gnome3.defaultIconTheme gnome3.defaultIconTheme
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
]; ];
@ -28,8 +28,6 @@ in buildPythonApplication rec {
sed -i '/localmpd/d' sonata/consts.py sed -i '/localmpd/d' sonata/consts.py
''; '';
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gobjectIntrospection gtk3 pygobject3 gobjectIntrospection gtk3 pygobject3
]; ];

50
pkgs/applications/audio/sound-juicer/default.nix
View File

@ -1,41 +1,33 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero { stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero
, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, makeWrapper }: , wrapGAppsHook }:
let let
major = "3.16"; pname = "sound-juicer";
minor = "1"; version = "3.16.1";
in stdenv.mkDerivation rec{
in stdenv.mkDerivation rec { name = "${pname}-${version}";
version = "${major}.${minor}";
name = "sound-juicer-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz"; sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3 buildInputs = [
gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme
makeWrapper (stdenv.lib.getLib gnome3.dconf) gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
gst_all_1.gstreamer gst_all_1.gst-plugins-base 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-good gst_all_1.gst-plugins-bad
gst_all_1.gst-libav gst_all_1.gst-libav
]; ];
preFixup = '' passthru = {
for f in $out/bin/* $out/libexec/*; do updateScript = gnome3.updateScript {
wrapProgram "$f" \ packageName = pname;
--prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ attrPath = "gnome3.${pname}";
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ };
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" };
done
'';
postInstall = ''
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Gnome CD Ripper"; description = "A Gnome CD Ripper";

5
pkgs/applications/audio/streamripper/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }: { stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "streamripper-${version}"; name = "streamripper-${version}";
@ -10,13 +10,12 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libogg libvorbis ]; buildInputs = [ glib libogg libvorbis libmad ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://streamripper.sourceforge.net/; homepage = http://streamripper.sourceforge.net/;
description = "Application that lets you record streaming mp3 to your hard drive"; description = "Application that lets you record streaming mp3 to your hard drive";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ the-kenny ]; maintainers = with maintainers; [ the-kenny ];
}; };
} }

4
pkgs/applications/editors/vis/default.nix
View File

@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
libselinux libselinux
]; ];
postPatch = ''
patchShebangs ./configure
'';
LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;"; LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;";
LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua";

9
pkgs/applications/graphics/displaycal/default.nix
View File

@ -1,15 +1,15 @@
{buildPythonPackage, stdenv, fetchurl, pkgconfig {buildPythonPackage, stdenv, fetchurl, pkgconfig
, libXext, libXxf86vm, libX11, libXrandr, libXinerama , libXext, libXxf86vm, libX11, libXrandr, libXinerama, libXScrnSaver
, argyllcms, wxPython, numpy , argyllcms, wxPython, numpy
}: }:
buildPythonPackage { buildPythonPackage {
name = "displaycal-3.2.4.0"; name = "displaycal-3.5.0.0";
enableParallelBuilding = true; enableParallelBuilding = true;
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/project/dispcalgui/release/3.2.4.0/DisplayCAL-3.2.4.0.tar.gz; url = mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz;
sha256 = "0swkhv338d1kmfxyf30zzdjs5xpbha40pg2zysiipcbasc0xhlb8"; sha256 = "1j496sv8pbhby5hkkbp07k6bs3f7mb1l3dijmn2iga3kmix0fn5q";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -18,6 +18,7 @@ buildPythonPackage {
libX11 libX11
libXrandr libXrandr
libXinerama libXinerama
libXScrnSaver
argyllcms argyllcms
wxPython wxPython
numpy numpy

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

@ -130,6 +130,7 @@ let
krdc = callPackage ./krdc.nix {}; krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {}; krfb = callPackage ./krfb.nix {};
kruler = callPackage ./kruler.nix {}; kruler = callPackage ./kruler.nix {};
ksystemlog = callPackage ./ksystemlog.nix {};
ktnef = callPackage ./ktnef.nix {}; ktnef = callPackage ./ktnef.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {};
libgravatar = callPackage ./libgravatar.nix {}; libgravatar = callPackage ./libgravatar.nix {};

17
pkgs/applications/kde/ksystemlog.nix Normal file
View File

@ -0,0 +1,17 @@
{
mkDerivation, lib,
extra-cmake-modules, gettext, kdoctools,
karchive, kconfig, kio
}:
mkDerivation {
name = "ksystemlog";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
propagatedBuildInputs = [ karchive kconfig kio ];
meta = with lib; {
license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ peterhoeg ];
};
}

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

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "urh-${version}"; name = "urh-${version}";
version = "1.9.2"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jopohl"; owner = "jopohl";
repo = "urh"; repo = "urh";
rev = "v${version}"; rev = "v${version}";
sha256 = "02jq2jas6gm08z4l09azi6dcsydaaaqbxfv4mb7pnrc1w8m593zr"; sha256 = "0s8nbrkqcb4q3m8w17sqijbds5irk4xpzhjpwkkakzs0rm5g10sk";
}; };
buildInputs = [ hackrf rtl-sdr ]; buildInputs = [ hackrf rtl-sdr ];

6
pkgs/applications/misc/yate/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "yate-${version}"; name = "yate-${version}";
version = "5.4.2-1"; version = "6.0.0-1";
src = fetchurl { src = fetchurl {
url = "http://voip.null.ro/tarballs/yate5/${name}.tar.gz"; url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz";
sha256 = "08gwz0gipc5v75jv46p2yg8hg31xjp6x7jssd0rrgsa3szi5697n"; sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa";
}; };
# TODO zaptel ? postgres ? # TODO zaptel ? postgres ?

8
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -130,9 +130,11 @@ let
mkdir -p "$out/share" mkdir -p "$out/share"
ln -s "${browser}/share/icons" "$out/share/icons" ln -s "${browser}/share/icons" "$out/share/icons"
else else
mkdir -p "$out/share/icons/hicolor/128x128/apps" for res in 16 32 48 64 128; do
ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \ mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps"
"$out/share/icons/hicolor/128x128/apps/${browserName}.png" ln -s "${browser}/lib/${browserName}/browser/chrome/icons/default/default''${res}.png" \
"$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png"
done
fi fi
install -D -t $out/share/applications $desktopItem/share/applications/* install -D -t $out/share/applications $desktopItem/share/applications/*

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -40,13 +40,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "signal-desktop-${version}"; name = "signal-desktop-${version}";
version = "1.5.2"; version = "1.6.1";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1h4qa5i7axkmsai854yvlyh5r038mmjl4pj2rd27mz11if7yf067"; sha256 = "0q2qzl84ifnhcn1qbq38fdpj8ry748h6dlzp2mdpkslsh8mc46as";
} }
else else
throw "Signal for Desktop is not currently supported on ${stdenv.system}"; throw "Signal for Desktop is not currently supported on ${stdenv.system}";

6
pkgs/applications/networking/resilio-sync/default.nix
View File

@ -9,13 +9,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "resilio-sync-${version}"; name = "resilio-sync-${version}";
version = "2.5.2"; version = "2.5.12";
src = fetchurl { src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = { sha256 = {
"x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192"; "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7";
"i686-linux" = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8"; "i686-linux" = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh";
}.${stdenv.system}; }.${stdenv.system};
}; };

4
pkgs/applications/networking/sync/backintime/common.nix
View File

@ -3,7 +3,7 @@
let let
inherit (python3Packages) python dbus-python keyring; inherit (python3Packages) python dbus-python keyring;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.1.12"; version = "1.1.24";
name = "backintime-common-${version}"; name = "backintime-common-${version}";
@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
owner = "bit-team"; owner = "bit-team";
repo = "backintime"; repo = "backintime";
rev = "v${version}"; rev = "v${version}";
sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a"; sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18";
}; };
buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ];

4
pkgs/applications/networking/znc/default.nix
View File

@ -9,11 +9,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "znc-${version}"; name = "znc-${version}";
version = "1.6.5"; version = "1.6.6";
src = fetchurl { src = fetchurl {
url = "http://znc.in/releases/archive/${name}.tar.gz"; url = "http://znc.in/releases/archive/${name}.tar.gz";
sha256 = "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig"; sha256 = "09cmsnxvi7jg9a0dicf60fxnxdff4aprw7h8vjqlj5ywf6y43f3z";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

6
pkgs/applications/office/libreoffice/still-primary-src.nix
View File

@ -3,8 +3,8 @@
rec { rec {
major = "5"; major = "5";
minor = "4"; minor = "4";
patch = "5"; patch = "6";
tweak = "1"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb"; sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i";
}; };
} }

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

@ -42,14 +42,14 @@ let
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0max423hdlr4j6y6ymng15awilh2aq8gly1hsf16lnk1pxihgr54"; sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "14ziy02qq092x8h29f9dlwvvk2scd5v385zhln4848lf3q5cnifl"; sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc";
}; };
}; };

4
pkgs/applications/office/skrooge/default.nix
View File

@ -7,11 +7,11 @@
mkDerivation rec { mkDerivation rec {
name = "skrooge-${version}"; name = "skrooge-${version}";
version = "2.11.0"; version = "2.12.0";
src = fetchurl { src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
sha256 = "11ns0j3ss09aqd8snfzd52xf0cgsjjcgzalb031p7v17rn14yqaq"; sha256 = "0f7jwl05y4gjwasjcbsx2rrva81abyf0hgdbkh7h3dl7nxz9h6g1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

8
pkgs/applications/office/spice-up/default.nix
View File

@ -6,6 +6,7 @@
, gtk3 , gtk3
, granite , granite
, gnome3 , gnome3
, gobjectIntrospection
, json-glib , json-glib
, cmake , cmake
, ninja , ninja
@ -26,11 +27,6 @@ stdenv.mkDerivation rec {
}; };
USER = "nix-build-user"; USER = "nix-build-user";
XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
"${granite}/share"
"${gnome3.libgee}/share"
];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
@ -39,6 +35,7 @@ stdenv.mkDerivation rec {
ninja ninja
gettext gettext
libxml2 libxml2
gobjectIntrospection # For setup hook
]; ];
buildInputs = [ buildInputs = [
gtk3 gtk3
@ -47,7 +44,6 @@ stdenv.mkDerivation rec {
json-glib json-glib
libgudev libgudev
libevdev libevdev
gnome3.gnome-themes-standard
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -22,6 +22,7 @@ let
"8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
"8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
"8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w";
"8.8+beta1" = "19ipmx6bf8wjpk8y29hcginxk7hps4jh1bbihn5icx4qysm81165";
}."${version}"; }."${version}";
coq-version = builtins.substring 0 3 version; coq-version = builtins.substring 0 3 version;
camlp5 = ocamlPackages.camlp5_strict; camlp5 = ocamlPackages.camlp5_strict;
@ -37,7 +38,7 @@ self = stdenv.mkDerivation {
inherit camlp5; inherit camlp5;
inherit (ocamlPackages) ocaml; inherit (ocamlPackages) ocaml;
passthru = { passthru = {
inherit (ocamlPackages) findlib; inherit (ocamlPackages) findlib num;
emacsBufferSetup = pkgs: '' emacsBufferSetup = pkgs: ''
; Propagate coq paths to children ; Propagate coq paths to children
(inherit-local-permanent coq-prog-name "${self}/bin/coqtop") (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
@ -92,7 +93,7 @@ self = stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ] buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ]
++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
postPatch = '' postPatch = ''
@ -116,7 +117,6 @@ self = stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
configureFlagsArray=( configureFlagsArray=(
-opt
${ideFlags} ${ideFlags}
) )
''; '';

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

@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
configurePhase = "./configure.sh --shared --trace"; configurePhase = "./configure.sh --shared --trace";
makeFlags = stdenv.lib.optional stdenv.isDarwin
"SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so";
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/lib $out/share $out/include/picosat mkdir -p $out/bin $out/lib $out/share $out/include/picosat
cp picomus picomcs picosat picogcnf "$out"/bin cp picomus picomcs picosat picogcnf "$out"/bin

4
pkgs/applications/video/mpc-qt/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpc-qt-${version}"; name = "mpc-qt-${version}";
version = "17.11"; version = "18.03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cmdrkotori"; owner = "cmdrkotori";
repo = "mpc-qt"; repo = "mpc-qt";
rev = "v${version}"; rev = "v${version}";
sha256 = "1vi4zsmbzxj6ms8wls9zv15vrskdrhgnj6l41m1fk4scs4jzvbkm"; sha256 = "0mhzdgjgv08cvnscbfndpr0s8ndbcf91b61zfqspa1qv4wlqd716";
}; };
nativeBuildInputs = [ pkgconfig qmake qttools ]; nativeBuildInputs = [ pkgconfig qmake qttools ];

29
pkgs/applications/video/mythtv/default.nix
View File

@ -1,27 +1,32 @@
{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec { stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
, lame, zlib, libGLU_combined, alsaLib, freetype, perl, pkgconfig , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype
, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, yasm, libuuid, taglib, libtool, autoconf, automake, file , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2
, linuxHeaders
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mythtv-${version}"; name = "mythtv-${version}";
version = "0.27.4"; version = "29.1";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/MythTV/mythtv/archive/v${version}.tar.gz"; owner = "MythTV";
sha256 = "0nrn4fbkkzh43n7jgbv21i92sb4z4yacwj9yj6m3hjbffzy4ywqz"; repo = "mythtv";
rev = "v${version}";
sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x";
}; };
sourceRoot = "${name}/mythtv"; setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
buildInputs = [ buildInputs = [
freetype qt4 lame zlib xlibsWrapper libGLU_combined perl alsaLib libpulseaudio fftwSinglePrec freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined
libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
libuuid taglib libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
]; ];
nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ];
configureFlags = [ "--dvb-path=${linuxHeaders}/include" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.mythtv.org/; homepage = https://www.mythtv.org/;
description = "Open Source DVR"; description = "Open Source DVR";

4
pkgs/applications/video/simplescreenrecorder/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "simplescreenrecorder-${version}"; name = "simplescreenrecorder-${version}";
version = "0.3.9"; version = "0.3.10";
src = fetchurl { src = fetchurl {
url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
sha256 = "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk"; sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g";
}; };
patches = [ ./fix-paths.patch ]; patches = [ ./fix-paths.patch ];

4
pkgs/applications/video/smplayer/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, qmake, qtscript }: { stdenv, fetchurl, qmake, qtscript }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "smplayer-18.2.2"; name = "smplayer-18.3.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
sha256 = "0q0m9q643z6ih5gkf1fq3d6y99d62yxkhfgap98h251q6kd7dhis"; sha256 = "0y7kwcngd0d2d863wnppfvjm1n1l60nn6lsf9r0g4hsf19gkrd46";
}; };
buildInputs = [ qtscript ]; buildInputs = [ qtscript ];

2
pkgs/applications/window-managers/weston/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
"--enable-weston-launch" "--enable-weston-launch"
"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor" ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor"
++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder" ++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder"
++ stdenv.lib.optionals (xwayland != null) [ ++ stdenv.lib.optionals (xwayland != null) [
"--enable-xwayland" "--enable-xwayland"
"--with-xserver-path=${xwayland.out}/bin/Xwayland" "--with-xserver-path=${xwayland.out}/bin/Xwayland"

4
pkgs/data/misc/osinfo-db/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "osinfo-db-20170813"; name = "osinfo-db-20180311";
src = fetchurl { src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
sha256 = "0v9i325aaflzj2y5780mj9b0jv5ysb1bn90bm3s4f2ck5n124ffw"; sha256 = "0pzm9vsr2f5943nlp2ljm19czcys5pvq6hjxh0ja2vx74pwhylb6";
}; };
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

33
pkgs/desktops/gnome-3/apps/gedit/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, intltool, fetchurl, enchant, isocodes { stdenv, intltool, fetchurl
, pkgconfig, gtk3, glib , pkgconfig, gtk3, glib
, bash, wrapGAppsHook, itstool, libsoup, libxml2 , wrapGAppsHook, itstool, libsoup, libxml2
, gnome3, librsvg, gdk_pixbuf, file, gspell }: , gnome3, gspell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gedit-${version}"; name = "gedit-${version}";
@ -12,24 +12,23 @@ stdenv.mkDerivation rec {
sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv"; sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv";
}; };
passthru = { nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
updateScript = gnome3.updateScript { packageName = "gedit"; attrPath = "gnome3.gedit"; };
};
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; buildInputs = [
gtk3 glib
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; gnome3.defaultIconTheme libsoup
gnome3.libpeas gnome3.gtksourceview
buildInputs = [ gtk3 glib intltool itstool enchant isocodes gnome3.gsettings-desktop-schemas gspell
gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup ];
gnome3.libpeas gnome3.gtksourceview libxml2
gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ];
enableParallelBuilding = true; enableParallelBuilding = true;
preFixup = '' passthru = {
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}") updateScript = gnome3.updateScript {
''; packageName = "gedit";
attrPath = "gnome3.gedit";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Gedit; homepage = https://wiki.gnome.org/Apps/Gedit;

39
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View File

@ -4,37 +4,36 @@
, gnome3, librsvg, gdk_pixbuf, gpgme , gnome3, librsvg, gdk_pixbuf, gpgme
, libsecret, avahi, p11-kit, openssh }: , libsecret, avahi, p11-kit, openssh }:
stdenv.mkDerivation rec { let
name = "seahorse-${version}"; pname = "seahorse";
version = "3.20.0"; version = "3.20.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/seahorse/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "seahorse"; attrPath = "gnome3.seahorse"; };
};
doCheck = true; doCheck = true;
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig vala intltool itstool wrapGAppsHook ];
buildInputs = [ gtk3 glib intltool itstool gnome3.gcr buildInputs = [
gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg gtk3 glib gnome3.gcr
gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme gnome3.gsettings-desktop-schemas gnupg
libsecret avahi libsoup p11-kit vala gnome3.defaultIconTheme gpgme
openssh ]; libsecret avahi libsoup p11-kit
openssh
];
preFixup = '' passthru = {
gappsWrapperArgs+=( updateScript = gnome3.updateScript {
--prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" packageName = pname;
) attrPath = "gnome3.${pname}";
''; };
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Seahorse; homepage = https://wiki.gnome.org/Apps/Seahorse;

36
pkgs/desktops/gnome-3/core/epiphany/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
, wrapGAppsHook, gnome3, libxml2, libxslt, itstool , wrapGAppsHook, gnome3, libxml2, libxslt, itstool
, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
, sqlite, gcr, isocodes, desktop-file-utils, file , sqlite, gcr, isocodes, desktop-file-utils
, gdk_pixbuf, gnome-common, gst_all_1, json-glib }: , gdk_pixbuf, gst_all_1, json-glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "epiphany-${version}"; name = "epiphany-${version}";
@ -13,31 +13,33 @@ stdenv.mkDerivation rec {
sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i"; sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "epiphany"; };
};
# Tests need an X display # Tests need an X display
mesonFlags = [ "-Dunit_tests=false" ]; mesonFlags = [ "-Dunit_tests=false" ];
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [
meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils
];
nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ]; buildInputs = [
gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify sqlite isocodes p11-kit icu
sqlite isocodes p11-kit icu gnome3.yelp-tools gdk_pixbuf gnome3.defaultIconTheme gcr
gdk_pixbuf gnome3.defaultIconTheme gnome-common gcr glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
glib-networking 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-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav json-glib
gst_all_1.gst-libav json-glib ]; ];
enableParallelBuilding = true;
postPatch = '' postPatch = ''
chmod +x post_install.py # patchShebangs requires executable file chmod +x post_install.py # patchShebangs requires executable file
patchShebangs post_install.py patchShebangs post_install.py
''; '';
passthru = {
updateScript = gnome3.updateScript {
packageName = "epiphany";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Epiphany; homepage = https://wiki.gnome.org/Apps/Epiphany;
description = "WebKit based web browser for GNOME"; description = "WebKit based web browser for GNOME";

2
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View File

@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share" --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
# Thumbnailers (for setting user profile pictures) # Thumbnailers (for setting user profile pictures)
--prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
--prefix XDG_DATA_DIRS : "${librsvg}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share"

20
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
View File

@ -11,18 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-dictionary"; attrPath = "gnome3.gnome-dictionary"; };
};
doCheck = true; doCheck = true;
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [
propagatedBuildInputs = [ gnome3.defaultIconTheme ]; meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
];
buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool passthru = {
desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; updateScript = gnome3.updateScript {
buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas ]; packageName = "gnome-dictionary";
attrPath = "gnome3.gnome-dictionary";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Dictionary; homepage = https://wiki.gnome.org/Apps/Dictionary;

18
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, meson, ninja, gtk, glib, wrapGAppsHook, libnotify , meson, ninja, gtk, glib, wrapGAppsHook, libnotify
, itstool, gnome3, gdk_pixbuf, libxml2 , itstool, gnome3, libxml2
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,13 +16,15 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; };
}; };
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxslt docbook_xsl
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl wrapGAppsHook libxml2
wrapGAppsHook libxml2 ]; ];
buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 buildInputs = [
gdk_pixbuf udisks2 gnome3.defaultIconTheme gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; udisks2 gnome3.defaultIconTheme
gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas
];
postPatch = '' postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file chmod +x meson_post_install.py # patchShebangs requires executable file

36
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
View File

@ -1,20 +1,18 @@
{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
, bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib , gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib, desktop-file-utils
, gnome3, librsvg, gdk_pixbuf }: , gnome3 }:
stdenv.mkDerivation rec { let
name = "gnome-screenshot-${version}"; pname = "gnome-screenshot";
version = "3.26.0"; version = "3.26.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-screenshot/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-screenshot"; attrPath = "gnome3.gnome-screenshot"; };
};
doCheck = true; doCheck = true;
postPatch = '' postPatch = ''
@ -22,17 +20,19 @@ stdenv.mkDerivation rec {
patchShebangs build-aux/postinstall.py patchShebangs build-aux/postinstall.py
''; '';
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils wrapGAppsHook ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [
gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; gnome3.gsettings-desktop-schemas
buildInputs = [ bash gtk3 glib libcanberra-gtk3
gnome3.gsettings-desktop-schemas ];
patches = [
./prevent-cache-updates.patch
]; ];
passthru = {
updateScript = gnome3.updateScript {
packageName = "${pname}";
attrPath = "gnome3.${pname}";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot;
description = "Utility used in the GNOME desktop environment for taking screenshots"; description = "Utility used in the GNOME desktop environment for taking screenshots";

21
pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch
View File

@ -1,21 +0,0 @@
--- a/build-aux/postinstall.py
+++ b/build-aux/postinstall.py
@@ -8,18 +8,6 @@
# Packaging tools define DESTDIR and this isn't needed for them
if 'DESTDIR' not in os.environ:
- print('Updating icon cache...')
- icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor')
- if not os.path.exists(icon_cache_dir):
- os.makedirs(icon_cache_dir)
- subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir])
-
- print('Updating desktop database...')
- desktop_database_dir = os.path.join(datadir, 'applications')
- if not os.path.exists(desktop_database_dir):
- os.makedirs(desktop_database_dir)
- subprocess.call(['update-desktop-database', '-q', desktop_database_dir])
-
print('Compiling GSettings schemas...')
schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas')
if not os.path.exists(schemas_dir):

35
pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
View File

@ -1,34 +1,31 @@
{ stdenv, intltool, fetchurl, pkgconfig { stdenv, intltool, fetchurl, pkgconfig
, bash, gtk3, glib, wrapGAppsHook , gtk3, glib, wrapGAppsHook
, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: , itstool, gnome3, libxml2 }:
stdenv.mkDerivation rec { let
name = "gnome-system-log-3.9.90"; pname = "gnome-system-log";
version = "3.9.90";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
}; };
doCheck = true; doCheck = true;
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 ];
buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; passthru = {
propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; updateScript = gnome3.updateScript {
packageName = pname;
nativeBuildInputs = [ pkgconfig ]; attrPath = "gnome3.${pname}";
buildInputs = [ bash gtk3 glib intltool itstool };
gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ]; };
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share"
)
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
license = licenses.gpl2; license = licenses.gpl2;

34
pkgs/desktops/gnome-3/core/totem/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter
, clutter-gtk, clutter-gst, python3Packages, shared-mime-info , clutter-gtk, clutter-gst, python3Packages, shared-mime-info
, pkgconfig, gtk3, glib, gobjectIntrospection , pkgconfig, gtk3, glib, gobjectIntrospection
, bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg , bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg
, gdk_pixbuf, file, tracker, nautilus }: , gdk_pixbuf, tracker, nautilus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "totem-${version}"; name = "totem-${version}";
@ -13,10 +13,6 @@ stdenv.mkDerivation rec {
sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "totem"; attrPath = "gnome3.totem"; };
};
doCheck = true; doCheck = true;
# https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
@ -26,14 +22,14 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ];
buildInputs = [
nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins 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.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 gnome3.libpeas shared-mime-info
gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info dbus-glib gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop gnome3.gsettings-desktop-schemas tracker nautilus
gnome3.gsettings-desktop-schemas tracker nautilus ]; ];
propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ];
@ -50,11 +46,17 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
''; '';
mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ];
GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
wrapPrefixVariables = [ "PYTHONPATH" ]; wrapPrefixVariables = [ "PYTHONPATH" ];
passthru = {
updateScript = gnome3.updateScript {
packageName = "totem";
attrPath = "gnome3.totem";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Videos; homepage = https://wiki.gnome.org/Apps/Videos;
description = "Movie player for the GNOME desktop based on GStreamer"; description = "Movie player for the GNOME desktop based on GStreamer";

27
pkgs/desktops/gnome-3/core/yelp/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff , gnome3, sqlite
, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 , itstool, libxml2, libxslt, gst_all_1
, wrapGAppsHook }: , wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,21 +12,20 @@ stdenv.mkDerivation rec {
sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v"; sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v";
}; };
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [
gtk3 glib webkitgtk sqlite
libxml2 libxslt gnome3.yelp-xsl
gnome3.defaultIconTheme
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
passthru = { passthru = {
updateScript = gnome3.updateScript { packageName = "yelp"; }; updateScript = gnome3.updateScript {
packageName = "yelp";
};
}; };
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite
libxml2 libxslt icu file makeWrapper gnome3.yelp-xsl
librsvg gdk_pixbuf gnome3.defaultIconTheme groff
gnome3.gsettings-desktop-schemas wrapGAppsHook
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Yelp; homepage = https://wiki.gnome.org/Apps/Yelp;
description = "The help viewer in Gnome"; description = "The help viewer in Gnome";

5
pkgs/desktops/gnome-3/default.nix
View File

@ -206,10 +206,6 @@ let
inherit gnome3; inherit gnome3;
}; };
networkmanager-pptp = pkgs.networkmanager-pptp.override {
inherit gnome3;
};
networkmanager-vpnc = pkgs.networkmanager-vpnc.override { networkmanager-vpnc = pkgs.networkmanager-vpnc.override {
inherit gnome3; inherit gnome3;
}; };
@ -436,7 +432,6 @@ let
networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
networkmanager_pptp = networkmanager-pptp; # added 2018-02-25
networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
yelp_xsl = yelp-xsl; # added 2018-02-25 yelp_xsl = yelp-xsl; # added 2018-02-25
yelp_tools = yelp-tools; # added 2018-02-25 yelp_tools = yelp-tools; # added 2018-02-25

21
pkgs/desktops/gnome-3/misc/geary/default.nix
View File

@ -5,18 +5,17 @@
, gnome3, librsvg, gnome-doc-utils, webkitgtk }: , gnome3, librsvg, gnome-doc-utils, webkitgtk }:
let let
majorVersion = "0.12"; pname = "geary";
version = "0.12.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geary-${majorVersion}.1"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6";
}; };
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];
buildInputs = [ buildInputs = [
gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
@ -28,15 +27,21 @@ stdenv.mkDerivation rec {
"-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes" "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes"
]; ];
preConfigure = '' # TODO: This is bad, upstream should fix their code.
substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0";
'';
preFixup = '' preFixup = ''
# Add geary to path for geary-attach # Add geary to path for geary-attach
gappsWrapperArgs+=(--prefix PATH : "$out/bin") gappsWrapperArgs+=(--prefix PATH : "$out/bin")
''; '';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "gnome3.${pname}";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Geary; homepage = https://wiki.gnome.org/Apps/Geary;
description = "Mail client for GNOME 3"; description = "Mail client for GNOME 3";

40
pkgs/desktops/gnome-3/misc/gitg/default.nix
View File

@ -3,37 +3,49 @@
, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret
, libsoup }: , libsoup }:
stdenv.mkDerivation rec { let
name = "gitg-${version}"; pname = "gitg";
version = "3.26.0"; version = "3.26.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gitg/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "gitg"; };
};
preCheck = '' preCheck = ''
substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
''; '';
doCheck = true; doCheck = true;
enableParallelBuilding = true;
makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
propagatedUserEnvPkgs = [ shared-mime-info buildInputs = [
gnome3.gnome-themes-standard ]; gtk3 glib json-glib libgee libpeas gnome3.libsoup
libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas
buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup libsecret gobjectIntrospection gnome3.adwaita-icon-theme
libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas ];
librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ];
preFixup = ''
gappsWrapperArgs+=(
# Thumbnailers
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
)
'';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Apps/Gitg; homepage = https://wiki.gnome.org/Apps/Gitg;
description = "GNOME GUI client to view git repositories"; description = "GNOME GUI client to view git repositories";
maintainers = with maintainers; [ domenkozar ]; maintainers = with maintainers; [ domenkozar ];
license = licenses.gpl2; license = licenses.gpl2;

4
pkgs/desktops/gnustep/back/default.nix
View File

@ -8,13 +8,13 @@
, libXmu , libXmu
}: }:
let let
version = "0.25.0"; version = "0.26.2";
in in
gsmakeDerivation { gsmakeDerivation {
name = "gnustep-back-${version}"; name = "gnustep-back-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo base gui freetype x11 libXmu ]; buildInputs = [ cairo base gui freetype x11 libXmu ];

4
pkgs/desktops/gnustep/base/default.nix
View File

@ -11,13 +11,13 @@
, pkgconfig, portaudio , pkgconfig, portaudio
}: }:
let let
version = "1.24.9"; version = "1.25.1";
in in
gsmakeDerivation { gsmakeDerivation {
name = "gnustep-base-${version}"; name = "gnustep-base-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz";
sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585"; sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/gnustep/gorm/default.nix
View File

@ -1,13 +1,13 @@
{ fetchurl, base, back, gsmakeDerivation, gui }: { fetchurl, base, back, gsmakeDerivation, gui }:
let let
version = "1.2.22"; version = "1.2.23";
in in
gsmakeDerivation { gsmakeDerivation {
name = "gorm-${version}"; name = "gorm-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz";
sha256 = "1mq5n65xd9bc4kppx19iijsgpz4crvhg7bfwbi9k78j159vclnmi"; sha256 = "18pf9vvzvdk8bg4lhjb96y1kdkmb9ahmvrqv2581vn45pjxmmlnb";
}; };
buildInputs = [ base back gui ]; buildInputs = [ base back gui ];

18
pkgs/development/compilers/openjdk/9.nix
View File

@ -22,41 +22,41 @@ let
throw "openjdk requires i686-linux or x86_64 linux"; throw "openjdk requires i686-linux or x86_64 linux";
update = "9.0.4"; update = "9.0.4";
build = "11"; build = "12";
baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u"; baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u";
repover = "jdk-${update}+${build}"; repover = "jdk-${update}+${build}";
paxflags = if stdenv.isi686 then "msp" else "m"; paxflags = if stdenv.isi686 then "msp" else "m";
jdk9 = fetchurl { jdk9 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "1y8sq0fxvj5s5gx5qm2mbr710xqrgv3d200k6bv71bawjh57v3xx"; sha256 = "06hnrzkwxgrfq26il1mjyl6wgb7x3qym69pjbddhl9m29n2si3jh";
}; };
langtools = fetchurl { langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = "1n6aqmph6a9spxyfi40k8g5hy2bnfd499gr6jkmq49phdb2qg7wy"; sha256 = "16xqnqn773p6ywcdjx801vbng2skjal7svydn0s7wf3ldqzx64mi";
}; };
hotspot = fetchurl { hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = "1i34k3pc2slnjk469zskqq1z0jna1xg2zzjdk7zjrhrfgsrgvfsh"; sha256 = "0g5ddffl2qykrjf17ac9as60rd4sfyv7s2fpgjn86k4a69gkx93v";
}; };
corba = fetchurl { corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = "1k6r5yxf5h1m451vlwzk9zqkmdlln3ky3kir5qjgan4hz892f297"; sha256 = "14585dzs2mfzgzrnbvc062pigngs35hajwpr22m6fzbm7580vnqk";
}; };
jdk = fetchurl { jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = "0gafc0jx8fx13y6iir9zxmqrsw1a3w71xgdvjx9rk64acc24piy2"; sha256 = "16595jdg3y9zy70q8i615a7d6w0zzbydfxylvaq42wrsc7jw733h";
}; };
jaxws = fetchurl { jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = "1bw3z346mna6pgz76phcmfm0ykydcwagqxhffj0mzbdll7ysw25p"; sha256 = "1m1aspc1hq74w0bkasrfvp8ygs6psbc1l61vfw9244j2vgfahjgn";
}; };
jaxp = fetchurl { jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = "063fhnmm2g83jrdv2bl968glr46vvgjpyk9rjmh2fwfplzclb51s"; sha256 = "06ns2giw366vjivb6d46gqwfvfzkaddrgd1x6y8w37ywygp50lxm";
}; };
nashorn = fetchurl { nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "0wyx76nd4v6xy4vmp94anxwk9bfqyb0l4n3hqhfqyz6azi8pqk66"; sha256 = "0z6mlzvz1hh1yzli69qjlrcwqdjnivbjbqqrqi4hhpls6z0a2ch7";
}; };
openjdk9 = stdenv.mkDerivation { openjdk9 = stdenv.mkDerivation {
name = "openjdk-${update}-b${build}"; name = "openjdk-${update}-b${build}";

158
pkgs/development/compilers/oraclejdk/jdk10-linux.nix Normal file
View File

@ -0,0 +1,158 @@
{ swingSupport ? true
, stdenv
, requireFile
, makeWrapper
, unzip
, file
, xorg ? null
, packageType ? "JDK" # JDK, JRE, or ServerJRE
, pluginSupport ? true
, glib
, libxml2
, ffmpeg_2
, libxslt
, libGL
, freetype
, fontconfig
, gtk2
, pango
, cairo
, alsaLib
, atk
, gdk_pixbuf
, zlib
, elfutils
, setJavaClassPath
}:
assert stdenv.system == "x86_64-linux";
assert swingSupport -> xorg != null;
let
version = "10";
downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
rSubPaths = [
"lib/jli"
"lib/server"
"lib"
];
in
let result = stdenv.mkDerivation rec {
name = if packageType == "JDK" then "oraclejdk-${version}"
else if packageType == "JRE" then "oraclejre-${version}"
else if packageType == "ServerJRE" then "oracleserverjre-${version}"
else abort "unknown package Type ${packageType}";
src =
if packageType == "JDK" then
requireFile {
name = "jdk-${version}_linux-x64_bin.tar.gz";
url = "${downloadUrlBase}/jdk10-downloads-4416644.html";
sha256 = "0338m0x5lka0xjsbcll70r1i308bjw3m42cm9dx9zmfk70kplj5c";
}
else if packageType == "JRE" then
requireFile {
name = "jre-${version}_linux-x64_bin.tar.gz";
url = "${downloadUrlBase}/jre10-downloads-4417026.html";
sha256 = "1clawcahkla1h9pxnqfqzcgv51aqgq78v1ws5jygbk6fbbi7l54w";
}
else if packageType == "ServerJRE" then
requireFile {
name = "serverjre-${version}_linux-x64_bin.tar.gz";
url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
sha256 = "0kiyg33fv29ad0nyl35r7y0bhyxivb2hxlds44m9l0259s55nwhw";
}
else abort "unknown package Type ${packageType}";
nativeBuildInputs = [ file ];
buildInputs = [ makeWrapper ];
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;
installPhase = ''
cd ..
# Set PaX markings
exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
for file in $exes; do
paxmark m "$file"
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
done
mv $sourceRoot $out
shopt -s extglob
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done
if test -z "$pluginSupport"; then
rm -f $out/bin/javaws
fi
mkdir $out/lib/plugins
ln -s $out/lib/libnpjp2.so $out/lib/plugins
# for backward compatibility
ln -s $out $out/jre
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
'';
postFixup = ''
rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
# set all the dynamic linkers
find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
# Oracle Java Mission Control needs to know where libgtk-x11 and related is
if test -x $out/bin/jmc; then
wrapProgram "$out/bin/jmc" \
--suffix-each LD_LIBRARY_PATH ':' "$rpath"
fi
'';
/**
* libXt is only needed on amd64
*/
libraries =
[stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
rpath = stdenv.lib.strings.makeLibraryPath libraries;
passthru.mozillaPlugin = "/lib/plugins";
passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
passthru.home = result;
# for backward compatibility
passthru.architecture = "";
meta = with stdenv.lib; {
license = licenses.unfree;
platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
};
}; in result

2
pkgs/development/coq-modules/CoLoR/default.nix
View File

@ -23,6 +23,6 @@ stdenv.mkDerivation {
}; };
passthru = { passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
}; };
} }

12
pkgs/development/coq-modules/QuickChick/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, coq, ssreflect }: { stdenv, fetchFromGitHub, coq, ssreflect }:
let param = let params =
{ {
"8.5" = { "8.5" = {
version = "20170512"; version = "20170512";
@ -19,9 +19,9 @@ let param =
rev = "195e550a1cf0810497734356437a1720ebb6d744"; rev = "195e550a1cf0810497734356437a1720ebb6d744";
sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1"; sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
}; };
};
}."${coq.coq-version}" param = params."${coq.coq-version}";
; in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -49,4 +49,8 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.hasAttr v params;
};
} }

2
pkgs/development/coq-modules/autosubst/default.nix
View File

@ -24,4 +24,6 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = { inherit (mathcomp) compatibleCoqVersions; };
} }

4
pkgs/development/coq-modules/bignums/default.nix
View File

@ -10,6 +10,10 @@ let param =
rev = "V8.7.0"; rev = "V8.7.0";
sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
}; };
"8.8" = {
rev = "V8.8+beta1";
sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
};
}."${coq.coq-version}" }."${coq.coq-version}"
; in ; in

8
pkgs/development/coq-modules/coq-ext-lib/default.nix
View File

@ -1,11 +1,12 @@
{ stdenv, fetchFromGitHub, coq }: { stdenv, fetchFromGitHub, coq }:
let param = let params =
{ {
"8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
"8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
"8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
}."${coq.coq-version}"; };
param = params."${coq.coq-version}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,4 +35,7 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.hasAttr v params;
};
} }

11
pkgs/development/coq-modules/coq-haskell/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, coq, ssreflect }: { stdenv, fetchgit, coq, ssreflect }:
let param = let params =
{ {
"8.5" = { "8.5" = {
version = "20171215"; version = "20171215";
@ -19,9 +19,9 @@ let param =
rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
}; };
};
}."${coq.coq-version}" param = params."${coq.coq-version}";
; in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -48,4 +48,7 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.hasAttr v params;
};
} }

3
pkgs/development/coq-modules/coquelicot/default.nix
View File

@ -22,4 +22,7 @@ stdenv.mkDerivation {
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (coq.meta) platforms; inherit (coq.meta) platforms;
}; };
passthru = { inherit (ssreflect) compatibleCoqVersions; };
} }

11
pkgs/development/coq-modules/dpdgraph/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
let param = { let params = {
"8.7" = { "8.7" = {
version = "0.6.2"; version = "0.6.2";
rev = "d76ddde37d918569945774733b7997e8b24daf51"; rev = "d76ddde37d918569945774733b7997e8b24daf51";
@ -16,7 +16,9 @@ let param = {
rev = "v0.6"; rev = "v0.6";
sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
}; };
}."${coq.coq-version}"; in };
param = params."${coq.coq-version}";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "coq${coq.coq-version}-dpdgraph-${param.version}"; name = "coq${coq.coq-version}-dpdgraph-${param.version}";
@ -46,4 +48,9 @@ stdenv.mkDerivation {
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with stdenv.lib.maintainers; [ vbgl ];
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.hasAttr v params;
};
} }

3
pkgs/development/coq-modules/heq/default.nix
View File

@ -24,4 +24,7 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: !stdenv.lib.versionAtLeast v "8.8";
};
} }

3
pkgs/development/coq-modules/interval/default.nix
View File

@ -24,4 +24,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ vbgl ]; maintainers = with maintainers; [ vbgl ];
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = { inherit (mathcomp) compatibleCoqVersions; };
} }

4
pkgs/development/coq-modules/mathcomp/generic.nix
View File

@ -35,4 +35,8 @@ stdenv.mkDerivation {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
} }

4
pkgs/development/coq-modules/paco/default.nix
View File

@ -28,4 +28,8 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
} }

4
pkgs/development/coq-modules/ssreflect/generic.nix
View File

@ -42,4 +42,8 @@ stdenv.mkDerivation {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
} }

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

@ -344,7 +344,6 @@ self: super: {
orgmode-parse = dontCheck super.orgmode-parse; orgmode-parse = dontCheck super.orgmode-parse;
os-release = dontCheck super.os-release; os-release = dontCheck super.os-release;
persistent-redis = dontCheck super.persistent-redis; persistent-redis = dontCheck super.persistent-redis;
pure-zlib = dontCheck super.pure-zlib; # https://github.com/NixOS/nixpkgs/issues/37499
pipes-extra = dontCheck super.pipes-extra; pipes-extra = dontCheck super.pipes-extra;
pipes-websockets = dontCheck super.pipes-websockets; pipes-websockets = dontCheck super.pipes-websockets;
postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server
@ -1006,4 +1005,7 @@ self: super: {
# https://github.com/fpco/inline-c/issues/72 # https://github.com/fpco/inline-c/issues/72
inline-c = dontCheck super.inline-c; inline-c = dontCheck super.inline-c;
# https://github.com/GaloisInc/pure-zlib/issues/6
pure-zlib = doJailbreak super.pure-zlib;
} }

30
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -659,31 +659,14 @@ self: super: {
sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a"; sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
}); });
# https://github.com/jgm/pandoc-types/issues/37
pandoc-types = self.pandoc-types_1_17_4_2;
## Need latest git version to support current haddock-library versions.
pandoc = overrideSrc super.pandoc {
version = "2.1.2-git";
src = pkgs.fetchFromGitHub {
owner = "jgm";
repo = "pandoc";
rev = "fad8d0d67ff4736e1af554d2bfcf1688aa28c8ec";
sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a";
};
};
# Fix missing semigroup instance.
json = appendPatch super.json (pkgs.fetchpatch
{ url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch;
sha256 = "1xw2gab0wzhszgcbjhg98kkzgnbfn9n3bx1qlk6g7ir6hhwppm9z";
});
# Older versions don't compile. # Older versions don't compile.
brick = self.brick_0_35; brick = self.brick_0_35;
timezone-olson = self.timezone-olson_0_1_9;
matrix = self.matrix_0_3_6_1;
getopt-generics = self.getopt-generics_0_13_0_2; getopt-generics = self.getopt-generics_0_13_0_2;
HaTeX = self.HaTeX_3_19_0_0;
json = self.json_0_9_2;
matrix = self.matrix_0_3_6_1;
pandoc = self.pandoc_2_1_3;
pandoc-types = self.pandoc-types_1_17_4_2;
# https://github.com/xmonad/xmonad/issues/155 # https://github.com/xmonad/xmonad/issues/155
xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
@ -691,4 +674,7 @@ self: super: {
sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp"; sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
})) self.semigroups; })) self.semigroups;
# https://github.com/xmonad/xmonad-contrib/issues/235
xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
} }

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

@ -2957,6 +2957,7 @@ dont-distribute-packages:
ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ]
ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii: [ i686-linux, x86_64-linux, x86_64-darwin ]
asciidiagram: [ i686-linux, x86_64-linux, x86_64-darwin ]
asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ]
asil: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ]
asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2975,6 +2976,7 @@ dont-distribute-packages:
atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ]
atmos-dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] atmos-dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ]
atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ] atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ]
atom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ]
atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ]
atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3023,6 +3025,7 @@ dont-distribute-packages:
aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-easy: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-ec2-knownhosts: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2-knownhosts: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3073,6 +3076,7 @@ dont-distribute-packages:
barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
base64-bytestring-type: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-bytestring-type: [ i686-linux, x86_64-linux, x86_64-darwin ]
base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3081,6 +3085,7 @@ dont-distribute-packages:
batchd: [ i686-linux, x86_64-linux, x86_64-darwin ] batchd: [ i686-linux, x86_64-linux, x86_64-darwin ]
battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ]
battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ]
battleplace-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ]
bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ]
BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3149,6 +3154,7 @@ dont-distribute-packages:
bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ]
bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ]
bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ]
bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ]
bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ]
bindings-libg15: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libg15: [ i686-linux, x86_64-linux, x86_64-darwin ]
bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3244,6 +3250,7 @@ dont-distribute-packages:
bond: [ i686-linux, x86_64-linux, x86_64-darwin ] bond: [ i686-linux, x86_64-linux, x86_64-darwin ]
bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ]
bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ]
bookkeeping-jp: [ i686-linux, x86_64-linux, x86_64-darwin ]
Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ]
boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ]
borel: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3552,6 +3559,7 @@ dont-distribute-packages:
cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ]
Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ]
coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ] coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ]
codec-beam: [ i686-linux, x86_64-linux, x86_64-darwin ]
codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ]
codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ]
codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3707,6 +3715,7 @@ dont-distribute-packages:
CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ]
CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ]
CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ]
corenlp-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
coroutine-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ]
coroutine-object: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-object: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3775,6 +3784,7 @@ dont-distribute-packages:
cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ]
cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ]
csg: [ i686-linux, x86_64-linux, x86_64-darwin ]
CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ]
CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ]
CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3803,6 +3813,7 @@ dont-distribute-packages:
dag: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ]
damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ]
Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ]
danibot: [ i686-linux, x86_64-linux, x86_64-darwin ]
dao: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ]
Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] Dao: [ i686-linux, x86_64-linux, x86_64-darwin ]
dapi: [ i686-linux, x86_64-linux, x86_64-darwin ] dapi: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3858,6 +3869,7 @@ dont-distribute-packages:
data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ]
data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ]
data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ]
data-stringmap: [ i686-linux, x86_64-linux, x86_64-darwin ]
data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ]
data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] data-type: [ i686-linux, x86_64-linux, x86_64-darwin ]
database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3899,6 +3911,7 @@ dont-distribute-packages:
ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ]
ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
dde: [ i686-linux, x86_64-linux, x86_64-darwin ]
dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ]
dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4106,6 +4119,7 @@ dont-distribute-packages:
dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd: [ i686-linux, x86_64-linux, x86_64-darwin ]
dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] dtw: [ i686-linux, x86_64-linux, x86_64-darwin ]
dual: [ i686-linux, x86_64-linux, x86_64-darwin ] dual: [ i686-linux, x86_64-linux, x86_64-darwin ]
dublincore-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
duckling: [ i686-linux, x86_64-linux, x86_64-darwin ] duckling: [ i686-linux, x86_64-linux, x86_64-darwin ]
duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ]
Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4507,9 +4521,11 @@ dont-distribute-packages:
friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ]
frown: [ i686-linux, x86_64-linux, x86_64-darwin ] frown: [ i686-linux, x86_64-linux, x86_64-darwin ]
frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ]
frpnow-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ]
fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ]
fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ]
fsnotify-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ]
fswait: [ i686-linux, x86_64-linux, x86_64-darwin ] fswait: [ i686-linux, x86_64-linux, x86_64-darwin ]
fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4540,6 +4556,7 @@ dont-distribute-packages:
futun: [ i686-linux, x86_64-linux, x86_64-darwin ] futun: [ i686-linux, x86_64-linux, x86_64-darwin ]
future: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ]
fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ]
fuzzy: [ i686-linux, x86_64-linux, x86_64-darwin ]
fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ]
fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ]
fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4635,6 +4652,7 @@ dont-distribute-packages:
gf: [ i686-linux, x86_64-linux, x86_64-darwin ] gf: [ i686-linux, x86_64-linux, x86_64-darwin ]
GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] GGg: [ i686-linux, x86_64-linux, x86_64-darwin ]
ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-dump-util: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4642,6 +4660,7 @@ dont-distribute-packages:
ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-heap-view: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4667,12 +4686,18 @@ dont-distribute-packages:
ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ]
ght: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-atk: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-dbusmenu: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-dbusmenugtk3: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gdkpixbuf: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdkpixbuf: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-glib: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gobject: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4750,6 +4775,7 @@ dont-distribute-packages:
GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ]
glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5188,10 +5214,12 @@ dont-distribute-packages:
haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-conll: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-conll: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-dap: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-gi: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-holes-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-holes-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5546,6 +5574,7 @@ dont-distribute-packages:
HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ]
HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlrdb: [ i686-linux, x86_64-linux, x86_64-darwin ]
hls: [ i686-linux, x86_64-linux, x86_64-darwin ] hls: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ] hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ]
hly: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5757,6 +5786,7 @@ dont-distribute-packages:
HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ]
HsHTSLib: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHTSLib: [ i686-linux, x86_64-linux, x86_64-darwin ]
HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsignal: [ i686-linux, x86_64-linux, x86_64-darwin ]
hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ]
HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5977,6 +6007,7 @@ dont-distribute-packages:
imapget: [ i686-linux, x86_64-linux, x86_64-darwin ] imapget: [ i686-linux, x86_64-linux, x86_64-darwin ]
imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] imbib: [ i686-linux, x86_64-linux, x86_64-darwin ]
imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ]
imm: [ i686-linux, x86_64-linux, x86_64-darwin ]
imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] imparse: [ i686-linux, x86_64-linux, x86_64-darwin ]
imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ]
imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5992,6 +6023,7 @@ dont-distribute-packages:
inch: [ i686-linux, x86_64-linux, x86_64-darwin ] inch: [ i686-linux, x86_64-linux, x86_64-darwin ]
incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ]
incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ]
incremental-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
increments: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ]
indents: [ i686-linux, x86_64-linux, x86_64-darwin ] indents: [ i686-linux, x86_64-linux, x86_64-darwin ]
indexed-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] indexed-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6478,6 +6510,7 @@ dont-distribute-packages:
loch: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ]
lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ]
locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ]
lockpool: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ]
log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6790,6 +6823,7 @@ dont-distribute-packages:
mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ]
Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ]
monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ]
monoid-subclasses: [ i686-linux, x86_64-linux, x86_64-darwin ]
monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ]
monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ]
monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7104,6 +7138,7 @@ dont-distribute-packages:
open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-signals: [ i686-linux, x86_64-linux, x86_64-darwin ] open-signals: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-symbology: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7130,6 +7165,7 @@ dont-distribute-packages:
OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ]
openweathermap: [ i686-linux, x86_64-linux, x86_64-darwin ] openweathermap: [ i686-linux, x86_64-linux, x86_64-darwin ]
Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ]
opml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ]
optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ]
optional: [ i686-linux, x86_64-linux, x86_64-darwin ] optional: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7316,6 +7352,7 @@ dont-distribute-packages:
pia-forward: [ i686-linux, x86_64-linux, x86_64-darwin ] pia-forward: [ i686-linux, x86_64-linux, x86_64-darwin ]
pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] pianola: [ i686-linux, x86_64-linux, x86_64-darwin ]
picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] picologic: [ i686-linux, x86_64-linux, x86_64-darwin ]
picoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] picosat: [ i686-linux, x86_64-linux, x86_64-darwin ]
pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ]
piet: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7377,6 +7414,7 @@ dont-distribute-packages:
plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ]
Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ]
plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ]
plot-light-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
plots: [ i686-linux, x86_64-linux, x86_64-darwin ] plots: [ i686-linux, x86_64-linux, x86_64-darwin ]
PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ]
plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7677,6 +7715,7 @@ dont-distribute-packages:
rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa: [ i686-linux, x86_64-linux, x86_64-darwin ]
rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ]
Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ]
rasterific-svg: [ i686-linux, x86_64-linux, x86_64-darwin ]
raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ]
raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ]
rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7847,6 +7886,7 @@ dont-distribute-packages:
rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ]
rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ]
rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ]
rfc3339: [ i686-linux, x86_64-linux, x86_64-darwin ]
rfc: [ i686-linux, x86_64-linux, x86_64-darwin ] rfc: [ i686-linux, x86_64-linux, x86_64-darwin ]
rhine-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] rhine-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ]
rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] rhine: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7911,6 +7951,7 @@ dont-distribute-packages:
rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ]
rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ]
rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] rspp: [ i686-linux, x86_64-linux, x86_64-darwin ]
rss-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ]
rss: [ i686-linux, x86_64-linux, x86_64-darwin ] rss: [ i686-linux, x86_64-linux, x86_64-darwin ]
RtMidi: [ i686-linux, x86_64-linux, x86_64-darwin ] RtMidi: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7973,6 +8014,7 @@ dont-distribute-packages:
scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ]
scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ]
scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ]
scc: [ i686-linux, x86_64-linux, x86_64-darwin ]
scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ]
scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] scgi: [ i686-linux, x86_64-linux, x86_64-darwin ]
schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8348,6 +8390,7 @@ dont-distribute-packages:
spake2: [ i686-linux, x86_64-linux, x86_64-darwin ] spake2: [ i686-linux, x86_64-linux, x86_64-darwin ]
spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] spanout: [ i686-linux, x86_64-linux, x86_64-darwin ]
sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ] sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ]
sparrow: [ i686-linux, x86_64-linux, x86_64-darwin ]
sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] sparse: [ i686-linux, x86_64-linux, x86_64-darwin ]
sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ]
sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8522,12 +8565,14 @@ dont-distribute-packages:
superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ] superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ]
superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
superevent: [ i686-linux, x86_64-linux, x86_64-darwin ] superevent: [ i686-linux, x86_64-linux, x86_64-darwin ]
supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ]
supero: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ]
superrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] superrecord: [ i686-linux, x86_64-linux, x86_64-darwin ]
supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ]
supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ] supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ]
sv: [ i686-linux, x86_64-linux, x86_64-darwin ] sv: [ i686-linux, x86_64-linux, x86_64-darwin ]
SVD2HS: [ i686-linux, x86_64-linux, x86_64-darwin ] SVD2HS: [ i686-linux, x86_64-linux, x86_64-darwin ]
svg-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ]
SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ]
SVGFonts: [ i686-linux, x86_64-linux, x86_64-darwin ] SVGFonts: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8771,6 +8816,7 @@ dont-distribute-packages:
timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ]
TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ]
timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ]
timerep: [ i686-linux, x86_64-linux, x86_64-darwin ]
timers-tick: [ i686-linux, x86_64-linux, x86_64-darwin ] timers-tick: [ i686-linux, x86_64-linux, x86_64-darwin ]
timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ]
timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9042,6 +9088,7 @@ dont-distribute-packages:
vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ]
vcf: [ i686-linux, x86_64-linux, x86_64-darwin ]
vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ]
Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ]
Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -9486,5 +9533,7 @@ dont-distribute-packages:
zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom: [ i686-linux, x86_64-linux, x86_64-darwin ]
zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ]
zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] zstd: [ i686-linux, x86_64-linux, x86_64-darwin ]
ztail: [ i686-linux, x86_64-linux, x86_64-darwin ]
zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ] zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ]
Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ]
zxcvbn-c: [ i686-linux, x86_64-linux, x86_64-darwin ]

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

File diff suppressed because it is too large Load Diff

502
pkgs/development/haskell-modules/hie-packages.nix
View File

@ -1,502 +0,0 @@
{ pkgs, stdenv, callPackage }: self:
let src = pkgs.fetchFromGitHub
{ owner = "haskell";
repo = "haskell-ide-engine";
rev = "3ec8e93e9ca751cf282556998851ffa65f32e06b";
sha256 = "1wzqzvsa39c1cngmmjryqrq4vqdg6d4wp5wdf17vp96ljvz1cczw";
};
cabal-helper-src = pkgs.fetchgit
{ url = "https://gitlab.com/dxld/cabal-helper.git";
rev = "4bfc6b916fcc696a5d82e7cd35713d6eabcb0533";
sha256 = "1a8231as0wdvi0q73ha9lc0qrx23kmcwf910qaicvmdar5p2b15m";
};
ghc-dump-tree-src = pkgs.fetchgit
{ url = "https://gitlab.com/alanz/ghc-dump-tree.git";
rev = "50f8b28fda675cca4df53909667c740120060c49";
sha256 = "0v3r81apdqp91sv7avy7f0s3im9icrakkggw8q5b7h0h4js6irqj";
};
ghc-mod-src = pkgs.fetchFromGitHub
{ owner = "wz1000";
repo = "ghc-mod";
rev = "03c91ea53b6389e7a1fcf4e471171aa3d6c8de41";
sha256 = "11iic93klsh5izp8v4mhl7vnnlib821cfhdymlpg4drx7zbm9il6";
};
HaRe-src = pkgs.fetchgit
{ url = "https://gitlab.com/alanz/HaRe.git";
rev = "e325975450ce89d790ed3f92de3ef675967d9538";
sha256 = "0z7r3l4j5a1brz7zb2rgd985m58rs0ki2p59y1l9i46fcy8r9y4g";
};
cabal-helper = self.cabal-helper_hie;
haddock-library = self.haddock-library_1_4_4;
hoogle = self.hoogle_5_0_14;
ghc-dump-tree = self.ghc-dump-tree_hie;
ghc-mod = self.ghc-mod_hie;
HaRe = self.HaRe_hie;
in
{ ### Overrides required by hie
cabal-helper_hie = callPackage
({ mkDerivation, base, bytestring, Cabal, cabal-install, containers
, directory, exceptions, filepath, ghc-prim, mtl, process
, semigroupoids, template-haskell, temporary, transformers
, unix, unix-compat, utf8-string
}:
mkDerivation {
pname = "cabal-helper";
version = "0.8.0.0";
src = cabal-helper-src;
isLibrary = true;
isExecutable = true;
jailbreak = true;
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
base Cabal directory filepath ghc-prim mtl process semigroupoids
transformers unix unix-compat
];
executableHaskellDepends = [
base bytestring Cabal containers directory exceptions filepath
ghc-prim mtl process template-haskell temporary transformers unix
unix-compat utf8-string
];
testHaskellDepends = [
base bytestring Cabal directory exceptions filepath ghc-prim mtl
process template-haskell temporary transformers unix unix-compat
utf8-string
];
testToolDepends = [ cabal-install ];
postInstall =
''
libexec="$out/libexec/$(basename $out/lib/ghc*/*ghc*)/$name"
mkdir -p "$libexec"
ln -sv $out/bin/cabal-helper-wrapper "$libexec"
'';
doCheck = false;
description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod";
license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
ghc-dump-tree_hie = callPackage
({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative
, pretty, pretty-show, process, unordered-containers
, vector
}:
mkDerivation {
pname = "ghc-dump-tree";
version = "0.2.0.1";
src = ghc-dump-tree-src;
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring ghc pretty pretty-show process
unordered-containers vector
];
executableHaskellDepends = [
aeson base bytestring ghc optparse-applicative pretty pretty-show
process unordered-containers vector
];
homepage = "https://github.com/edsko/ghc-dump-tree";
description = "Dump GHC's parsed, renamed, and type checked ASTs";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
ghc-mod-core = callPackage
({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
, containers, deepseq, directory, djinn-ghc, extra, fclabels
, filepath, fingertree, ghc, ghc-boot, ghc-paths, ghc-syb-utils
, haskell-src-exts, hlint, monad-control, monad-journal, mtl
, old-time, optparse-applicative, pipes, process, safe, semigroups
, split, syb, template-haskell, temporary, text, time
, transformers, transformers-base
}:
mkDerivation {
pname = "ghc-mod-core";
version = "5.9.0.0";
src = "${ghc-mod-src}/core";
setupHaskellDepends = [
base Cabal containers directory filepath process template-haskell
transformers
];
libraryHaskellDepends = [
base binary bytestring cabal-helper containers deepseq directory
djinn-ghc extra fclabels filepath fingertree ghc ghc-boot ghc-paths
ghc-syb-utils haskell-src-exts hlint monad-control monad-journal
mtl old-time optparse-applicative pipes process safe semigroups
split syb template-haskell temporary text time transformers
transformers-base
];
homepage = "https://github.com/DanielG/ghc-mod";
description = "Happy Haskell Hacking";
license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit cabal-helper; };
ghc-mod_hie = callPackage
({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
, cabal-helper, containers, criterion, deepseq, directory
, djinn-ghc, doctest, extra, fclabels, filepath, ghc, ghc-boot
, ghc-mod-core, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint
, hspec, monad-control, monad-journal, mtl, old-time
, optparse-applicative, pipes, process, safe, semigroups, shelltest
, split, syb, template-haskell, temporary, text, time
, transformers, transformers-base
}:
mkDerivation {
pname = "ghc-mod";
version = "5.9.0.0";
src = ghc-mod-src;
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
setupHaskellDepends = [
base Cabal cabal-doctest containers directory filepath process
template-haskell transformers
];
libraryHaskellDepends = [
base binary bytestring cabal-helper containers deepseq directory
djinn-ghc extra fclabels filepath ghc ghc-boot ghc-mod-core
ghc-paths ghc-syb-utils haskell-src-exts hlint monad-control
monad-journal mtl old-time optparse-applicative pipes process safe
semigroups split syb template-haskell temporary text time
transformers transformers-base
];
executableHaskellDepends = [
base binary deepseq directory fclabels filepath ghc ghc-mod-core
monad-control mtl old-time optparse-applicative process semigroups
split time
];
testHaskellDepends = [
base cabal-helper containers directory doctest fclabels filepath
ghc ghc-boot ghc-mod-core hspec monad-journal mtl process split
temporary transformers
];
testToolDepends = [ shelltest ];
# Doesn't work with our doctest
doCheck = false;
benchmarkHaskellDepends = [
base criterion directory filepath ghc-mod-core temporary
];
homepage = "https://github.com/DanielG/ghc-mod";
description = "Happy Haskell Hacking";
license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { shelltest = null; inherit cabal-helper; };
HaRe_hie = callPackage
({ mkDerivation, attoparsec, base, base-prelude, Cabal, cabal-helper
, case-insensitive, containers, conversion
, conversion-case-insensitive, conversion-text, Diff, directory
, filepath, foldl, ghc, ghc-exactprint, ghc-mod-core, ghc-syb-utils
, gitrev, hslogger, hspec, HUnit, monad-control, mtl
, optparse-applicative, optparse-simple, parsec, stdenv
, Strafunski-StrategyLib, syb, syz, turtle
}:
mkDerivation {
pname = "HaRe";
version = "0.8.4.1";
src = HaRe-src;
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base cabal-helper containers directory filepath ghc ghc-exactprint
ghc-mod-core ghc-syb-utils hslogger monad-control mtl
Strafunski-StrategyLib syb syz
];
executableHaskellDepends = [
base Cabal ghc-mod-core gitrev mtl optparse-applicative
optparse-simple
];
testHaskellDepends = [
attoparsec base base-prelude cabal-helper case-insensitive
containers conversion conversion-case-insensitive conversion-text
Diff directory filepath foldl ghc ghc-exactprint ghc-mod-core
ghc-syb-utils hslogger hspec HUnit monad-control mtl parsec
Strafunski-StrategyLib syb syz turtle
];
# Test directory doesn't exist
doCheck = false;
homepage = "https://github.com/RefactoringTools/HaRe/wiki";
description = "the Haskell Refactorer";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit cabal-helper; };
### hie packages
haskell-ide-engine = callPackage
({ mkDerivation, aeson, async, base, bytestring, Cabal, cabal-install
, containers, data-default, Diff, directory, either, ekg, filepath, ghc
, ghc-mod-core, gitrev, haskell-lsp, hie-apply-refact, hie-base
, hie-brittany, hie-build-plugin, hie-eg-plugin-async
, hie-example-plugin2, hie-ghc-mod, hie-ghc-tree, hie-haddock
, hie-hare, hie-hoogle, hie-plugin-api, hoogle, hoogleLocal, hslogger, hspec
, lens, mtl, optparse-simple, QuickCheck, quickcheck-instances
, sorted-list, stm, text, time, transformers
, unordered-containers, vector, vinyl, yaml, yi-rope
}:
mkDerivation {
pname = "haskell-ide-engine";
version = "0.1.0.0";
inherit src;
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson async base bytestring Cabal containers data-default directory
either filepath ghc ghc-mod-core gitrev haskell-lsp
hie-apply-refact hie-base hie-brittany hie-ghc-mod hie-haddock
hie-hare hie-hoogle hie-plugin-api hslogger lens mtl
optparse-simple sorted-list stm text transformers
unordered-containers vector yi-rope
];
executableHaskellDepends = [
base Cabal containers directory ekg ghc-mod-core gitrev haskell-lsp
hie-apply-refact hie-build-plugin hie-eg-plugin-async
hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle
hie-plugin-api hslogger optparse-simple stm text time transformers
unordered-containers vinyl
];
testHaskellDepends = [
aeson base containers Diff directory filepath ghc-mod-core
haskell-lsp hie-apply-refact hie-base hie-eg-plugin-async
hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle
hie-plugin-api hoogle hslogger hspec QuickCheck
quickcheck-instances stm text transformers unordered-containers
vector vinyl yaml
];
preCheck =
''
export HOME=$NIX_BUILD_TOP/home
mkdir -p $HOME/.hoogle
ln -sv ${hoogleLocal}/share/doc/hoogle/default.hoo $HOME/.hoogle/default-haskell-${hoogle.version}.hoo
'';
# https://github.com/haskell/haskell-ide-engine/issues/425
# The disabled tests do work in a local nix-shell with cabal available.
patches = [ ./patches/hie-testsuite.patch ];
homepage = "http://github.com/githubuser/haskell-ide-engine#readme";
description = "Provide a common engine to power any Haskell IDE";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit hoogle; hoogleLocal = (self.hoogleLocal {}).override { inherit hoogle; }; };
hie-apply-refact = callPackage
({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod
, ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint
, text, transformers
}:
mkDerivation {
pname = "hie-apply-refact";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-apply-refact";
libraryHaskellDepends = [
aeson apply-refact base either extra ghc-mod ghc-mod-core
haskell-src-exts hie-base hie-plugin-api hlint text transformers
];
description = "Haskell IDE Apply Refact plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit ghc-mod; };
hie-base = callPackage
({ mkDerivation, aeson, base, haskell-lsp, text }:
mkDerivation {
pname = "hie-base";
version = "0.1.0.0";
inherit src;
preUnpack = "sourceRoot=source/hie-base";
libraryHaskellDepends = [ aeson base haskell-lsp text ];
description = "Haskell IDE API base types";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
hie-brittany = callPackage
({ mkDerivation, aeson, base, brittany, ghc-mod, ghc-mod-core
, haskell-lsp, hie-plugin-api, lens, text
}:
mkDerivation {
pname = "hie-brittany";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-brittany";
libraryHaskellDepends = [
aeson base brittany ghc-mod ghc-mod-core haskell-lsp hie-plugin-api
lens text
];
description = "Haskell IDE Hoogle plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit ghc-mod; };
hie-build-plugin = callPackage
({ mkDerivation, aeson, base, bytestring, Cabal, cabal-helper
, containers, directory, filepath, haskell-lsp, hie-plugin-api
, process, stm, text, transformers, yaml
}:
mkDerivation {
pname = "hie-build-plugin";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-build-plugin";
libraryHaskellDepends = [
aeson base bytestring Cabal cabal-helper containers directory
filepath haskell-lsp hie-plugin-api process stm text transformers
yaml
];
description = "Haskell IDE build plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit cabal-helper; };
hie-eg-plugin-async = callPackage
({ mkDerivation, base, ghc-mod-core, hie-plugin-api, stm
, text
}:
mkDerivation {
pname = "hie-eg-plugin-async";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-eg-plugin-async";
libraryHaskellDepends = [
base ghc-mod-core hie-plugin-api stm text
];
description = "Haskell IDE example plugin, using async processes";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
hie-example-plugin2 = callPackage
({ mkDerivation, base, hie-plugin-api, text }:
mkDerivation {
pname = "hie-example-plugin2";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-example-plugin2";
libraryHaskellDepends = [ base hie-plugin-api text ];
description = "Haskell IDE example plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
hie-ghc-mod = callPackage
({ mkDerivation, aeson, base, containers, ghc, ghc-mod, ghc-mod-core
, hie-base, hie-plugin-api, text, transformers
}:
mkDerivation {
pname = "hie-ghc-mod";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-ghc-mod";
libraryHaskellDepends = [
aeson base containers ghc ghc-mod ghc-mod-core hie-base
hie-plugin-api text transformers
];
description = "Haskell IDE ghc-mod plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit ghc-mod; };
hie-ghc-tree = callPackage
({ mkDerivation, aeson, base, ghc-dump-tree, ghc-mod, ghc-mod-core
, hie-base, hie-plugin-api, text
}:
mkDerivation {
pname = "hie-ghc-tree";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-ghc-tree";
libraryHaskellDepends = [
aeson base ghc-dump-tree ghc-mod ghc-mod-core hie-base
hie-plugin-api text
];
description = "Haskell IDE GHC Tree plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit ghc-dump-tree ghc-mod; };
hie-haddock = callPackage
({ mkDerivation, aeson, base, containers, directory, either
, filepath, ghc, ghc-exactprint, ghc-mod, ghc-mod-core, haddock-api
, haddock-library, HaRe, haskell-lsp, hie-base, hie-ghc-mod
, hie-hare, hie-plugin-api, lens, monad-control, mtl, text
, transformers
}:
mkDerivation {
pname = "hie-haddock";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-haddock";
libraryHaskellDepends = [
aeson base containers directory either filepath ghc ghc-exactprint
ghc-mod ghc-mod-core haddock-api haddock-library HaRe haskell-lsp
hie-base hie-ghc-mod hie-hare hie-plugin-api lens monad-control mtl
text transformers
];
description = "Haskell IDE Haddock plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit haddock-library HaRe ghc-mod; };
hie-hare = callPackage
({ mkDerivation, aeson, base, containers, Diff, either, ghc
, ghc-exactprint, ghc-mod, ghc-mod-core, HaRe, haskell-lsp
, hie-base, hie-ghc-mod, hie-plugin-api, lens, monad-control, mtl
, text, transformers
}:
mkDerivation {
pname = "hie-hare";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-hare";
libraryHaskellDepends = [
aeson base containers Diff either ghc ghc-exactprint ghc-mod
ghc-mod-core HaRe haskell-lsp hie-base hie-ghc-mod hie-plugin-api
lens monad-control mtl text transformers
];
description = "Haskell IDE HaRe plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit ghc-mod HaRe; };
hie-hoogle = callPackage
({ mkDerivation, aeson, base, directory, filepath, ghc-mod
, ghc-mod-core, hie-plugin-api, hoogle, tagsoup, text
}:
mkDerivation {
pname = "hie-hoogle";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-hoogle";
libraryHaskellDepends = [
aeson base directory filepath ghc-mod ghc-mod-core hie-plugin-api
hoogle tagsoup text
];
description = "Haskell IDE Hoogle plugin";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) { inherit ghc-mod hoogle; };
hie-plugin-api = callPackage
({ mkDerivation, aeson, base, containers, Diff, directory, either
, filepath, fingertree, ghc, ghc-mod-core, haskell-lsp, hie-base
, hslogger, lifted-base, monad-control, mtl, stdenv, stm, syb, text
, time, transformers, unordered-containers
}:
mkDerivation {
pname = "hie-plugin-api";
version = "0.1.0.0";
inherit src;
postUnpack = "sourceRoot=source/hie-plugin-api";
libraryHaskellDepends = [
aeson base containers Diff directory either filepath fingertree ghc
ghc-mod-core haskell-lsp hie-base hslogger lifted-base
monad-control mtl stm syb text time transformers
unordered-containers
];
description = "Haskell IDE API for plugin communication";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
}

2
pkgs/development/haskell-modules/initial-packages.nix
View File

@ -1,2 +1,2 @@
args@{ pkgs, stdenv, callPackage }: self: args@{ pkgs, stdenv, callPackage }: self:
(import ./hie-packages.nix args self) // (import ./hackage-packages.nix args self) (import ./hackage-packages.nix args self)

107
pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch Normal file
View File

@ -0,0 +1,107 @@
From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001
From: Michiel Derhaeg <derhaeg.michiel@gmail.com>
Date: Tue, 20 Mar 2018 22:06:18 +0100
Subject: [PATCH] update to work with GHC 8.4.1
---
XMonad/Hooks/FadeWindows.hs | 6 +++++-
XMonad/Hooks/WallpaperSetter.hs | 6 +++++-
XMonad/Layout/Mosaic.hs | 6 +++++-
xmonad-contrib.cabal | 5 +++--
5 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs
index 4b8e62b6..01d06792 100644
--- a/XMonad/Hooks/FadeWindows.hs
+++ b/XMonad/Hooks/FadeWindows.hs
@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask
,asks)
import Control.Monad.State (gets)
import qualified Data.Map as M
-import Data.Monoid
+import Data.Monoid hiding ((<>))
+import Data.Semigroup
import Graphics.X11.Xlib.Extras (Event(..))
@@ -134,6 +135,9 @@ instance Monoid Opacity where
r `mappend` OEmpty = r
_ `mappend` r = r
+instance Semigroup Opacity where
+ (<>) = mappend
+
-- | A FadeHook is similar to a ManageHook, but records window opacity.
type FadeHook = Query Opacity
diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs
index 00a3b1c3..d4f5ccb2 100644
--- a/XMonad/Hooks/WallpaperSetter.hs
+++ b/XMonad/Hooks/WallpaperSetter.hs
@@ -41,7 +41,8 @@ import Data.Ord (comparing)
import Control.Monad
import Control.Applicative
import Data.Maybe
-import Data.Monoid
+import Data.Monoid hiding ((<>))
+import Data.Semigroup
-- $usage
-- This module requires imagemagick and feh to be installed, as these are utilized
@@ -86,6 +87,9 @@ instance Monoid WallpaperList where
mappend (WallpaperList w1) (WallpaperList w2) =
WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1)
+instance Semigroup WallpaperList where
+ (<>) = mappend
+
-- | Complete wallpaper configuration passed to the hook
data WallpaperConf = WallpaperConf {
wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/)
diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs
index 05655d4c..da44fc50 100644
--- a/XMonad/Layout/Mosaic.hs
+++ b/XMonad/Layout/Mosaic.hs
@@ -38,7 +38,8 @@ import Control.Monad(mplus)
import Data.Foldable(Foldable,foldMap, sum)
import Data.Function(on)
import Data.List(sortBy)
-import Data.Monoid(Monoid,mempty, mappend)
+import Data.Monoid(Monoid,mempty, mappend, (<>))
+import Data.Semigroup
-- $usage
@@ -202,6 +203,9 @@ instance Monoid (Tree a) where
mappend x Empty = x
mappend x y = Branch x y
+instance Semigroup (Tree a) where
+ (<>) = mappend
+
makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a
makeTree _ [] = Empty
makeTree _ [x] = Leaf x
diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
index dde3ccda..c401c6e6 100644
--- a/xmonad-contrib.cabal
+++ b/xmonad-contrib.cabal
@@ -36,7 +36,7 @@ cabal-version: >= 1.6
build-type: Simple
bug-reports: https://github.com/xmonad/xmonad-contrib/issues
-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
+tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1
source-repository head
type: git
@@ -66,7 +66,8 @@ library
unix,
X11>=1.6.1 && < 1.9,
xmonad>=0.13 && < 0.14,
- utf8-string
+ utf8-string,
+ semigroups
if flag(use_xft)
build-depends: X11-xft >= 0.2

8
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -65,9 +65,9 @@ in stdenv.mkDerivation ({
''; '';
postPatch = '' postPatch = ''
${postPatch}
patchShebangs make patchShebangs make
${postPatch}
''; '';
preConfigure = '' preConfigure = ''
@ -88,9 +88,9 @@ in stdenv.mkDerivation ({
# (PDFs are generated only when fop is available). # (PDFs are generated only when fop is available).
postInstall = '' postInstall = ''
${postInstall}
ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
${postInstall}
''; '';
# Some erlang bin/ scripts run sed and awk # Some erlang bin/ scripts run sed and awk

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec stdenv.mkDerivation rec
{ {
name = "alembic-${version}"; name = "alembic-${version}";
version = "1.7.5"; version = "1.7.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alembic"; owner = "alembic";
repo = "alembic"; repo = "alembic";
rev = "${version}"; rev = "${version}";
sha256 = "1p5zd9kdwnrwg604bq79ianc5bw6mx6i5d7yc4r11xrbphlc9m1g"; sha256 = "0vz7pda7n50d490vv9i044xpi8rhrvs6qxcapwd49wzwrvkg67dk";
}; };
outputs = [ "bin" "dev" "out" "lib" ]; outputs = [ "bin" "dev" "out" "lib" ];

7
pkgs/development/libraries/atk/default.nix
View File

@ -1,9 +1,12 @@
{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib, gobjectIntrospection, gnome3 }: { stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib
, fixDarwinDylibNames, gobjectIntrospection, gnome3
}:
let let
pname = "atk"; pname = "atk";
version = "2.28.1"; version = "2.28.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -22,6 +25,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/libraries/fox/fox-1.6.nix
View File

@ -3,7 +3,7 @@
, CoreServices }: , CoreServices }:
let let
version = "1.6.49"; version = "1.6.56";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; sha256 = "1ckcb12gblz1ad1371ah1qirxn3r9zdngh9w0357hsqfmkyfa5y5";
}; };
buildInputs = [ buildInputs = [

47
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -1,46 +1,40 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, gobjectIntrospection, doCheck ? false }:
, jasper, shared-mime-info, libintl, gobjectIntrospection, doCheck ? false, makeWrapper }:
let let
pname = "gdk-pixbuf"; pname = "gdk-pixbuf";
version = "2.36.11"; version = "2.36.7";
# TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
# which apparently requires access to shared-mime-info files during runtime.
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf"; sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
}; };
outputs = [ "out" "dev" "man" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
enableParallelBuilding = true; enableParallelBuilding = true;
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage. # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
buildInputs = [ libX11 libintl ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info; buildInputs = [ libX11 gobjectIntrospection ];
nativeBuildInputs = [ nativeBuildInputs = [ pkgconfig ];
meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
gtk-doc gobjectIntrospection makeWrapper
];
propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
mesonFlags = [ configureFlags = "--with-libjasper --with-x11"
# with_ & enable_will be removed in the future + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
"-Dwith_docs=true" ;
"-Denable_jasper=true"
"-Dx11=true" # will be added in the future (default atm)
"-Dwith_gir=${if gobjectIntrospection != null then "true" else "false"}"
];
postPatch = '' # on darwin, tests don't link
chmod +x build-aux/* # patchShebangs only applies to executables preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
patchShebangs build-aux substituteInPlace Makefile --replace "docs tests" "docs"
''; '';
postInstall = postInstall =
@ -48,17 +42,6 @@ stdenv.mkDerivation rec {
'' ''
moveToOutput "bin" "$dev" moveToOutput "bin" "$dev"
moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
# We require runtime access to shared-mime-info
${stdenv.lib.optionalString (!stdenv.isDarwin) ''
for f in $dev/bin/*; do
wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
done
wrapProgram $out/bin/gdk-pixbuf-thumbnailer --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
''}
# We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
$dev/bin/gdk-pixbuf-query-loaders --update-cache
''; '';
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libbson-${version}"; name = "libbson-${version}";
version = "1.9.2"; version = "1.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mongodb"; owner = "mongodb";
repo = "libbson"; repo = "libbson";
rev = version; rev = version;
sha256 = "1dlmcqsb43269z4pa3xmqb1gf1jsji82sk5yyibq0ndhk326iyck"; sha256 = "0dbpmvd2p9bdqdyiijmsc1hd9d6l36migk79smw7fpfvh0y6ldsk";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcouchbase-${version}"; name = "libcouchbase-${version}";
version = "2.8.4"; version = "2.8.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "couchbase"; owner = "couchbase";
repo = "libcouchbase"; repo = "libcouchbase";
rev = version; rev = version;
sha256 = "0i5kmv8grsnh2igvlkgjr8lz3h3yrxh82yxbbdsjfpslv61l0gpi"; sha256 = "1iwzf0y5f25g5hgdkmv6qf3k5mzlazrpx5sj3m2pvrl9jg9wn4s1";
}; };
cmakeFlags = "-DLCB_NO_MOCK=ON"; cmakeFlags = "-DLCB_NO_MOCK=ON";

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdvdnav-${version}"; name = "libdvdnav-${version}";
version = "5.0.3"; version = "6.0.0";
src = fetchurl { src = fetchurl {
url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2"; url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2";
sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"; sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdvdread-${version}"; name = "libdvdread-${version}";
version = "5.0.3"; version = "6.0.0";
src = fetchurl { src = fetchurl {
url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2"; url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
sha256 = "0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j"; sha256 = "0dgr23fzcjhb7ck54xkr9zmf4jcq3ph0dz3fbyvla1c6ni9ijfxk";
}; };
buildInputs = [libdvdcss]; buildInputs = [libdvdcss];

2
pkgs/development/libraries/libftdi/1.x.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "A library to talk to FTDI chips using libusb"; description = "A library to talk to FTDI chips using libusb";
homepage = https://www.intra2net.com/en/developer/libftdi/; homepage = https://www.intra2net.com/en/developer/libftdi/;
license = with licenses; [ lgpl2 gpl2 ]; license = with licenses; [ lgpl2 gpl2 ];
platforms = platforms.linux; platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
}; };
} }

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "17.12"; version = "18.03";
name = "libmediainfo-${version}"; name = "libmediainfo-${version}";
src = fetchurl { src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "0lm4454ynp0msgqm3s0mnxqxql6i1ank35jvff5swnaxvwsbp0ml"; sha256 = "1d4zqik9sm8fsr26w5jsp0rgczlh5vh3gwknxy4g3gd6pqri4igv";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "librsync-${version}"; name = "librsync-${version}";
version = "2.0.1"; version = "2.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "librsync"; owner = "librsync";
repo = "librsync"; repo = "librsync";
rev = "v${version}"; rev = "v${version}";
sha256 = "0wihjinqbjl4hnvrgsk4ca1zy5v6bj7vjm6wlygwvgbn5yh3yq0x"; sha256 = "1qnr4rk93mhggqjh2025clmlhhgnjhq983p1vbh8i1g8aiqdnapi";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libsass-${version}"; name = "libsass-${version}";
version = "3.4.9"; version = "3.5.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
sha256 = "0f4mj91zzdzah7fxkdg3dnrimk9ip7czl4g26f32zgifz1nrqgjs"; sha256 = "0qy5hsglrdwzlb1x83v40pnm52hrjbdrc5zardp89i3vwcdzkrq8";
}; };
patchPhase = '' patchPhase = ''

4
pkgs/development/libraries/libu2f-host/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, json_c, hidapi }: { stdenv, fetchurl, pkgconfig, json_c, hidapi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libu2f-host-1.1.4"; name = "libu2f-host-1.1.5";
src = fetchurl { src = fetchurl {
url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
sha256 = "0vvs2p3b25cbybccv3f4ridnp7sg5i4hkzx3hx48ldcn1l1fqhv0"; sha256 = "159slvjfq4bqslx5amjkk90xnkiv3x0yzvbi54pl2vnzbr1p2azk";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/libraries/netcdf-fortran/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "netcdf-fortran-${version}"; name = "netcdf-fortran-${version}";
version = "4.4.3"; version = "4.4.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz";
sha256 = "4170fc018c9ee8222e317215c6a273542623185f5f6ee00d37bbb4e024e4e998"; sha256 = "0rwybszj1jjb25cx8vfyrd77x5qsdjzwspcjz56n12br89n9ica4";
}; };
buildInputs = [ netcdf hdf5 curl gfortran ]; buildInputs = [ netcdf hdf5 curl gfortran ];

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nlohmann_json-${version}"; name = "nlohmann_json-${version}";
version = "3.1.1"; version = "3.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nlohmann"; owner = "nlohmann";
repo = "json"; repo = "json";
rev = "v${version}"; rev = "v${version}";
sha256 = "0s5xiyvnvxc2k0zkyb12mm5cwn61lavyxlfpknlx5f243g1xi6f6"; sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

5
pkgs/development/libraries/ntbtls/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }: { stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }:
with stdenv.lib; with stdenv.lib;
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];
buildInputs = [ libgcrypt libgpgerror libksba zlib ]; buildInputs = [ libgcrypt libgpgerror libksba zlib ]
++ stdenv.lib.optional stdenv.isDarwin gettext;
postInstall = '' postInstall = ''
moveToOutput "bin/ntbtls-config" $dev moveToOutput "bin/ntbtls-config" $dev

7
pkgs/development/libraries/openexrid-unstable/default.nix
View File

@ -16,6 +16,11 @@ stdenv.mkDerivation rec
patches = [ ./openexrid.patch ]; patches = [ ./openexrid.patch ];
postPatch = ''
substituteInPlace openexrid/makefile \
--replace g++ c++
'';
NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR
-I${openexr.dev}/include/OpenEXR -I${openexr.dev}/include/OpenEXR
-I${openfx.dev}/include/OpenFX -I${openfx.dev}/include/OpenFX
@ -38,7 +43,7 @@ stdenv.mkDerivation rec
find $out find $out
mv $out/include $dev/ mv $out/include $dev/
mv $out/lib $lib/ mv $out/lib $lib/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing";

56
pkgs/development/libraries/poppler/0.61.nix Normal file
View File

@ -0,0 +1,56 @@
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
, introspectionSupport ? false, gobjectIntrospection ? null
, utils ? false
, minimal ? false, suffix ? "glib"
}:
let
version = "0.61.0";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "0zrbb1b77k6bm2qdnra08jnbyllv6vj29790igmp6fzs59xf3kak";
};
outputs = [ "out" "dev" ];
buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data;
# TODO: reduce propagation to necessary libs
propagatedBuildInputs = with lib;
[ zlib freetype fontconfig libjpeg openjpeg ]
++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt5Support qtbase
++ optional introspectionSupport gobjectIntrospection;
nativeBuildInputs = [ cmake ninja pkgconfig ];
cmakeFlags = [
(mkFlag true "XPDF_HEADERS")
(mkFlag (!minimal) "GLIB")
(mkFlag (!minimal) "CPP")
(mkFlag (!minimal) "LIBCURL")
(mkFlag utils "UTILS")
(mkFlag qt5Support "QT5")
];
meta = with lib; {
homepage = https://poppler.freedesktop.org/;
description = "A PDF rendering library";
longDescription = ''
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
'';
license = licenses.gpl2;
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ];
};
}

2
pkgs/development/libraries/poppler/default.nix
View File

@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig ]; nativeBuildInputs = [ cmake ninja pkgconfig ];
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
cmakeFlags = [ cmakeFlags = [
(mkFlag true "XPDF_HEADERS") (mkFlag true "XPDF_HEADERS")
(mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "GLIB")

22
pkgs/development/libraries/qtkeychain/default.nix
View File

@ -1,31 +1,43 @@
{ stdenv, fetchFromGitHub, cmake, qt4 ? null { stdenv, fetchFromGitHub, cmake, qt4 ? null
, withQt5 ? false, qtbase ? null, qttools ? null , withQt5 ? false, qtbase ? null, qttools ? null
, darwin ? null
}: }:
assert withQt5 -> qtbase != null; assert withQt5 -> qtbase != null;
assert withQt5 -> qttools != null; assert withQt5 -> qttools != null;
assert stdenv.isDarwin -> darwin != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}";
version = "0.7.0"; version = "0.8.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frankosterfeld"; owner = "frankosterfeld";
repo = "qtkeychain"; repo = "qtkeychain";
rev = "v${version}"; rev = "v${version}";
sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52"; sha256 = "1r6qp9l2lp5jpc6ciklbg1swvvzcpc37rg9py46hk0wxy6klnm0b"; # v0.8.0
}; };
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
++ stdenv.lib.optional stdenv.isDarwin [
# correctly detect the compiler
# for details see cmake --help-policy CMP0025
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
]
;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]; buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]
++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation Security
])
;
meta = { meta = {
description = "Platform-independent Qt API for storing passwords securely"; description = "Platform-independent Qt API for storing passwords securely";
homepage = https://github.com/frankosterfeld/qtkeychain; homepage = https://github.com/frankosterfeld/qtkeychain;
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

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

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tevent-0.9.35"; name = "tevent-0.9.36";
src = fetchurl { src = fetchurl {
url = "mirror://samba/tevent/${name}.tar.gz"; url = "mirror://samba/tevent/${name}.tar.gz";
sha256 = "1s8nbkmqz8dzdlsd6qynhvyl05pw93r151f3i2kgjfpbck9ak8r5"; sha256 = "0k1v4vnlzpf7h3p4khaw8a7damrc68g136bf2xzys08nzpinnaxx";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

33
pkgs/development/python-modules/face_recognition/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy
, face_recognition_models, scipy, stdenv, flake8, tox, pytest, glibcLocales
}:
buildPythonPackage rec {
pname = "face_recognition";
version = "1.2.1";
src = fetchFromGitHub {
repo = pname;
owner = "ageitgey";
rev = "fe421d4acd76e8a19098e942b7bd9c3bbef6ebc4"; # no tags available in Git, pure revs are pushed to pypi
sha256 = "0wv5qxkg7xv1cr43zhhbixaqgj08xw2l7yvwl8g3fb2kdxyndw1c";
};
postPatch = ''
substituteInPlace setup.py --replace "flake8==2.6.0" "flake8"
'';
propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models scipy ];
checkInputs = [ flake8 tox pytest glibcLocales ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test
'';
meta = with stdenv.lib; {
license = licenses.mit;
homepage = https://github.com/ageitgey/face_recognition;
maintainers = with maintainers; [ ma27 ];
description = "The world's simplest facial recognition api for Python and the command line";
};
}

21
pkgs/development/python-modules/face_recognition_models/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ buildPythonPackage, stdenv, fetchPypi }:
buildPythonPackage rec {
pname = "face_recognition_models";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1kwnv3qpy5bhspk780bkyg8jd9n5f6p91ja6sjlwk1wcm00d56xp";
};
# no module named `tests` as no tests are available
doCheck = false;
meta = with stdenv.lib; {
homepage = https://github.com/ageitgey/face_recognition_models;
license = licenses.cc0;
maintainers = with maintainers; [ ma27 ];
description = "Trained models for the face_recognition python library";
};
}

4
pkgs/development/tools/analysis/pmd/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pmd-${version}"; name = "pmd-${version}";
version = "6.0.1"; version = "6.1.0";
buildInputs = [ unzip ]; buildInputs = [ unzip ];
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
sha256 = "13wmmy345p8bzvxdb8ldpkv85m3m8x9qs5f0jjhn0gkn65a988iq"; sha256 = "1d2hbsnyvwvawhfh832yy3w93kr4whrk99zpg4q5ws2b2hhdvzv8";
}; };
installPhase = '' installPhase = ''

4
pkgs/development/tools/build-managers/waf/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "waf-${version}"; name = "waf-${version}";
version = "2.0.4"; version = "2.0.6";
src = fetchurl { src = fetchurl {
url = "https://waf.io/waf-${version}.tar.bz2"; url = "https://waf.io/waf-${version}.tar.bz2";
sha256 = "0zmnwgccq5j7ipfi2j0k5s40q27krp1m6v2bd650axgzdbpa7ain"; sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q";
}; };
buildInputs = [ python2 ]; buildInputs = [ python2 ];

32
pkgs/development/tools/glslviewer/default.nix
View File

@ -1,36 +1,46 @@
{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
, libX11, libGLU, Cocoa , libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook
, Cocoa
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glslviewer-${version}"; name = "glslviewer-${version}";
version = "1.2"; version = "2018-01-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "patriciogonzalezvivo"; owner = "patriciogonzalezvivo";
repo = "glslViewer"; repo = "glslViewer";
rev = version; rev = "cac40f6984dbeb638950744c9508aa88591fea6c";
sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw"; sha256 = "1bykpp68hdxjlxvi1xicyb6822mz69q0adz24faaac372pls4bk0";
}; };
nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ];
buildInputs = [
glfw libGLU glfw libXrandr libXdamage
libXext libXrender libXinerama libXcursor libXxf86vm
libXi libX11
] ++ (with python2Packages; [ python setuptools wrapPython ])
++ stdenv.lib.optional stdenv.isDarwin Cocoa;
pythonPath = with python2Packages; [ requests.dev ];
# Makefile has /usr/local/bin hard-coded for 'make install' # Makefile has /usr/local/bin hard-coded for 'make install'
preConfigure = '' preConfigure = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace '/usr/local' "$out" \ --replace '/usr/local' "$out" \
--replace '/usr/bin/clang++' 'clang++' --replace '/usr/bin/clang++' 'clang++'
substituteInPlace Makefile \
--replace 'python setup.py install' "python setup.py install --prefix=$out"
''; '';
preInstall = '' preInstall = ''
mkdir -p $out/bin mkdir -p $out/bin $(toPythonPath "$out")
export PYTHONPATH=$PYTHONPATH:$(toPythonPath "$out")
''; '';
nativeBuildInputs = [ pkgconfig ]; postInstall = ''
buildInputs = [ wrapPythonPrograms
glfw libGLU glfw libXrandr libXdamage '';
libXext libXrender libXinerama libXcursor libXxf86vm
libXi libX11
] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Live GLSL coding renderer"; description = "Live GLSL coding renderer";

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