From f45019f57be4b5865389b254d746d806d5f3d8e8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Aug 2024 23:53:19 +0200 Subject: [PATCH 1/2] rectangle: move to pkgs/by-name, format --- .../re/rectangle/package.nix} | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 10 insertions(+), 9 deletions(-) rename pkgs/{os-specific/darwin/rectangle/default.nix => by-name/re/rectangle/package.nix} (86%) diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/by-name/re/rectangle/package.nix similarity index 86% rename from pkgs/os-specific/darwin/rectangle/default.nix rename to pkgs/by-name/re/rectangle/package.nix index fbf13963e49e..92635ca6c059 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenvNoCC -, fetchurl -, undmg -, gitUpdater +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + gitUpdater, }: stdenvNoCC.mkDerivation rec { @@ -37,8 +38,10 @@ stdenvNoCC.mkDerivation rec { homepage = "https://rectangleapp.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.darwin; - maintainers = with maintainers; [ Intuinewin wegank ]; + maintainers = with maintainers; [ + Intuinewin + wegank + ]; license = licenses.mit; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 543c60b3298e..65eb84e155a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27324,8 +27324,6 @@ with pkgs; reap = callPackage ../os-specific/linux/reap { }; - rectangle = callPackage ../os-specific/darwin/rectangle { }; - regionset = callPackage ../os-specific/linux/regionset { }; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; From 157e73803ad50a7eb74a1a33dcf0f9a9297e238c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Aug 2024 23:54:02 +0200 Subject: [PATCH 2/2] rectangle: 0.80 -> 0.81 --- pkgs/by-name/re/rectangle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index 92635ca6c059..ae93928bc0ae 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.80"; + version = "0.81"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-CmYhMnEhn3UK82RXuT1KQhAoK/0ewcUU6h73el2Lpw8="; + hash = "sha256-oZZz6bsgG+4leQNq2C+nLaAO/Yk+OkS6BnlMQHjlK9E="; }; sourceRoot = ".";