diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2019-11-09 21:44:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-09 21:44:04 +0000 |
commit | 05cd6911732164ae23279030e8c15803852f7e91 (patch) | |
tree | 27b367a869575c6daa2535b5c63774f2535b19d0 | |
parent | f80a56fafc83ea3daaf5257804f02cebc5ada8ae (diff) | |
parent | 60fade5c034f878765ff66aaa90113daea4d0c81 (diff) | |
download | nixlib-05cd6911732164ae23279030e8c15803852f7e91.tar nixlib-05cd6911732164ae23279030e8c15803852f7e91.tar.gz nixlib-05cd6911732164ae23279030e8c15803852f7e91.tar.bz2 nixlib-05cd6911732164ae23279030e8c15803852f7e91.tar.lz nixlib-05cd6911732164ae23279030e8c15803852f7e91.tar.xz nixlib-05cd6911732164ae23279030e8c15803852f7e91.tar.zst nixlib-05cd6911732164ae23279030e8c15803852f7e91.zip |
Merge pull request #73126 from cko/remove_sablotron
sablotron: remove
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/xml/sablotron/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a459302177b9..2f220fa2fb60 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -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 diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 4739d5265584..be87a8bb6721 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -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 diff --git a/pkgs/tools/text/xml/sablotron/default.nix b/pkgs/tools/text/xml/sablotron/default.nix deleted file mode 100644 index 131bf3ae68c1..000000000000 --- a/pkgs/tools/text/xml/sablotron/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 781d206b0656..a5cb6ed6e103 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |