summary refs log tree commit diff
diff options
context:
space:
mode:
authorRyan Mulligan <ryan@ryantm.com>2023-08-01 07:06:05 -0700
committerGitHub <noreply@github.com>2023-08-01 07:06:05 -0700
commitb00c8939815828165c69a93a43f670ea27a4ec4d (patch)
treeed8c051529343ef47c9c2ad8f0c90b503065c953
parente6c8427e9008402e0cb882ceaffb485b29ffac1e (diff)
parent6678a5ad5f04fbc7e95ed065254d9e3a03e71910 (diff)
downloadnixpkgs-b00c8939815828165c69a93a43f670ea27a4ec4d.tar
nixpkgs-b00c8939815828165c69a93a43f670ea27a4ec4d.tar.gz
nixpkgs-b00c8939815828165c69a93a43f670ea27a4ec4d.tar.bz2
nixpkgs-b00c8939815828165c69a93a43f670ea27a4ec4d.tar.lz
nixpkgs-b00c8939815828165c69a93a43f670ea27a4ec4d.tar.xz
nixpkgs-b00c8939815828165c69a93a43f670ea27a4ec4d.tar.zst
nixpkgs-b00c8939815828165c69a93a43f670ea27a4ec4d.zip
Merge pull request #246048 from michaelgrahamevans/confy-0.7.0
confy: 0.6.5 -> 0.7.0
-rw-r--r--pkgs/applications/misc/confy/default.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix
index ec177c0aa72..24a21471b45 100644
--- a/pkgs/applications/misc/confy/default.nix
+++ b/pkgs/applications/misc/confy/default.nix
@@ -1,11 +1,11 @@
-{ appstream-glib
+{ blueprint-compiler
 , desktop-file-utils
 , fetchurl
 , gobject-introspection
-, gtk3
+, gtk4
 , lib
+, libadwaita
 , libnotify
-, libhandy
 , meson
 , ninja
 , pkg-config
@@ -16,14 +16,15 @@
 
 stdenv.mkDerivation rec {
   pname = "confy";
-  version = "0.6.5";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz";
-    sha256 = "sha256-zfuwOZBSGQzJUc36M6C5wSHarLbPFqayQVFo+WbVo7k=";
+    hash = "sha256-ZvIzgCMDfUW9g+qmY0ZIUoEF0PeVmINjOPwilmFzWDk=";
   };
 
   nativeBuildInputs = [
+    blueprint-compiler
     desktop-file-utils
     meson
     ninja
@@ -33,8 +34,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gobject-introspection
-    gtk3
-    libhandy
+    gtk4
+    libadwaita
     libnotify
     (python3.withPackages (ps: with ps; [
       icalendar
@@ -43,8 +44,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    # Remove executable bits so that meson runs the script with our Python interpreter
-    chmod -x build-aux/meson/postinstall.py
+    patchShebangs build-aux/meson/postinstall.py
   '';
 
   meta = with lib; {