From fde6f9a95a8417520a22b90a1b1b633594552e0f Mon Sep 17 00:00:00 2001 From: Fionera Date: Mon, 6 Jul 2020 02:10:30 +0200 Subject: [PATCH 1/4] maintainers: add fionera --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a5814f84d0a..daab5f4387e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2656,6 +2656,12 @@ fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; }]; }; + fionera = { + email = "nix@fionera.de"; + github = "fionera"; + githubId = 5741401; + name = "Tim Windelschmidt"; + }; FireyFly = { email = "nix@firefly.nu"; github = "FireyFly"; From be489bc04f011019cefe7f9afedb05074ee1deb9 Mon Sep 17 00:00:00 2001 From: Fionera Date: Mon, 6 Jul 2020 05:07:25 +0200 Subject: [PATCH 2/4] tllist: init at 1.0.1 --- pkgs/development/libraries/tllist/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/tllist/default.nix diff --git a/pkgs/development/libraries/tllist/default.nix b/pkgs/development/libraries/tllist/default.nix new file mode 100644 index 00000000000..1b5ea1ff39b --- /dev/null +++ b/pkgs/development/libraries/tllist/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchgit, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "tllist"; + version = "1.0.1"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/tllist.git"; + rev = "${version}"; + sha256 = "0xifbbfg1kn281jybdc6ns5kzz0daha4hf47bd0yc0wcmvcfbgmp"; + }; + + nativeBuildInputs = [ + meson ninja + ]; + + meta = with lib; { + homepage = "https://codeberg.org/dnkl/tllist"; + description = "C header file only implementation of a typed linked list"; + maintainers = with maintainers; [ fionera ]; + license = licenses.mit; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 474b1079252..dc4775bd04f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1870,6 +1870,8 @@ in futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + tllist = callPackage ../development/libraries/tllist { }; + fwup = callPackage ../tools/misc/fwup { }; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; From d70ea548404bd838db2e7c1c9e1f4177c834b74c Mon Sep 17 00:00:00 2001 From: Fionera Date: Mon, 6 Jul 2020 05:07:05 +0200 Subject: [PATCH 3/4] fcft: init at 0.4.3 --- pkgs/development/libraries/fcft/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/fcft/default.nix diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix new file mode 100644 index 00000000000..15f2f42af38 --- /dev/null +++ b/pkgs/development/libraries/fcft/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchgit, pkg-config, meson, ninja, freetype, fontconfig, pixman, tllist }: + +stdenv.mkDerivation rec { + pname = "fcft"; + version = "0.4.3"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/fcft.git"; + rev = "${version}"; + sha256 = "1r2k5726k6ps8ml2s1vqmpiggqxzq9pbzs7m0dsxk29mh8vg0psj"; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ freetype fontconfig pixman tllist ]; + + meta = with lib; { + homepage = "https://codeberg.org/dnkl/fcft"; + description = "Simple library for font loading and glyph rasterization"; + maintainers = with maintainers; [ fionera ]; + license = licenses.mit; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc4775bd04f..eb692c26bc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1872,6 +1872,8 @@ in tllist = callPackage ../development/libraries/tllist { }; + fcft = callPackage ../development/libraries/fcft { }; + fwup = callPackage ../tools/misc/fwup { }; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; From 2c06cb3b83935ebabe96b40e683fdfedd171bb2f Mon Sep 17 00:00:00 2001 From: Fionera Date: Mon, 6 Jul 2020 02:10:40 +0200 Subject: [PATCH 4/4] fuzzel: init at 1.3.0 --- pkgs/applications/misc/fuzzel/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/misc/fuzzel/default.nix diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix new file mode 100644 index 00000000000..7370939be7a --- /dev/null +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, scdoc, git, tllist, fcft}: + +stdenv.mkDerivation rec { + pname = "fuzzel"; + version = "1.3.0"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/fuzzel"; + rev = "${version}"; + sha256 = "12jv5iwmksygw8nfkxbd9rbi03wnpgb30hczq009aqgy7lyi5zmp"; + }; + + nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; + buildInputs = [ wayland pixman cairo librsvg wayland-protocols wlroots libxkbcommon tllist fcft ]; + + meta = with lib; { + description = "Wayland-native application launcher, similar to rofi’s drun mode"; + homepage = "https://codeberg.org/dnkl/fuzzel"; + license = licenses.mit; + maintainers = with maintainers; [ fionera ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb692c26bc7..3d1b67a9181 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1874,6 +1874,8 @@ in fcft = callPackage ../development/libraries/fcft { }; + fuzzel = callPackage ../applications/misc/fuzzel { }; + fwup = callPackage ../tools/misc/fwup { }; fx_cast_bridge = callPackage ../tools/misc/fx_cast { };