Merge staging-next into staging
This commit is contained in:
commit
042a01efbf
@ -12,7 +12,7 @@ let
|
||||
expected = lib.sort lib.lessThan y;
|
||||
};
|
||||
in with lib.systems.doubles; lib.runTests {
|
||||
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ windows);
|
||||
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows);
|
||||
|
||||
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
|
||||
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ];
|
||||
|
@ -1,11 +1,27 @@
|
||||
{ stdenv, fetchgit, meson, ninja, pkgconfig
|
||||
, python3, gtk3, gst_all_1, libsecret, libsoup
|
||||
, appstream-glib, desktop-file-utils, totem-pl-parser
|
||||
, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
|
||||
{ lib
|
||||
, fetchgit
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, python3
|
||||
, gtk3
|
||||
, gst_all_1
|
||||
, libsecret
|
||||
, libsoup
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, totem-pl-parser
|
||||
, hicolor-icon-theme
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
, lastFMSupport ? true
|
||||
, wikipediaSupport ? true
|
||||
, youtubeSupport ? true, youtube-dl
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lollypop";
|
||||
version = "1.0.5";
|
||||
version = "1.0.7";
|
||||
|
||||
format = "other";
|
||||
doCheck = false;
|
||||
@ -14,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
url = "https://gitlab.gnome.org/World/lollypop";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1p6glzvbbha3cvq462ymbn1q58skclfk469kk28cr1hlsf5x2pry";
|
||||
sha256 = "0gdds4qssn32axsa5janqny5i4426azj5wyj6bzn026zs3z38svn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -37,10 +53,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
gstreamer
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
libsecret
|
||||
libsoup
|
||||
totem-pl-parser
|
||||
];
|
||||
] ++ lib.optional lastFMSupport libsecret;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
beautifulsoup4
|
||||
@ -49,8 +64,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pycairo
|
||||
pydbus
|
||||
pygobject3
|
||||
pylast
|
||||
];
|
||||
]
|
||||
++ lib.optional lastFMSupport pylast
|
||||
++ lib.optional wikipediaSupport wikipedia
|
||||
++ lib.optional youtubeSupport youtube-dl
|
||||
;
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py
|
||||
@ -62,7 +80,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
patchPythonScript "$out/libexec/lollypop-sp"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A modern music player for GNOME";
|
||||
homepage = https://wiki.gnome.org/Apps/Lollypop;
|
||||
license = licenses.gpl3Plus;
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
name = "hugo-${version}";
|
||||
version = "0.55.3";
|
||||
version = "0.55.4";
|
||||
|
||||
goPackagePath = "github.com/gohugoio/hugo";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hpyaxfjgfm04fcw3qha2rdx93fr326mw5aiw95vnj5i0x1xbs3x";
|
||||
sha256 = "0hbkl8dhhdic0admrkvlp1h1bmfrrwfnvipx27clyk0f88jcvb7y";
|
||||
};
|
||||
|
||||
modSha256 = "0yrwkaaasj9ihjjfbywnzkppix1y2znagg3dkyikk21sl5n0nz23";
|
||||
|
@ -306,9 +306,9 @@ stdenv.mkDerivation {
|
||||
# Always add -march based on cpu in triple. Sometimes there is a
|
||||
# discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
|
||||
# that case.
|
||||
+ optionalString ((targetPlatform ? platform.gcc.arch || targetPlatform.parsed.cpu ? arch) &&
|
||||
isGccArchSupported targetPlatform.platform.gcc.arch or targetPlatform.parsed.cpu.arch) ''
|
||||
echo "-march=${targetPlatform.platform.gcc.arch or targetPlatform.parsed.cpu.arch}" >> $out/nix-support/cc-cflags-before
|
||||
+ optionalString ((targetPlatform ? platform.gcc.arch) &&
|
||||
isGccArchSupported targetPlatform.platform.gcc.arch) ''
|
||||
echo "-march=${targetPlatform.platform.gcc.arch}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
|
||||
# -mcpu is not very useful. You should use mtune and march
|
||||
@ -320,8 +320,8 @@ stdenv.mkDerivation {
|
||||
# -mfloat-abi only matters on arm32 but we set it here
|
||||
# unconditionally just in case. If the abi specifically sets hard
|
||||
# vs. soft floats we use it here.
|
||||
+ optionalString (targetPlatform ? platform.gcc.float-abi || targetPlatform.parsed.abi ? float) ''
|
||||
echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi or targetPlatform.parsed.abi.float}" >> $out/nix-support/cc-cflags-before
|
||||
+ optionalString (targetPlatform ? platform.gcc.float-abi) ''
|
||||
echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before
|
||||
''
|
||||
+ optionalString (targetPlatform ? platform.gcc.fpu) ''
|
||||
echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
|
||||
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
|
||||
, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
|
||||
, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
|
||||
, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
|
||||
, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
|
||||
@ -10,7 +10,7 @@
|
||||
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
|
||||
|
||||
let
|
||||
pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
|
||||
pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] );
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gnome-shell-${version}";
|
||||
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
|
||||
sassc desktop-file-utils libxslt.bin
|
||||
sassc desktop-file-utils libxslt.bin python3
|
||||
];
|
||||
buildInputs = [
|
||||
systemd caribou
|
||||
|
28
pkgs/development/compilers/pforth/default.nix
Normal file
28
pkgs/development/compilers/pforth/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "28";
|
||||
pname = "pforth";
|
||||
src = fetchFromGitHub {
|
||||
owner = "philburk";
|
||||
repo = "pforth";
|
||||
rev = "9190005e32c6151b76ac707b30eeb4d5d9dd1d36";
|
||||
sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x";
|
||||
};
|
||||
|
||||
makeFlags = [ "SRCDIR=." ];
|
||||
makefile = "build/unix/Makefile";
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 pforth_standalone $out/bin/pforth
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "Portable ANSI style Forth written in ANSI C";
|
||||
homepage = http://www.softsynth.com/pforth/;
|
||||
license = stdenv.lib.licenses.publicDomain;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ yrashk ];
|
||||
};
|
||||
}
|
@ -31,7 +31,8 @@ buildPythonPackage rec {
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "regex==" "regex>=" \
|
||||
--replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
|
||||
--replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
|
||||
--replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
37
pkgs/development/python-modules/wikipedia/default.nix
Normal file
37
pkgs/development/python-modules/wikipedia/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, beautifulsoup4
|
||||
, requests
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wikipedia";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "db0fad1829fdd441b1852306e9856398204dc0786d2996dd2e0c8bb8e26133b2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
requests
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${python.interpreter} -m unittest discover tests/ '*test.py'
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wikipedia API for Python";
|
||||
homepage = https://github.com/goldsmith/Wikipedia;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.worldofpeace ];
|
||||
};
|
||||
}
|
@ -230,6 +230,7 @@ in rec {
|
||||
|
||||
vim-tmux-navigator = mkDerivation {
|
||||
pluginName = "vim-tmux-navigator";
|
||||
rtpFilePath = "vim-tmux-navigator.tmux";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/christoomey/vim-tmux-navigator";
|
||||
rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42";
|
||||
|
@ -1,17 +1,26 @@
|
||||
{ stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:
|
||||
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.20.2019.03.13";
|
||||
modDirVersion = "4.20.0";
|
||||
version = "5.0.2019.04.04";
|
||||
modDirVersion = "5.0.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://evilpiepirate.org/git/bcachefs.git";
|
||||
rev = "986543d24e08a0c0308472403b230d546e7ecbbb";
|
||||
sha256 = "07h9l47wijhlx3xnyxnj8kv1zb9yf2x0gag8n606yq6wn9r523hv";
|
||||
rev = "d83b992f653d9f742f3f8567dbcfd1f4f72e858f";
|
||||
sha256 = "17xipjhkl4arshyj3riwq4pgl2qqcnlfhaga77a430wy22s7plh2";
|
||||
};
|
||||
|
||||
extraConfig = "BCACHEFS_FS m";
|
||||
|
||||
kernelPatches = [
|
||||
{ name = "export-bio_iov_iter_get_pages";
|
||||
patch = fetchpatch {
|
||||
name = "export-bio_iov_iter_get_pages.patch";
|
||||
url = "https://evilpiepirate.org/git/bcachefs.git/patch/?id=bd8be01aa04eb9cc33fcdce89ac6e0fac0ae0fcf";
|
||||
sha256 = "0h5z98krx8077wwhiqp3bwc1h4nwnifxsn8mpxr2lcxnqmky3hz0";
|
||||
}; }
|
||||
];
|
||||
|
||||
extraMeta = {
|
||||
branch = "master";
|
||||
hydraPlatforms = []; # Should the testing kernels ever be built on Hydra?
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
hardeningDisable = [ "format" "pic" "relro" "pie" ];
|
||||
|
||||
configureFlags = [ "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}cc" ];
|
||||
nativeBuildInputs = [ buildPackages.stdenv.cc ];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -1,22 +1,22 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, kernel
|
||||
, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb
|
||||
, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sysdig-${version}";
|
||||
version = "0.24.2";
|
||||
version = "0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "draios";
|
||||
repo = "sysdig";
|
||||
rev = version;
|
||||
sha256 = "16gz6gcp0zfhrqldw9cms38w0x5h3qhlx64dayqgsqbkw914b31a";
|
||||
sha256 = "1591jz4fmgk5r3q410h771nzhv6wfqpnr7pn34kpc5rl0vhky37m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [
|
||||
zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb
|
||||
zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc
|
||||
] ++ optional (kernel != null) kernel.moduleBuildDependencies;
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
@ -1,17 +1,16 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
let version = "2.4.1"; in
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "dex-${version}";
|
||||
pname = "dex";
|
||||
version = "2.16.0";
|
||||
|
||||
goPackagePath = "github.com/coreos/dex";
|
||||
goPackagePath = "github.com/dexidp/dex";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "coreos";
|
||||
repo = "dex";
|
||||
sha256 = "11qpn3wh74mq16xgl9l50n2v02ffqcd14xccf77j5il04xr764nx";
|
||||
owner = "dexidp";
|
||||
repo = pname;
|
||||
sha256 = "0w8nl7inqp4grbaq320dgynmznbrln8vihd799dwb2cx86laxsi1";
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
@ -22,10 +21,15 @@ buildGoPackage rec {
|
||||
"-ldflags=-w -X ${goPackagePath}/version.Version=${src.rev}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -r go/src/${goPackagePath}/web $out/share/web
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "OpenID Connect and OAuth2 identity provider with pluggable connectors";
|
||||
license = lib.licenses.asl20;
|
||||
homepage = https://github.com/coreos/dex;
|
||||
homepage = https://github.com/dexidp/dex;
|
||||
maintainers = with lib.maintainers; [benley];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
@ -4,13 +4,13 @@
|
||||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2019-04-25";
|
||||
version = "2019-04-26";
|
||||
name = "oh-my-zsh-${version}";
|
||||
rev = "adade64cda7af2bb2f23b95a57f91f7010aa0cb8";
|
||||
rev = "f5b2d9c7ce8ced5a4ec67a4ecfa877e6951124ef";
|
||||
|
||||
src = fetchgit { inherit rev;
|
||||
url = "https://github.com/robbyrussell/oh-my-zsh";
|
||||
sha256 = "056rzpg6prfjnj3i7sqdkd7hwh8b2fdbmcsr0p49mb4zhflfxxaw";
|
||||
sha256 = "17d837kyw16g91cnmdpdvhl2sgi3cb7fzligwwzjyp0y7kbiy3n4";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
@ -3,12 +3,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcachefs-tools";
|
||||
version = "2019-03-13";
|
||||
version = "2019-04-04";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
|
||||
rev = "0894d547501fb9306ae7b1c669b66a7b49fb2205";
|
||||
sha256 = "1vwzwag413kzlij2f1hw1b8g592m40dr03zwkc8k5snbl4daiwr6";
|
||||
rev = "d13bbb2955f899f10be4ab315ad229d2951fdcda";
|
||||
sha256 = "0cjy12qjd572sbg8h4i18fn001p6a6ahc4ljwids58nv83q99ll3";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -1,7 +1,7 @@
|
||||
#Adapted from
|
||||
#https://github.com/rycee/home-manager/blob/9c1b3735b402346533449efc741f191d6ef578dd/home-manager/default.nix
|
||||
#https://github.com/rycee/home-manager/blob/2c07829be2bcae55e04997b19719ff902a44016d/home-manager/default.nix
|
||||
|
||||
{ bash, coreutils, less, stdenv, makeWrapper, fetchFromGitHub }:
|
||||
{ bash, coreutils, findutils, gnused, less, stdenv, makeWrapper, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace $out/bin/home-manager \
|
||||
--subst-var-by bash "${bash}" \
|
||||
--subst-var-by coreutils "${coreutils}" \
|
||||
--subst-var-by findutils "${findutils}" \
|
||||
--subst-var-by gnused "${gnused}" \
|
||||
--subst-var-by less "${less}" \
|
||||
--subst-var-by HOME_MANAGER_PATH '${src}'
|
||||
'';
|
||||
|
35
pkgs/tools/system/ledmon/default.nix
Normal file
35
pkgs/tools/system/ledmon/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ stdenv, fetchFromGitHub, perl, udev, sg3_utils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ledmon";
|
||||
version = "0.92";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "ledmon";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lz59606vf2sws5xwijxyffm8kxcf8p9qbdpczsq1b5mm3dk6lvp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl # for pod2man
|
||||
];
|
||||
buildInputs = [ udev sg3_utils ];
|
||||
|
||||
installTargets = [ "install" "install-systemd" ];
|
||||
|
||||
makeFlags = [
|
||||
"MAN_INSTDIR=${placeholder "out"}/share/man"
|
||||
"SYSTEMD_SERVICE_INSTDIR=${placeholder "out"}/lib/systemd/system"
|
||||
"LEDCTL_INSTDIR=${placeholder "out"}/sbin"
|
||||
"LEDMON_INSTDIR=${placeholder "out"}/sbin"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/intel/ledmon;
|
||||
description = "Enclosure LED Utilities";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl2 ];
|
||||
maintainers = with stdenv.lib.maintainers; [ sorki ];
|
||||
};
|
||||
}
|
41
pkgs/tools/text/epubcheck/default.nix
Normal file
41
pkgs/tools/text/epubcheck/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ stdenv, fetchzip
|
||||
, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epubcheck";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
|
||||
sha256 = "1bf5jbzqvgpvhbkprynxj75ilk3r6zld157vjf6k7l5g21cwyn9d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp -r lib/* $out/lib
|
||||
|
||||
mkdir -p $out/libexec/epubcheck
|
||||
cp epubcheck.jar $out/libexec/epubcheck
|
||||
|
||||
classpath=$out/libexec/epubcheck/epubcheck.jar
|
||||
for jar in $out/lib/*.jar; do
|
||||
classpath="$classpath:$jar"
|
||||
done
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${jre}/bin/java $out/bin/epubcheck \
|
||||
--add-flags "-classpath $classpath com.adobe.epubcheck.tool.Checker"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/w3c/epubcheck;
|
||||
description = "Validation tool for EPUB";
|
||||
license = with licenses; [ asl20 bsd3 mpl10 w3c ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ eadwu ];
|
||||
};
|
||||
}
|
@ -2561,6 +2561,8 @@ in
|
||||
|
||||
eid-mw = callPackage ../tools/security/eid-mw { };
|
||||
|
||||
epubcheck = callPackage ../tools/text/epubcheck { };
|
||||
|
||||
mcrcon = callPackage ../tools/networking/mcrcon {};
|
||||
|
||||
s-tar = callPackage ../tools/archivers/s-tar {};
|
||||
@ -4130,6 +4132,8 @@ in
|
||||
|
||||
leatherman = callPackage ../development/libraries/leatherman { };
|
||||
|
||||
ledmon = callPackage ../tools/system/ledmon { };
|
||||
|
||||
leela = callPackage ../tools/graphics/leela { };
|
||||
|
||||
lftp = callPackage ../tools/networking/lftp { };
|
||||
@ -7755,6 +7759,8 @@ in
|
||||
inherit (ocaml-ng.ocamlPackages_4_05) ocaml;
|
||||
};
|
||||
|
||||
pforth = callPackage ../development/compilers/pforth {};
|
||||
|
||||
picat = callPackage ../development/compilers/picat {
|
||||
stdenv = overrideCC stdenv gcc49;
|
||||
};
|
||||
|
@ -4434,6 +4434,8 @@ in {
|
||||
|
||||
wordfreq = callPackage ../development/python-modules/wordfreq { };
|
||||
|
||||
wikipedia = callPackage ../development/python-modules/wikipedia { };
|
||||
|
||||
magic-wormhole = callPackage ../development/python-modules/magic-wormhole { };
|
||||
|
||||
magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { };
|
||||
|
Loading…
Reference in New Issue
Block a user