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

Merge pull request #73126 from cko/remove_sablotron

Browse Source 
sablotron: remove
This commit is contained in:
Michael Raskin 2019-11-09 21:44:04 +00:00 committed by GitHub
commit 05cd691173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
@ -363,7 +363,7 @@ in stdenv.mkDerivation rec {
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib libmysqlclient
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib
python3 sane-backends unzip vigra which zip zlib
mdds bluez5 libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
@ -360,7 +360,7 @@ in stdenv.mkDerivation rec {
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib libmysqlclient
neon nspr nss openldap openssl ORBit2 pam perl poppler
python3 sablotron sane-backends unzip vigra which zip zlib
python3 sane-backends unzip vigra which zip zlib
mdds bluez5 libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy

14
pkgs/tools/text/xml/sablotron/default.nix
View File

@ -1,14 +0,0 @@
{stdenv, fetchurl, expat} :
stdenv.mkDerivation {
name = "sablotron-1.0.3";
src = fetchurl {
url = "mirror://sourceforge/project/sablotron/sablotron-1.0.3/Sablot-1.0.3.tar.gz";
sha256 = "0qpk3dlfp3bn2hbq0fzx1bzifv8cgqb9aicn59d303cdlynkgix0";
};
buildInputs = [expat];
meta = {
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -6105,8 +6105,6 @@ in
s6-portable-utils = skawarePackages.s6-portable-utils;
sablotron = callPackage ../tools/text/xml/sablotron { };
safecopy = callPackage ../tools/system/safecopy { };
safe-rm = callPackage ../tools/system/safe-rm { };