From 0c15f0d0ca08a0d7db9b9393083681f57e94a242 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 Nov 2019 01:07:50 -0700 Subject: [PATCH 1/2] libmanette: 0.2.2 -> 0.2.3 --- pkgs/development/libraries/libmanette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 701238750512..99dce385913c 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -2,7 +2,7 @@ , glib, libgudev, libevdev, gnome3 }: let - version = "0.2.2"; + version = "0.2.3"; pname = "libmanette"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1lpprk2qz1lsqf9xj6kj2ciyc1zmjhj5lwd584qkh7jgz2x9y6wb"; + sha256 = "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection ]; From 4839004ef2358b89e4c3bfab1abbe25dc854913f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Nov 2019 14:30:56 +0100 Subject: [PATCH 2/2] libmanette: format expression with nixpkgs-format and also fix homepage --- .../libraries/libmanette/default.nix | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 99dce385913c..2f7f46974b0b 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection -, glib, libgudev, libevdev, gnome3 }: +{ stdenv +, fetchurl +, ninja +, meson +, pkgconfig +, vala +, gobject-introspection +, glib +, libgudev +, libevdev +, gnome3 +}: -let - version = "0.2.3"; +stdenv.mkDerivation rec { pname = "libmanette"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "0.2.3"; outputs = [ "out" "dev" ]; @@ -15,8 +22,19 @@ stdenv.mkDerivation { sha256 = "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection ]; - buildInputs = [ glib libgudev libevdev ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + vala + gobject-introspection + ]; + + buildInputs = [ + glib + libgudev + libevdev + ]; doCheck = true; @@ -28,7 +46,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple GObject game controller library"; - homepage = https://wiki.gnome.org/Apps/Builder; + homepage = "https://gitlab.gnome.org/aplazas/libmanette"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix;