summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-19 18:01:44 +0000
committerGitHub <noreply@github.com>2021-07-19 18:01:44 +0000
commitc455b1a6573b382552403a7fec2ed7d90a4277a3 (patch)
treecbeea06a9ba98b142336247979e50e88569c9a72 /pkgs/tools
parent914b93541e67b535c6c6e5588d5ce33b485bfedf (diff)
parentc0cb54f9eeb0c607a08097f84096728aa8ea615d (diff)
downloadnixpkgs-c455b1a6573b382552403a7fec2ed7d90a4277a3.tar
nixpkgs-c455b1a6573b382552403a7fec2ed7d90a4277a3.tar.gz
nixpkgs-c455b1a6573b382552403a7fec2ed7d90a4277a3.tar.bz2
nixpkgs-c455b1a6573b382552403a7fec2ed7d90a4277a3.tar.lz
nixpkgs-c455b1a6573b382552403a7fec2ed7d90a4277a3.tar.xz
nixpkgs-c455b1a6573b382552403a7fec2ed7d90a4277a3.tar.zst
nixpkgs-c455b1a6573b382552403a7fec2ed7d90a4277a3.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/birdfont/default.nix4
-rw-r--r--pkgs/tools/misc/flameshot/default.nix10
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 57b42952c85..5473fa0e78c 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "birdfont";
-  version = "2.29.4";
+  version = "2.29.5";
 
   src = fetchurl {
     url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8=";
+    sha256 = "sha256-eIqq4ehUB4lF89ikrHeN5Akq14nxYMxREZzPSVnv+nU=";
   };
 
   nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];
diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix
index f0ed87bcc22..838572d9297 100644
--- a/pkgs/tools/misc/flameshot/default.nix
+++ b/pkgs/tools/misc/flameshot/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "flameshot";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "flameshot-org";
     repo = "flameshot";
     rev = "v${version}";
-    sha256 = "sha256-E5J61k1tVpbwlzYHbCY1rf9+GODcJRRAQwb0jR4s7BU=";
+    sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2";
   };
 
   nativeBuildInputs = [ cmake qttools qtsvg ];
@@ -17,8 +17,8 @@ mkDerivation rec {
   meta = with lib; {
     description = "Powerful yet simple to use screenshot software";
     homepage = "https://github.com/flameshot-org/flameshot";
-    maintainers = [ maintainers.scode ];
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
+    maintainers = with maintainers; [ scode ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
   };
 }