From bd2cef064c18d71a5dbc06f9f0fc8c66f6153a6e Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 12 Jul 2017 02:23:42 +1000 Subject: [PATCH 1/4] st: refactor deprecated `isNull' function --- pkgs/applications/misc/st/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 9b3dc84bcbd..387f00cc91e 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; -let patches' = if isNull patches then [] else patches; +let patches' = if patches == null then [] else patches; in stdenv.mkDerivation rec { name = "st-0.7"; From 4934a512d1a004a225aa98e18cf764ba9d72df51 Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 12 Jul 2017 02:25:18 +1000 Subject: [PATCH 2/4] st: refactor out `stdenv.lib' already in scope --- pkgs/applications/misc/st/default.nix | 2 +- pkgs/applications/misc/st/wayland.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 387f00cc91e..16d6ca2e26f 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [viric andsild]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix index 4d9f0ef3f8d..ab890c8db71 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/misc/st/wayland.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; From 88874e7650f8139e06ec89b7779ebc98c2ec397d Mon Sep 17 00:00:00 2001 From: xd1le Date: Wed, 12 Jul 2017 02:53:43 +1000 Subject: [PATCH 3/4] xst: init at 0.7.1 --- lib/maintainers.nix | 1 + pkgs/applications/misc/st/xst.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/st/xst.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d095029f5b0..0f6087c50f6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -585,6 +585,7 @@ volth = "Jaroslavas Pocepko "; vozz = "Oliver Hunt "; vrthra = "Rahul Gopinath "; + vyp = "vyp "; wedens = "wedens "; willtim = "Tim Philip Williams "; winden = "Antonio Vargas Gonzalez "; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix new file mode 100644 index 00000000000..cd4d9f1814f --- /dev/null +++ b/pkgs/applications/misc/st/xst.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: + +with stdenv.lib; + +let + version = "0.7.1"; + name = "xst-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "https://github.com/neeasade/xst/archive/v${version}.tar.gz"; + sha256 = "19ayx1753f2s6k7f6yn256bsssm20ggffs1diakgjqwcyjcxxn7q"; + }; + + buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; + + installPhase = '' + TERMINFO=$out/share/terminfo make install PREFIX=$out + ''; + + meta = { + homepage = "https://github.com/neeasade/xst"; + description = "Simple terminal fork that can load config from Xresources"; + license = licenses.mit; + maintainers = maintainers.vyp; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56bd308b6bd..6acb9304528 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15887,6 +15887,8 @@ with pkgs; patches = config.st.patches or null; }; + xst = callPackage ../applications/misc/st/xst.nix { }; + stag = callPackage ../applications/misc/stag { curses = ncurses; }; From b38e33775b80d096370c73ce1eed112f1821047e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 12 Jul 2017 21:29:15 +0100 Subject: [PATCH 4/4] xst: use fetchFromGitHub --- pkgs/applications/misc/st/xst.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index cd4d9f1814f..5aaf04bbfd8 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: +{ stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: with stdenv.lib; @@ -8,9 +8,11 @@ let in stdenv.mkDerivation { inherit name; - src = fetchurl { - url = "https://github.com/neeasade/xst/archive/v${version}.tar.gz"; - sha256 = "19ayx1753f2s6k7f6yn256bsssm20ggffs1diakgjqwcyjcxxn7q"; + src = fetchFromGitHub { + owner = "neeasade"; + repo = "xst"; + rev = "v${version}"; + sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc"; }; buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];