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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-01-01 18:15:13 +01:00
parent e576535408 f448a79770
commit 4cc2a38854
25 changed files with 540 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/security/pam.nix
+2
View File
@@ -351,6 +351,8 @@ let
${optionalString (cfg.enableKwallet) ${optionalString (cfg.enableKwallet)
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
${optionalString (config.virtualisation.lxc.lxcfs.enable)
"session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}
''); '');
}; };
nixos/modules/virtualisation/lxcfs.nix
-4
View File
@@ -28,13 +28,9 @@ in {
###### implementation ###### implementation
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.cgmanager.enable = true;
systemd.services.lxcfs = { systemd.services.lxcfs = {
description = "FUSE filesystem for LXC"; description = "FUSE filesystem for LXC";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "cgmanager.service" ];
after = [ "cgmanager.service" ];
before = [ "lxc.service" ]; before = [ "lxc.service" ];
restartIfChanged = false; restartIfChanged = false;
serviceConfig = { serviceConfig = {
pkgs/applications/audio/audacious/default.nix
+3 -3
View File
@@ -8,16 +8,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "audacious-${version}"; name = "audacious-${version}";
version = "3.8.2"; version = "3.9";
src = fetchurl { src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf"; sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm";
}; };
pluginsSrc = fetchurl { pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq"; sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgs/applications/audio/audacious/qt-5.nix
+15 -4
View File
@@ -1,5 +1,5 @@
{ {
mkDerivation, lib, fetchurl, mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkgconfig, gettext, pkgconfig,
qtbase, qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
@@ -10,18 +10,23 @@
}: }:
let let
version = "3.8.2"; version = "3.9";
sources = { sources = {
"audacious-${version}" = fetchurl { "audacious-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx"; sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d";
}; };
"audacious-plugins-${version}" = fetchurl { "audacious-plugins-${version}" = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp"; sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb";
}; };
}; };
qt510_plugins_patch = fetchpatch {
url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch";
sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17";
};
in in
mkDerivation { mkDerivation {
@@ -33,6 +38,8 @@ mkDerivation {
nativeBuildInputs = [ gettext pkgconfig ]; nativeBuildInputs = [ gettext pkgconfig ];
inherit qt510_plugins_patch;
buildInputs = [ buildInputs = [
# Core dependencies # Core dependencies
qtbase qtbase
@@ -55,6 +62,10 @@ mkDerivation {
for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do
( (
# only patch the plugins
if [ "$i" -eq "1" ]; then
patches=( $qt510_plugins_patch )
fi
src=''${sourceFiles[$i]} src=''${sourceFiles[$i]}
sourceRoot=''${sourceRoots[$i]} sourceRoot=''${sourceRoots[$i]}
source $stdenv/setup source $stdenv/setup
pkgs/applications/audio/cantata/default.nix
+3 -12
View File
@@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc { stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
, withQt4 ? false, qt4 , qtbase, qtmultimedia, qtsvg, qttools
, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools
# Cantata doesn't build with cdparanoia enabled so we disable that # Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out. # default for now until I (or someone else) figure it out.
@@ -19,11 +18,6 @@
, withStreams ? true , withStreams ? true
}: }:
# One and only one front-end.
assert withQt5 -> withQt4 == false;
assert withQt4 -> withQt5 == false;
assert withQt4 || withQt5;
# Inter-dependencies. # Inter-dependencies.
assert withCddb -> withCdda && withTaglib; assert withCddb -> withCdda && withTaglib;
assert withCdda -> withCddb && withMusicbrainz; assert withCdda -> withCddb && withMusicbrainz;
@@ -51,9 +45,7 @@ in stdenv.mkDerivation rec {
sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
}; };
buildInputs = [ vlc ] buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
++ stdenv.lib.optional withQt4 qt4
++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ]
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ stdenv.lib.optional withCdda cdparanoia ++ stdenv.lib.optional withCdda cdparanoia
@@ -63,12 +55,11 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional withUdisks udisks2; ++ stdenv.lib.optional withUdisks udisks2;
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = stdenv.lib.flatten [ cmakeFlags = stdenv.lib.flatten [
(fstat withQt5 "QT5")
(fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
(fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
(fstat withCdda "CDPARANOIA") (fstat withCdda "CDPARANOIA")
pkgs/applications/audio/dirt/default.nix
+6 -7
View File
@@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dirt-2015-04-28"; name = "dirt-2018-01-01";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "Dirt"; repo = "Dirt";
owner = "tidalcycles"; owner = "tidalcycles";
rev = "cfc5e85318defda7462192b5159103c823ce61f7"; rev = "b09604c7d8e581bc7799d7e2ad293e7cdd254bda";
sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz"; sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n";
fetchSubmodules = true;
}; };
buildInputs = [ libsndfile libsamplerate liblo libjack2 ]; buildInputs = [ libsndfile libsamplerate liblo libjack2 ];
postPatch = '' postPatch = ''
sed -i "s|./samples|$out/share/dirt/samples|" file.h sed -i "s|./samples|$out/share/dirt/samples|" dirt.c
'';
configurePhase = ''
export DESTDIR=$out
''; '';
makeFlags = ["PREFIX=$(out)"];
postInstall = '' postInstall = ''
mkdir -p $out/share/dirt/ mkdir -p $out/share/dirt/
cp -r samples $out/share/dirt/ cp -r samples $out/share/dirt/
pkgs/applications/misc/alacritty/default.nix
+5 -3
View File
@@ -12,6 +12,7 @@
libXcursor, libXcursor,
libXxf86vm, libXxf86vm,
libXi, libXi,
libXrandr,
xclip }: xclip }:
with rustPlatform; with rustPlatform;
@@ -24,22 +25,23 @@ let
libX11 libX11
libXcursor libXcursor
libXxf86vm libXxf86vm
libXrandr
libXi libXi
]; ];
in buildRustPackage rec { in buildRustPackage rec {
name = "alacritty-unstable-${version}"; name = "alacritty-unstable-${version}";
version = "2017-11-12"; version = "2017-12-29";
# At the moment we cannot handle git dependencies in buildRustPackage. # At the moment we cannot handle git dependencies in buildRustPackage.
# This fork only replaces rust-fontconfig/libfontconfig with a git submodules. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
src = fetchgit { src = fetchgit {
url = https://github.com/Mic92/alacritty.git; url = https://github.com/Mic92/alacritty.git;
rev = "rev-${version}"; rev = "rev-${version}";
sha256 = "0096fzrfzj0a2n2n531r4b6c8rlfj5qc90d6i4iin5axalk3i1h4"; sha256 = "0pk4b8kfxixmd9985v2fya1m7np8ggws8d9msw210drc0grwbfkd";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoSha256 = "10blch8pzk1zk3w27sbcszhcnq908xh1q55vqgy8iv5x47rpl02q"; cargoSha256 = "0acj526cx4xl52vbcbd3hp1klh4p756j6alxqqz3x715zi2dqkzf";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgs/applications/misc/girara/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@ assert withBuildColors -> ncurses != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "girara-${version}"; name = "girara-${version}";
version = "0.2.7"; version = "0.2.8";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq"; sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98";
}; };
preConfigure = '' preConfigure = ''
pkgs/applications/misc/zathura/core/default.nix
+3 -2
View File
@@ -10,11 +10,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zathura-core-${version}"; name = "zathura-core-${version}";
version = "0.3.7"; version = "0.3.8";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2"; sha256 = "0dz5pky3vmf3s2cp2rv1c099gb1s49p9xlgm3ghyy4pzyxc8bgs6";
}; };
icon = ./icon.xpm; icon = ./icon.xpm;
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"RSTTOMAN=${docutils}/bin/rst2man.py"
"VERBOSE=1" "VERBOSE=1"
"TPUT=${ncurses.out}/bin/tput" "TPUT=${ncurses.out}/bin/tput"
(optionalString synctexSupport "WITH_SYNCTEX=1") (optionalString synctexSupport "WITH_SYNCTEX=1")
pkgs/applications/misc/zathura/djvu/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zathura-djvu-0.2.5"; name = "zathura-djvu-0.2.7";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8"; sha256 = "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
pkgs/applications/misc/zathura/djvu/gtkflags.patch
+11 -11
View File
@@ -1,7 +1,7 @@
--- a/config.mk 2012-05-14 01:13:09.009740082 +0400 --- zathura-djvu-0.2.7.orig/config.mk 2017-12-21 14:20:24.000000000 +0100
+++ b/config.mk 2012-05-14 01:13:50.400525700 +0400 +++ zathura-djvu-0.2.7/config.mk 2017-12-31 00:41:02.580154770 +0100
@@ -11,6 +11,9 @@ @@ -16,6 +16,9 @@
LIBDIR ?= ${PREFIX}/lib DESKTOPPREFIX ?= ${PREFIX}/share/applications
# libs # libs
+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) +GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
@@ -10,14 +10,14 @@
CAIRO_INC ?= $(shell pkg-config --cflags cairo) CAIRO_INC ?= $(shell pkg-config --cflags cairo)
CAIRO_LIB ?= $(shell pkg-config --libs cairo) CAIRO_LIB ?= $(shell pkg-config --libs cairo)
@@ -29,8 +32,8 @@ @@ -34,8 +37,8 @@
PLUGINDIR = ${LIBDIR}/zathura PLUGINDIR = ${LIBDIR}/zathura
endif endif
-INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC} -INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC}
-LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} -LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB}
+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC} ${GTK_INC} +INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${GTK_LIB} +LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ${GTK_LIB}
# flags # pre-processor flags
CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) CPPFLAGS += -D_FILE_OFFSET_BITS=64
pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
, libjpeg, jbig2dec, openjpeg, fetchpatch }: , libjpeg, jbig2dec, openjpeg, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.3.1"; version = "0.3.2";
name = "zathura-pdf-mupdf-${version}"; name = "zathura-pdf-mupdf-${version}";
src = fetchurl { src = fetchurl {
url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz"; url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz";
sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr"; sha256 = "0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
pkgs/applications/misc/zathura/pdf-poppler/default.nix
+3 -3
View File
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }: { stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2.6"; version = "0.2.8";
name = "zathura-pdf-poppler-${version}"; name = "zathura-pdf-poppler-${version}";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi"; sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
homepage = http://pwmt.org/projects/zathura/; homepage = http://pwmt.org/projects/zathura/;
description = "A zathura PDF plugin (poppler)"; description = "A zathura PDF plugin (poppler)";
longDescription = '' longDescription = ''
The zathura-pdf-poppler plugin adds PDF support to zathura by The zathura-pdf-poppler plugin adds PDF support to zathura by
using the poppler rendering library. using the poppler rendering library.
''; '';
license = licenses.zlib; license = licenses.zlib;
pkgs/applications/misc/zathura/ps/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: { stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zathura-ps-0.2.3"; name = "zathura-ps-0.2.5";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9"; sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
pkgs/applications/misc/zathura/ps/gtkflags.patch
+13 -15
View File
@@ -1,9 +1,7 @@
diff --git a/config.mk b/config.mk.new --- zathura-ps-0.2.5.orig/config.mk 2017-12-21 14:21:17.000000000 +0100
index c3a7b37..0cbce67 100644 +++ zathura-ps-0.2.5/config.mk 2017-12-31 01:05:17.507268817 +0100
--- a/config.mk @@ -16,6 +16,9 @@
+++ b/config.mk DESKTOPPREFIX ?= ${PREFIX}/share/applications
@@ -10,6 +10,9 @@ ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERS
PREFIX ?= /usr
# libs # libs
+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) +GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
@@ -12,14 +10,14 @@ index c3a7b37..0cbce67 100644
CAIRO_INC ?= $(shell pkg-config --cflags cairo) CAIRO_INC ?= $(shell pkg-config --cflags cairo)
CAIRO_LIB ?= $(shell pkg-config --libs cairo) CAIRO_LIB ?= $(shell pkg-config --libs cairo)
@@ -26,8 +29,8 @@ ZATHURA_INC ?= $(shell pkg-config --cflags zathura) @@ -34,8 +37,8 @@
PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura) PLUGINDIR = ${LIBDIR}/zathura
PLUGINDIR ?= ${PREFIX}/lib/zathura endif
-INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} -INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC}
-LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} -LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB}
+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} ${GTK_INC} +INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${GTK_LIB} +LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB}
# flags # compiler flags
CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
pkgs/applications/networking/testssl/default.nix
+5 -3
View File
@@ -1,7 +1,11 @@
{ stdenv, fetchFromGitHub, pkgs }: { stdenv, fetchFromGitHub, pkgs }:
stdenv.mkDerivation rec { let
version = "2.9.5-1"; version = "2.9.5-1";
pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
in stdenv.mkDerivation rec {
name = "testssl.sh-${version}"; name = "testssl.sh-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@@ -17,8 +21,6 @@ stdenv.mkDerivation rec {
patches = [ ./testssl.patch ]; patches = [ ./testssl.patch ];
pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
postPatch = '' postPatch = ''
sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \
-e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \
pkgs/development/haskell-modules/configuration-common.nix
+3
View File
@@ -1020,4 +1020,7 @@ self: super: {
# Jailbreak "unix-compat >=0.1.2 && <0.5". # Jailbreak "unix-compat >=0.1.2 && <0.5".
darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' darcs.cabal"; }); darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' darcs.cabal"; });
# https://github.com/Twinside/Juicy.Pixels/issues/149
JuicyPixels = dontHaddock super.JuicyPixels;
} }
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+45 -45
View File
@@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0 - ghcjs-base-0
default-package-overrides: default-package-overrides:
# LTS Haskell 10.1 # LTS Haskell 10.2
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-deque-tests ==0.3 - abstract-deque-tests ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
@@ -181,7 +181,7 @@ default-package-overrides:
- amazonka-xray ==1.5.0 - amazonka-xray ==1.5.0
- amqp ==0.18.1 - amqp ==0.18.1
- annotated-wl-pprint ==0.7.0 - annotated-wl-pprint ==0.7.0
- ansigraph ==0.3.0.4 - ansigraph ==0.3.0.5
- ansi-terminal ==0.7.1.1 - ansi-terminal ==0.7.1.1
- ansi-wl-pprint ==0.6.8.1 - ansi-wl-pprint ==0.6.8.1
- apecs ==0.2.4.7 - apecs ==0.2.4.7
@@ -352,7 +352,7 @@ default-package-overrides:
- cabal-file-th ==0.2.4 - cabal-file-th ==0.2.4
- cabal-rpm ==0.12 - cabal-rpm ==0.12
- cabal-toolkit ==0.0.4 - cabal-toolkit ==0.0.4
- cache ==0.1.0.0 - cache ==0.1.0.1
- cairo ==0.13.4.2 - cairo ==0.13.4.2
- calendar-recycling ==0.0 - calendar-recycling ==0.0
- call-stack ==0.1.0 - call-stack ==0.1.0
@@ -378,7 +378,7 @@ default-package-overrides:
- Chart ==1.8.2 - Chart ==1.8.2
- Chart-cairo ==1.8.2 - Chart-cairo ==1.8.2
- Chart-diagrams ==1.8.2 - Chart-diagrams ==1.8.2
- chart-unit ==0.5.4 - chart-unit ==0.5.5.0
- chaselev-deque ==0.5.0.5 - chaselev-deque ==0.5.0.5
- chatwork ==0.1.2.0 - chatwork ==0.1.2.0
- cheapskate ==0.1.1 - cheapskate ==0.1.1
@@ -449,7 +449,7 @@ default-package-overrides:
- conduit-algorithms ==0.0.6.1 - conduit-algorithms ==0.0.6.1
- conduit-combinators ==1.1.2 - conduit-combinators ==1.1.2
- conduit-connection ==0.1.0.3 - conduit-connection ==0.1.0.3
- conduit-extra ==1.2.3 - conduit-extra ==1.2.3.1
- conduit-iconv ==0.1.1.2 - conduit-iconv ==0.1.1.2
- conduit-parse ==0.1.2.2 - conduit-parse ==0.1.2.2
- conduit-throttle ==0.3.1.0 - conduit-throttle ==0.3.1.0
@@ -489,7 +489,7 @@ default-package-overrides:
- cryptocipher ==0.6.2 - cryptocipher ==0.6.2
- crypto-cipher-tests ==0.0.11 - crypto-cipher-tests ==0.0.11
- crypto-cipher-types ==0.0.9 - crypto-cipher-types ==0.0.9
- crypto-enigma ==0.0.2.9 - crypto-enigma ==0.0.2.10
- cryptohash ==0.11.9 - cryptohash ==0.11.9
- cryptohash-cryptoapi ==0.1.4 - cryptohash-cryptoapi ==0.1.4
- cryptohash-md5 ==0.11.100.1 - cryptohash-md5 ==0.11.100.1
@@ -560,7 +560,7 @@ default-package-overrides:
- DAV ==1.3.1 - DAV ==1.3.1
- dawg-ord ==0.5.1.0 - dawg-ord ==0.5.1.0
- dbcleaner ==0.1.3 - dbcleaner ==0.1.3
- dbus ==0.10.13 - dbus ==0.10.14
- debian-build ==0.10.1.0 - debian-build ==0.10.1.0
- debug ==0.0.2 - debug ==0.0.2
- Decimal ==0.4.2 - Decimal ==0.4.2
@@ -628,7 +628,7 @@ default-package-overrides:
- doctest-driver-gen ==0.1.0.1 - doctest-driver-gen ==0.1.0.1
- do-list ==1.0.1 - do-list ==1.0.1
- dom-parser ==3.0.0 - dom-parser ==3.0.0
- dotenv ==0.5.2.0 - dotenv ==0.5.2.1
- dotnet-timespan ==0.0.1.0 - dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.2.0 - double-conversion ==2.0.2.0
- download ==0.3.2.6 - download ==0.3.2.6
@@ -764,7 +764,7 @@ default-package-overrides:
- FloatingHex ==0.4 - FloatingHex ==0.4
- floatshow ==0.2.4 - floatshow ==0.2.4
- flow ==1.0.10 - flow ==1.0.10
- fmlist ==0.9 - fmlist ==0.9.1
- fmt ==0.5.0.0 - fmt ==0.5.0.0
- fn ==0.3.0.2 - fn ==0.3.0.2
- focus ==0.1.5.2 - focus ==0.1.5.2
@@ -799,7 +799,7 @@ default-package-overrides:
- funcmp ==1.8 - funcmp ==1.8
- functor-classes-compat ==1 - functor-classes-compat ==1
- fuzzcheck ==0.1.1 - fuzzcheck ==0.1.1
- fuzzyset ==0.1.0.2 - fuzzyset ==0.1.0.3
- gauge ==0.1.3 - gauge ==0.1.3
- gd ==3000.7.3 - gd ==3000.7.3
- gdax ==0.6.0.0 - gdax ==0.6.0.0
@@ -808,7 +808,7 @@ default-package-overrides:
- generic-aeson ==0.2.0.9 - generic-aeson ==0.2.0.9
- generic-arbitrary ==0.1.0 - generic-arbitrary ==0.1.0
- generic-deriving ==1.12 - generic-deriving ==1.12
- generic-lens ==0.5.0.0 - generic-lens ==0.5.1.0
- GenericPretty ==1.2.1 - GenericPretty ==1.2.1
- generic-random ==1.0.0.0 - generic-random ==1.0.0.0
- generics-eot ==0.2.1.1 - generics-eot ==0.2.1.1
@@ -1024,7 +1024,7 @@ default-package-overrides:
- hamlet ==1.2.0 - hamlet ==1.2.0
- HandsomeSoup ==0.4.2 - HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3 - handwriting ==0.1.0.3
- hapistrano ==0.3.5.0 - hapistrano ==0.3.5.1
- happstack-hsp ==7.3.7.3 - happstack-hsp ==7.3.7.3
- happstack-jmacro ==7.0.12 - happstack-jmacro ==7.0.12
- happstack-server ==7.5.0.1 - happstack-server ==7.5.0.1
@@ -1043,8 +1043,8 @@ default-package-overrides:
- haskell-gi-overloading ==1.0 - haskell-gi-overloading ==1.0
- haskell-import-graph ==1.0.3 - haskell-import-graph ==1.0.3
- haskell-lexer ==1.0.1 - haskell-lexer ==1.0.1
- haskell-lsp ==0.2.0.0 - haskell-lsp ==0.2.0.1
- haskell-lsp-client ==1.0.0.0 - haskell-lsp-client ==1.0.0.1
- haskell-names ==0.9.0 - haskell-names ==0.9.0
- haskell-neo4j-client ==0.3.2.4 - haskell-neo4j-client ==0.3.2.4
- HaskellNet ==0.5.1 - HaskellNet ==0.5.1
@@ -1106,7 +1106,7 @@ default-package-overrides:
- hfsevents ==0.1.6 - hfsevents ==0.1.6
- hid ==0.2.2 - hid ==0.2.2
- hidapi ==0.1.4 - hidapi ==0.1.4
- hidden-char ==0.1.0.1 - hidden-char ==0.1.0.2
- hierarchical-clustering ==0.4.6 - hierarchical-clustering ==0.4.6
- higher-leveldb ==0.4.0.1 - higher-leveldb ==0.4.0.1
- highjson ==0.4.0.0 - highjson ==0.4.0.0
@@ -1155,7 +1155,7 @@ default-package-overrides:
- hquantlib ==0.0.4.0 - hquantlib ==0.0.4.0
- hreader ==1.1.0 - hreader ==1.1.0
- hreader-lens ==0.1.3.0 - hreader-lens ==0.1.3.0
- hruby ==0.3.5 - hruby ==0.3.5.1
- hsass ==0.5.0 - hsass ==0.5.0
- hsb2hs ==0.3.1 - hsb2hs ==0.3.1
- hs-bibutils ==6.2.0.1 - hs-bibutils ==6.2.0.1
@@ -1281,13 +1281,13 @@ default-package-overrides:
- incremental-parser ==0.2.5.2 - incremental-parser ==0.2.5.2
- indentation-core ==0.0.0.1 - indentation-core ==0.0.0.1
- indentation-parsec ==0.0.0.1 - indentation-parsec ==0.0.0.1
- indents ==0.4.0.0 - indents ==0.4.0.1
- inflections ==0.4.0.0 - inflections ==0.4.0.0
- influxdb ==1.2.2.2 - influxdb ==1.2.2.2
- ini ==0.3.5 - ini ==0.3.5
- inline-c ==0.6.0.5 - inline-c ==0.6.0.5
- inline-c-cpp ==0.2.1.0 - inline-c-cpp ==0.2.1.0
- inline-java ==0.7.1 - inline-java ==0.7.2
- inline-r ==0.9.0.2 - inline-r ==0.9.0.2
- insert-ordered-containers ==0.2.1.0 - insert-ordered-containers ==0.2.1.0
- inspection-testing ==0.1.2 - inspection-testing ==0.1.2
@@ -1297,8 +1297,8 @@ default-package-overrides:
- intern ==0.9.1.4 - intern ==0.9.1.4
- interpolate ==0.1.1 - interpolate ==0.1.1
- interpolatedstring-perl6 ==1.0.0 - interpolatedstring-perl6 ==1.0.0
- Interpolation ==0.3.0
- interpolation ==0.1.0.2 - interpolation ==0.1.0.2
- Interpolation ==0.3.0
- IntervalMap ==0.5.3.1 - IntervalMap ==0.5.3.1
- intervals ==0.8.1 - intervals ==0.8.1
- intro ==0.3.0.1 - intro ==0.3.0.1
@@ -1338,7 +1338,7 @@ default-package-overrides:
- jmacro-rpc ==0.3.2 - jmacro-rpc ==0.3.2
- jmacro-rpc-happstack ==0.3.2 - jmacro-rpc-happstack ==0.3.2
- jmacro-rpc-snap ==0.3 - jmacro-rpc-snap ==0.3
- jni ==0.5.0 - jni ==0.5.1
- jose ==0.6.0.3 - jose ==0.6.0.3
- jose-jwt ==0.7.8 - jose-jwt ==0.7.8
- jsaddle ==0.9.4.0 - jsaddle ==0.9.4.0
@@ -1348,14 +1348,14 @@ default-package-overrides:
- json ==0.9.1 - json ==0.9.1
- json-autotype ==1.0.18 - json-autotype ==1.0.18
- json-builder ==0.3 - json-builder ==0.3
- json-rpc-generic ==0.2.1.2 - json-rpc-generic ==0.2.1.3
- json-schema ==0.7.4.1 - json-schema ==0.7.4.1
- json-stream ==0.4.1.5 - json-stream ==0.4.1.5
- JuicyPixels ==3.2.9.1 - JuicyPixels ==3.2.9.2
- JuicyPixels-extra ==0.2.2 - JuicyPixels-extra ==0.2.2
- JuicyPixels-scale-dct ==0.1.1.2 - JuicyPixels-scale-dct ==0.1.1.2
- justified-containers ==0.2.0.1 - justified-containers ==0.2.0.1
- jvm ==0.4.0.1 - jvm ==0.4.1
- jwt ==0.7.2 - jwt ==0.7.2
- kan-extensions ==5.0.2 - kan-extensions ==5.0.2
- kanji ==3.0.2 - kanji ==3.0.2
@@ -1493,7 +1493,7 @@ default-package-overrides:
- median-stream ==0.7.0.0 - median-stream ==0.7.0.0
- med-module ==0.1.1 - med-module ==0.1.1
- megaparsec ==6.3.0 - megaparsec ==6.3.0
- mega-sdist ==0.3.0.5 - mega-sdist ==0.3.0.6
- memory ==0.14.11 - memory ==0.14.11
- MemoTrie ==0.6.8 - MemoTrie ==0.6.8
- mercury-api ==0.1.0.1 - mercury-api ==0.1.0.1
@@ -1532,7 +1532,7 @@ default-package-overrides:
- mixed-types-num ==0.3.1.4 - mixed-types-num ==0.3.1.4
- mltool ==0.1.0.2 - mltool ==0.1.0.2
- mmap ==0.5.9 - mmap ==0.5.9
- mmark ==0.0.3.2 - mmark ==0.0.4.0
- mmark-ext ==0.0.1.1 - mmark-ext ==0.0.1.1
- mmorph ==1.1.0 - mmorph ==1.1.0
- mnist-idx ==0.1.2.8 - mnist-idx ==0.1.2.8
@@ -1575,12 +1575,12 @@ default-package-overrides:
- monad-time ==0.2 - monad-time ==0.2
- monad-unlift ==0.2.0 - monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.1 - monad-unlift-ref ==0.2.1
- mongoDB ==2.3.0 - mongoDB ==2.3.0.1
- monoidal-containers ==0.3.0.2 - monoidal-containers ==0.3.0.2
- monoid-extras ==0.4.2 - monoid-extras ==0.4.2
- monoid-subclasses ==0.4.4 - monoid-subclasses ==0.4.4
- monoid-transformer ==0.0.3 - monoid-transformer ==0.0.3
- mono-traversable ==1.0.6.0 - mono-traversable ==1.0.7.0
- mono-traversable-instances ==0.1.0.0 - mono-traversable-instances ==0.1.0.0
- morte ==1.6.13 - morte ==1.6.13
- mountpoints ==1.0.2 - mountpoints ==1.0.2
@@ -1663,8 +1663,8 @@ default-package-overrides:
- numbers ==3000.2.0.1 - numbers ==3000.2.0.1
- numeric-extras ==0.1 - numeric-extras ==0.1
- numeric-prelude ==0.4.2 - numeric-prelude ==0.4.2
- numhask ==0.1.3 - numhask ==0.1.4.0
- numhask-range ==0.1.2 - numhask-range ==0.1.3.0
- NumInstances ==1.4 - NumInstances ==1.4
- numtype-dk ==0.5.0.1 - numtype-dk ==0.5.0.1
- nvim-hs ==0.2.4 - nvim-hs ==0.2.4
@@ -1679,7 +1679,7 @@ default-package-overrides:
- old-locale ==1.0.0.7 - old-locale ==1.0.0.7
- old-time ==1.1.0.3 - old-time ==1.1.0.3
- once ==0.2 - once ==0.2
- one-liner ==0.9.1 - one-liner ==0.9.2
- OneTuple ==0.2.1 - OneTuple ==0.2.1
- online ==0.2.0 - online ==0.2.0
- Only ==0.1 - Only ==0.1
@@ -1710,8 +1710,8 @@ default-package-overrides:
- pagerduty ==0.0.8 - pagerduty ==0.0.8
- pagination ==0.2.1 - pagination ==0.2.1
- palette ==0.1.0.5 - palette ==0.1.0.5
- pandoc ==2.0.5 - pandoc ==2.0.6
- pandoc-citeproc ==0.12.2 - pandoc-citeproc ==0.12.2.2
- pandoc-types ==1.17.3 - pandoc-types ==1.17.3
- pango ==0.13.4.0 - pango ==0.13.4.0
- papillon ==0.1.0.5 - papillon ==0.1.0.5
@@ -1722,7 +1722,7 @@ default-package-overrides:
- parsec-numeric ==0.1.0.0 - parsec-numeric ==0.1.0.0
- ParsecTools ==0.0.2.0 - ParsecTools ==0.0.2.0
- parser-combinators ==0.2.1 - parser-combinators ==0.2.1
- parsers ==0.12.7 - parsers ==0.12.8
- partial-handler ==1.0.2 - partial-handler ==1.0.2
- partial-isomorphisms ==0.2.2.1 - partial-isomorphisms ==0.2.2.1
- partial-order ==0.1.2.1 - partial-order ==0.1.2.1
@@ -1842,7 +1842,7 @@ default-package-overrides:
- product-isomorphic ==0.0.3.1 - product-isomorphic ==0.0.3.1
- product-profunctors ==0.8.0.3 - product-profunctors ==0.8.0.3
- profiterole ==0.1 - profiterole ==0.1
- profiteur ==0.4.3.0 - profiteur ==0.4.4.0
- profunctor-extras ==4.0 - profunctor-extras ==4.0
- profunctors ==5.2.1 - profunctors ==5.2.1
- projectroot ==0.2.0.1 - projectroot ==0.2.0.1
@@ -1872,7 +1872,7 @@ default-package-overrides:
- pure-io ==0.2.1 - pure-io ==0.2.1
- pureMD5 ==2.1.3 - pureMD5 ==2.1.3
- purescript-bridge ==0.11.1.2 - purescript-bridge ==0.11.1.2
- pusher-http-haskell ==1.5.0.1 - pusher-http-haskell ==1.5.1.0
- pwstore-fast ==2.4.4 - pwstore-fast ==2.4.4
- qchas ==1.0.1.0 - qchas ==1.0.1.0
- qm-interpolated-string ==0.2.1.0 - qm-interpolated-string ==0.2.1.0
@@ -2244,7 +2244,7 @@ default-package-overrides:
- tasty-program ==1.0.5 - tasty-program ==1.0.5
- tasty-quickcheck ==0.9.1 - tasty-quickcheck ==0.9.1
- tasty-rerun ==1.1.8 - tasty-rerun ==1.1.8
- tasty-silver ==3.1.10 - tasty-silver ==3.1.11
- tasty-smallcheck ==0.8.1 - tasty-smallcheck ==0.8.1
- tasty-stats ==0.2.0.3 - tasty-stats ==0.2.0.3
- tasty-tap ==0.0.4 - tasty-tap ==0.0.4
@@ -2286,7 +2286,7 @@ default-package-overrides:
- text-printer ==0.5 - text-printer ==0.5
- text-region ==0.3.0.0 - text-region ==0.3.0.0
- text-short ==0.1.1 - text-short ==0.1.1
- text-show ==3.7 - text-show ==3.7.1
- text-show-instances ==3.6.2 - text-show-instances ==3.6.2
- text-zipper ==0.10.1 - text-zipper ==0.10.1
- tfp ==1.0.0.2 - tfp ==1.0.0.2
@@ -2295,7 +2295,7 @@ default-package-overrides:
- th-data-compat ==0.0.2.5 - th-data-compat ==0.0.2.5
- th-desugar ==1.7 - th-desugar ==1.7
- these ==0.7.4 - these ==0.7.4
- th-expand-syns ==0.4.3.0 - th-expand-syns ==0.4.4.0
- th-extras ==0.0.0.4 - th-extras ==0.0.0.4
- th-lift ==0.7.7 - th-lift ==0.7.7
- th-lift-instances ==0.1.11 - th-lift-instances ==0.1.11
@@ -2381,7 +2381,7 @@ default-package-overrides:
- type-level-kv-list ==1.1.0 - type-level-kv-list ==1.1.0
- type-level-numbers ==0.1.1.1 - type-level-numbers ==0.1.1.1
- typelits-witnesses ==0.2.3.0 - typelits-witnesses ==0.2.3.0
- type-of-html ==1.3.0.1 - type-of-html ==1.3.2.0
- type-operators ==0.1.0.4 - type-operators ==0.1.0.4
- type-spec ==0.3.0.1 - type-spec ==0.3.0.1
- typography-geometry ==1.0.0.1 - typography-geometry ==1.0.0.1
@@ -2408,7 +2408,7 @@ default-package-overrides:
- Unique ==0.4.7.1 - Unique ==0.4.7.1
- unique ==0 - unique ==0
- unit-constraint ==0.0.0 - unit-constraint ==0.0.0
- units-parser ==0.1.1 - units-parser ==0.1.1.2
- universe ==1.0 - universe ==1.0
- universe-base ==1.0.2.1 - universe-base ==1.0.2.1
- universe-instances-base ==1.0 - universe-instances-base ==1.0
@@ -2419,7 +2419,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3 - unix-bytestring ==0.3.7.3
- unix-compat ==0.5.0.1 - unix-compat ==0.5.0.1
- unix-time ==0.3.7 - unix-time ==0.3.7
- unliftio ==0.2.1.0 - unliftio ==0.2.2.0
- unliftio-core ==0.1.0.0 - unliftio-core ==0.1.0.0
- unlit ==0.4.0.0 - unlit ==0.4.0.0
- unordered-containers ==0.2.8.0 - unordered-containers ==0.2.8.0
@@ -2491,7 +2491,7 @@ default-package-overrides:
- wai-eventsource ==3.0.0 - wai-eventsource ==3.0.0
- wai-extra ==3.0.21.0 - wai-extra ==3.0.21.0
- wai-handler-launch ==3.0.2.3 - wai-handler-launch ==3.0.2.3
- wai-logger ==2.3.0 - wai-logger ==2.3.1
- wai-middleware-auth ==0.1.2.1 - wai-middleware-auth ==0.1.2.1
- wai-middleware-caching ==0.1.0.2 - wai-middleware-caching ==0.1.0.2
- wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-lru ==0.1.0.0
@@ -2530,7 +2530,7 @@ default-package-overrides:
- websockets-rpc ==0.6.0 - websockets-rpc ==0.6.0
- websockets-simple ==0.0.6.3 - websockets-simple ==0.0.6.3
- websockets-snap ==0.10.2.4 - websockets-snap ==0.10.2.4
- weeder ==0.1.9 - weeder ==0.1.11
- weigh ==0.0.7 - weigh ==0.0.7
- wide-word ==0.1.0.5 - wide-word ==0.1.0.5
- wikicfp-scraper ==0.1.0.9 - wikicfp-scraper ==0.1.0.9
@@ -2603,7 +2603,7 @@ default-package-overrides:
- xturtle ==0.2.0.0 - xturtle ==0.2.0.0
- xxhash ==0.0.2 - xxhash ==0.0.2
- xxhash-ffi ==0.2.0.0 - xxhash-ffi ==0.2.0.0
- yaml ==0.8.25 - yaml ==0.8.25.1
- Yampa ==0.10.7 - Yampa ==0.10.7
- YampaSynth ==0.2 - YampaSynth ==0.2
- yeshql ==3.0.1.3 - yeshql ==3.0.1.3
@@ -2630,7 +2630,7 @@ default-package-overrides:
- yesod-static ==1.5.3.1 - yesod-static ==1.5.3.1
- yesod-static-angular ==0.1.8 - yesod-static-angular ==0.1.8
- yesod-table ==2.0.3 - yesod-table ==2.0.3
- yesod-test ==1.5.8 - yesod-test ==1.5.9.1
- yesod-websockets ==0.2.6 - yesod-websockets ==0.2.6
- yes-precure5-command ==5.5.3 - yes-precure5-command ==5.5.3
- yi-core ==0.17.1 - yi-core ==0.17.1
pkgs/development/haskell-modules/hackage-packages.nix
+327 -1037
View File
File diff suppressed because it is too large Load Diff
pkgs/development/ocaml-modules/dtoa/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder, ounit }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
stdenv.mkDerivation rec {
pname = "dtoa";
name = "ocaml-${pname}-${version}";
version = "0.3.1";
src = fetchurl {
url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn";
};
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib jbuilder ounit ];
buildPhase = "jbuilder build -p dtoa";
inherit (jbuilder) installPhase;
createFindLibDestdir = true;
meta = with stdenv.lib; {
homepage = https://github.com/flowtype/ocaml-dtoa;
description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm.";
license = licenses.mit;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.eqyiel ];
};
}
pkgs/development/ocaml-modules/wtf8/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
stdenv.mkDerivation rec {
pname = "wtf8";
name = "ocaml-${pname}-${version}";
version = "1.0.1";
src = fetchurl {
url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
};
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib jbuilder ];
buildPhase = "jbuilder build -p wtf8";
inherit (jbuilder) installPhase;
createFindLibDestdir = true;
meta = with stdenv.lib; {
homepage = https://github.com/flowtype/ocaml-wtf8;
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
license = licenses.mit;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.eqyiel ];
};
}
pkgs/development/tools/analysis/flow/default.nix
+7 -5
View File
@@ -1,16 +1,17 @@
{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt }: { stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices,
findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt, wtf8, dtoa }:
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.61.0"; version = "0.62.0";
name = "flow-${version}"; name = "flow-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "flow"; repo = "flow";
rev = "v${version}"; rev = "v${version}";
sha256 = "0742hcg97gw6zsvm5j30rfyj71n71pfag3vcmjdh7yamn8gpn8ga"; sha256 = "03la72wgsh7s063h2l171h74c84haqsinnnk8fwifq3id0gq6xk1";
}; };
installPhase = '' installPhase = ''
@@ -18,8 +19,9 @@ stdenv.mkDerivation rec {
cp bin/flow $out/bin/ cp bin/flow $out/bin/
''; '';
buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt ] buildInputs = [
++ optionals stdenv.isDarwin [ cf-private CoreServices ]; ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt wtf8 dtoa
] ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A static type checker for JavaScript"; description = "A static type checker for JavaScript";
pkgs/os-specific/linux/lxcfs/default.nix
+8 -3
View File
@@ -1,19 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam
, enableDebugBuild ? false }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxcfs-2.0.7"; name = "lxcfs-2.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxc"; owner = "lxc";
repo = "lxcfs"; repo = "lxcfs";
rev = name; rev = name;
sha256 = "1z6d52dc12rcplgc9jdgi3lbxm6ahlsjgs1k8v8kvn261xsq1m0a"; sha256 = "04dzn6snqgw0znf7a7qdm64400jirip6q8amcx5fmz4705qdqahc";
}; };
nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
buildInputs = [ fuse pam ]; buildInputs = [ fuse pam ];
preConfigure = stdenv.lib.optionalString enableDebugBuild ''
sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am
'';
configureFlags = [ configureFlags = [
"--with-init-script=systemd" "--with-init-script=systemd"
"--sysconfdir=/etc" "--sysconfdir=/etc"
pkgs/top-level/all-packages.nix
+5 -2
View File
@@ -3288,7 +3288,9 @@ with pkgs;
ltris = callPackage ../games/ltris { }; ltris = callPackage ../games/ltris { };
lxc = callPackage ../os-specific/linux/lxc { }; lxc = callPackage ../os-specific/linux/lxc { };
lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxcfs = callPackage ../os-specific/linux/lxcfs {
enableDebugBuild = config.lxcfs.enableDebugBuild or false;
};
lxd = callPackage ../tools/admin/lxd { }; lxd = callPackage ../tools/admin/lxd { };
lzfse = callPackage ../tools/compression/lzfse { }; lzfse = callPackage ../tools/compression/lzfse { };
@@ -7406,7 +7408,8 @@ with pkgs;
flow = callPackage ../development/tools/analysis/flow { flow = callPackage ../development/tools/analysis/flow {
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt; inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt
wtf8 dtoa;
}; };
framac = callPackage ../development/tools/analysis/frama-c { }; framac = callPackage ../development/tools/analysis/frama-c { };
pkgs/top-level/ocaml-packages.nix
+4
View File
@@ -208,6 +208,8 @@ let
dolog = callPackage ../development/ocaml-modules/dolog { }; dolog = callPackage ../development/ocaml-modules/dolog { };
dtoa = callPackage ../development/ocaml-modules/dtoa { };
easy-format = callPackage ../development/ocaml-modules/easy-format { }; easy-format = callPackage ../development/ocaml-modules/easy-format { };
eff = callPackage ../development/interpreters/eff { }; eff = callPackage ../development/interpreters/eff { };
@@ -679,6 +681,8 @@ let
wasm = callPackage ../development/ocaml-modules/wasm { }; wasm = callPackage ../development/ocaml-modules/wasm { };
wtf8 = callPackage ../development/ocaml-modules/wtf8 { };
x509 = callPackage ../development/ocaml-modules/x509 { }; x509 = callPackage ../development/ocaml-modules/x509 { };
xmlm = callPackage ../development/ocaml-modules/xmlm { }; xmlm = callPackage ../development/ocaml-modules/xmlm { };