diff options
-rw-r--r-- | pkgs/applications/audio/i-score/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/sooperlooper/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/misc/wikicurses/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/vacuum/default.nix | 5 | ||||
-rw-r--r-- | pkgs/data/fonts/baekmuk-ttf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/fonts/gdouros/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/uksmtools/default.nix | 27 | ||||
-rw-r--r-- | pkgs/tools/package-management/opkg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/hevea/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 1 |
11 files changed, 43 insertions, 44 deletions
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix index 97e8f5f1429b..e3ebc5fde08e 100644 --- a/pkgs/applications/audio/i-score/default.nix +++ b/pkgs/applications/audio/i-score/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/OSSIA/i-score.git"; rev = "ede2453b139346ae46702b5e2643c5488f8c89fb"; - sha256 = "0mk0zsqhx9z7ry1amjki89h6yp5ysi1qgy2j3kzhrm5sfazvf0x3"; + sha256 = "0cl9vdmxkshdacgpp7s2rg40b7xbsjrzw916jds9i3rpq1pcy5pj"; leaveDotGit = true; deepClone = true; }; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index a11f37a6d528..e4d9541673a6 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchFromGitHub , liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx - ,libsamplerate, rubberband, pkgconfig, autoconf, automake, libtool, gettext, ncurses, which +{ stdenv, fetchFromGitHub, liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx +, libsamplerate, rubberband, pkgconfig, libtool, gettext, ncurses, which +, autoreconfHook }: stdenv.mkDerivation rec { name = "sooperlooper-git-${version}"; - version = "19-07-2016"; + version = "2016-07-19"; src = fetchFromGitHub { owner = "essej"; @@ -13,9 +14,16 @@ stdenv.mkDerivation rec { sha256 = "0qz25h4idv79m97ici2kzx72fwzks3lysyksk3p3rx72lsijhf3g"; }; + autoreconfPhase = '' + patchShebangs ./autogen.sh + ./autogen.sh + ''; + + nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ]; + buildInputs = [ liblo libxml2 libjack2 libsndfile wxGTK libsigcxx - libsamplerate rubberband pkgconfig autoconf automake libtool gettext ncurses which + libsamplerate rubberband gettext ncurses ]; meta = { diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index 54e56785071d..2b11ccf58379 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -9,6 +9,16 @@ pythonPackages.buildPythonApplication rec { sha256 = "1yxgafk1sczg1xi2p6nhrvr3hchp7ydw98n48lp3qzwnryn1kxv8"; }; + patches = [ + # This is necessary to build without a config file. + # It can be safely removed after updating to wikicurses to 1.4 + # or when commit 4b944ac339312b642c6dc5d6b5a2f7be7503218f is included + (fetchurl { + url = "https://github.com/ids1024/wikicurses/commit/4b944ac339312b642c6dc5d6b5a2f7be7503218f.patch"; + sha256 = "0ii4b0c4hb1zdhcpp4ij908mfy5b8khpm1l7xr7lp314lfhsg9as"; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 2b5ce5f4142c..0572e3f9e2e9 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { qt4 openssl xproto libX11 libXScrnSaver scrnsaverproto xz zlib ]; + # hack: needed to fix build issues in + # http://hydra.nixos.org/build/38322959/nixlog/1 + # should be an upstream issue but it's easy to fix + NIX_LDFLAGS = "-lz"; + nativeBuildInputs = [ qmake4Hook ]; preConfigure = '' diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index d44517247ddd..93c4a55d49eb 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "baekmuk-ttf-2.2"; src = fetchurl { - url = "http://kldp.net/frs/download.php/1429/${name}.tar.gz"; + url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; sha256 = "08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882"; }; diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index 35c53659c6e6..28bea4c2c8bd 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, unzip, lib }: let fonts = { - aegean = { version = "8.00"; file = "Aegean.zip"; sha256 = "0jhj4i0262f4zbm979fm01rnvc91a00kwkbcgvzs281256g2ciny"; - description = "Scripts and symbols of the Aegean world"; }; - textfonts = { version = "6.00"; file = "Textfonts.zip"; sha256 = "06igp3hdql0yfaj9h2ahh5n7yvj2ni7rj2jdmz534f9618l8qi6r"; - description = "Fonts based on early Greek editions"; }; symbola = { version = "9.00"; file = "Symbola.zip"; sha256 = "0d9zrlvzh8inhr17p99banr0dmrvkwxbk3q7zhqqx2z4gf2yavc5"; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; aegyptus = { version = "6.00"; file = "Aegyptus.zip"; sha256 = "10mr54ja9b169fhqfkrw510jybghrpjx7a8a7m38k5v39ck8wz6v"; @@ -21,6 +17,14 @@ let description = "Musical Notation"; }; analecta = { version = "5.00"; file = "Analecta.zip"; sha256 = "0rphylnz42fqm1zpx5jx60k294kax3sid8r2hx3cbxfdf8fnpb1f"; description = "Coptic, Gothic, Deseret"; }; + # the following are also available from http://users.teilar.gr/~g1951d/ + # but not yet packaged: + # - Aroania + # - Anaktoria + # - Alexander + # - Avdira + # - Asea + # - Aegean }; mkpkg = name_: {version, file, sha256, description}: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/uksmtools/default.nix b/pkgs/os-specific/linux/uksmtools/default.nix deleted file mode 100644 index 4efc2d42f2be..000000000000 --- a/pkgs/os-specific/linux/uksmtools/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchgit, cmake }: - -stdenv.mkDerivation rec { - name = "uksmtools-${version}"; - version = "2015-09-25"; - - # This project uses git submodules, which fetchFromGitHub doesn't support: - src = fetchgit { - sha256 = "1nj53f24qjp0d87fzrz0y72rmv6lhxyiaqrsbd9v423h5zpmkrnj"; - rev = "9f59a3a0b494b758aa91d7d8fa04e21b5e6463c0"; - url = "https://github.com/pfactum/uksmtools.git"; - }; - - nativeBuildInputs = [ cmake ]; - - enableParallelBuilding = true; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Tools to control Linux UKSM (Ultra Kernel Same-page Merging)"; - homepage = https://github.com/pfactum/uksmtools/; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; - }; -} diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index d89d4c58af35..059f63495d1c 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl +{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pw7igmb4miyxl11sj9g8p8pgxg9nmn1h2hzi8b23v44hcmc1inj"; }; - buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl + buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl libxml2 autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index f3ef746fedfc..0e87ef5dacc1 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "hevea-2.28"; + name = "hevea-2.29"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "14fns13wlnpiv9i05841kvi3cq4b9v2sw5x3ff6ziws28q701qnd"; + sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed0e7b7a036..7d0ba0533e9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11758,8 +11758,6 @@ in udisks_glue = callPackage ../os-specific/linux/udisks-glue { }; - uksmtools = callPackage ../os-specific/linux/uksmtools { }; - untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { }; @@ -12110,7 +12108,7 @@ in stix-otf = callPackage ../data/fonts/stix-otf { }; inherit (callPackages ../data/fonts/gdouros { }) - aegean textfonts symbola aegyptus akkadian anatolian maya unidings musica analecta; + symbola aegyptus akkadian anatolian maya unidings musica analecta; iana_etc = callPackage ../data/misc/iana-etc { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 95a762df33ee..b822e3f0d40d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7938,6 +7938,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RO/ROSCH/${name}.tar.gz"; sha256 = "00wk9950i9q6qwp1vdq9xdddgk54lqd0bhcq2hnijh8xnmhvpmsc"; }; + outputs = [ "out" ]; buildInputs = [ ProcWaitStat ]; }; |