From c4a010e7bbde37dbd43a0cfa006bf61914fcd040 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 15:47:50 +0000 Subject: [PATCH 1/5] =?UTF-8?q?libadwaita:=201.1.4=20=E2=86=92=201.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://blogs.gnome.org/alexm/2022/09/15/libadwaita-1-2/ https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.1.4...1.2.alpha https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.2.alpha...1.2.beta https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.2.beta...1.2.rc https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.2.rc...1.2.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index a9185f0b4fec..0d9678e038d0 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.4"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-xxnLgPKPOND/ITvDC6SOD2GlkzlIX3BzBbt6p2AEjgY="; + hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U="; }; nativeBuildInputs = [ From 7651df9331c239b348ba510af75d9003b28daba4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Sep 2022 15:36:25 +0200 Subject: [PATCH 2/5] fractal-next: use standard libadwaita The current version is 1.2 now. --- pkgs/top-level/all-packages.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 873581e37c8e..64e74fec8ea2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28173,16 +28173,6 @@ with pkgs; fractal-next = callPackage ../applications/networking/instant-messengers/fractal-next { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; - libadwaita = libadwaita.overrideAttrs (finalAtts: rec { - version = "1.2.0"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libadwaita"; - rev = version; - hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U="; - }; - }); }; fragments = callPackage ../applications/networking/p2p/fragments { }; From 60096e952079d9709f2e6a3490f932d47ad9c7a9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 16 Sep 2022 23:40:17 +0000 Subject: [PATCH 3/5] =?UTF-8?q?gtk4:=204.8.0=20=E2=86=92=204.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.8.0...4.8.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 5c4bc0430d84..d23eef0201fc 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.8.0"; + version = "4.8.1"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "yNYgNDfR41nYMSTcWRVG1AP2fjsAVE5T3VCpuqzcvX8="; + sha256 = "XOjY3piiO9DI7KGmEJThwAm18AncvWC0XpkKjbG3Qv0="; }; nativeBuildInputs = [ From 014189b3129f11fd1e2aad720d0dedd3e8856ff1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Aug 2022 20:03:42 +0000 Subject: [PATCH 4/5] =?UTF-8?q?gtkmm4:=204.6.1=20=E2=86=92=204.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtkmm/-/compare/4.6.1...4.7.1 https://gitlab.gnome.org/GNOME/gtkmm/-/compare/4.7.1...4.8.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtkmm/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 29fa404ba119..b12ff45a3a19 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.6.1"; + version = "4.8.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DV7+yp7GT91TC7gibGMQrJlUmz3ZYE1uNnY5eRrz0eA="; + sha256 = "yCeG1G4rBzRrY5fKfxkp2VL0ki+lyds97ghJi5oTbPU="; }; nativeBuildInputs = [ From 67b50b7dd3fd76603af10e6ca3f352c633f0da1a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Jul 2022 08:00:27 +0200 Subject: [PATCH 5/5] libpanel: init at 1.0.1 https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.0.alpha...1.0.alpha1 https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.0.alpha1...1.0.0 https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.0.0...1.0.1 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/libpanel/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/libraries/libpanel/default.nix diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/development/libraries/libpanel/default.nix new file mode 100644 index 000000000000..85f7fb23b7bf --- /dev/null +++ b/pkgs/development/libraries/libpanel/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, glib +, gtk4 +, libadwaita +, gnome +}: + +stdenv.mkDerivation rec { + pname = "libpanel"; + version = "1.0.1"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + + src = fetchurl { + url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "hBtqtx6wcv1lIAI+H3Gqx/8lDGbq37sXyVXaa/QeIwY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + mesonFlags = [ + "-Dinstall-examples=true" + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "Dock/panel library for GTK 4"; + homepage = "https://gitlab.gnome.org/GNOME/libpanel"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64e74fec8ea2..00023b42a694 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20247,6 +20247,8 @@ with pkgs; libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { }; + libpanel = callPackage ../development/libraries/libpanel { }; + libpar2 = callPackage ../development/libraries/libpar2 { }; libpcap = callPackage ../development/libraries/libpcap { };