diff options
| -rw-r--r-- | pkgs/applications/misc/yaft/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/servers/dns/knot-dns/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/shells/es/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 50 insertions, 22 deletions
diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix new file mode 100644 index 000000000000..d273d27944a8 --- /dev/null +++ b/pkgs/applications/misc/yaft/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + version = "0.2.9"; + name = "yaft-${version}"; + + src = fetchFromGitHub { + owner = "uobikiemukot"; + repo = "yaft"; + rev = "v${version}"; + sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd"; + }; + + buildInputs = [ ncurses ]; + + installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; + + meta = { + homepage = https://github.com/uobikiemukot/yaft; + description = "Yet another framebuffer terminal"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 834d9a09b5bb..c7b2032a5790 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn -, systemd, nettle, libedit, zlib, libiconv +, systemd, nettle, libedit, zlib, libiconv, fetchpatch }: # Note: ATM only the libraries have been tested in nixpkgs. @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b"; }; + patches = stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + name = "before-sierra.diff"; + url = "https://gitlab.labs.nic.cz/labs/knot/merge_requests/664.diff"; + sha256 = "0g4gm2m3pi0lfpkp53xayf6jq6yn3ifidh40maiy1a46dfadvw6w"; + }); + outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - CFLAGS = [ "-DNDEBUG" ]; + CFLAGS = [ "-O2" "-DNDEBUG" ]; #doCheck = true; problems in combination with dynamic linking diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 037d1e1ec995..789ddaf4d9bb 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -1,33 +1,27 @@ -{ stdenv, fetchgit, readline, yacc, autoconf, automake, libtool }: +{ stdenv, fetchurl, readline, yacc }: let - version = "git-2015-04-11"; + version = "0.9.1"; in stdenv.mkDerivation { name = "es-${version}"; - src = fetchgit { - url = "git://github.com/wryun/es-shell"; - rev = "fdf29d5296ce3a0ef96d2b5952cff07878753975"; - sha256 = "12faa9b5ffwydgwyjp57zr19sqap2ma3crj6wd2rx1hv30dkll7p"; + src = fetchurl { + url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; + sha256 = "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h"; }; - buildInputs = [ readline yacc libtool autoconf automake ]; - - preConfigure = - '' - aclocal - autoconf - libtoolize -qi - ''; + # The distribution tarball does not have a single top-level directory. + preUnpack = '' + mkdir $name + cd $name + sourceRoot=. + ''; - configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man"; + buildInputs = [ readline yacc ]; - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/man/man1 - ''; + configureFlags = [ "--with-readline" ]; meta = with stdenv.lib; { description = "Es is an extensible shell"; @@ -40,7 +34,7 @@ stdenv.mkDerivation { ''; homepage = http://wryun.github.io/es-shell/; license = licenses.publicDomain; - maintainers = [ maintainers.sjmackenzie ]; + maintainers = with maintainers; [ sjmackenzie ttuegel ]; platforms = platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4c71c6c8fac..b97b527998b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4531,6 +4531,8 @@ with pkgs; xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + yaft = callPackage ../applications/misc/yaft { }; + yarn = callPackage ../development/tools/yarn { }; yank = callPackage ../tools/misc/yank { }; |