From d49387915cb94f85027d51a42ee46f7ee392aca7 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 12 Feb 2024 12:48:37 +0100 Subject: [PATCH 1/5] megapixels: add Luflosi as maintainer --- pkgs/applications/graphics/megapixels/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 4747e5c03a30..94061dbda8b5 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/postmarketOS/megapixels"; changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda Luflosi ]; platforms = platforms.linux; }; } From 5c8b72fd75ef6db82de00a1f6e53c84ba8ab9271 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 12 Feb 2024 12:51:48 +0100 Subject: [PATCH 2/5] megapixels: migrate to by-name --- .../default.nix => by-name/me/megapixels/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/graphics/megapixels/default.nix => by-name/me/megapixels/package.nix} (100%) diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/by-name/me/megapixels/package.nix similarity index 100% rename from pkgs/applications/graphics/megapixels/default.nix rename to pkgs/by-name/me/megapixels/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec9b96b86674..d12236559a93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33404,8 +33404,6 @@ with pkgs; mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-20; }; - megapixels = callPackage ../applications/graphics/megapixels { }; - meteo = callPackage ../applications/networking/weather/meteo { }; meld = callPackage ../applications/version-management/meld { }; From 0494985d0b98a3c903b1d671d4597d18badd2370 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 18 Feb 2024 10:09:44 +0100 Subject: [PATCH 3/5] megapixels: cleanup - Use `finalAttrs` - Enable `strictDeps - Set `meta.mainProgram` --- pkgs/by-name/me/megapixels/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index 94061dbda8b5..6f90a2348eaa 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -27,14 +27,14 @@ let ++ optionals jpgSupport [ graphicsmagick exiftool ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "megapixels"; version = "1.7.0"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc="; }; @@ -64,12 +64,15 @@ stdenv.mkDerivation rec { ) ''; + strictDeps = true; + meta = with lib; { description = "GTK4 camera application that knows how to deal with the media request api"; homepage = "https://gitlab.com/postmarketOS/megapixels"; - changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${version}"; + changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ dotlambda Luflosi ]; platforms = platforms.linux; + mainProgram = "megapixels"; }; -} +}) From 8f92ea094a2d8f0ee6bf0a5680e539070cb0b83a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 12 Feb 2024 13:06:24 +0100 Subject: [PATCH 4/5] megapixels: move to new upstream repo The old repository at https://gitlab.com/postmarketOS/megapixels was archived recently and replaced with https://gitlab.com/megapixels-org/Megapixels. --- pkgs/by-name/me/megapixels/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index 6f90a2348eaa..97ff59b9dbcc 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { version = "1.7.0"; src = fetchFromGitLab { - owner = "postmarketOS"; - repo = "megapixels"; + owner = "megapixels-org"; + repo = "Megapixels"; rev = finalAttrs.version; hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc="; }; @@ -68,8 +68,8 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "GTK4 camera application that knows how to deal with the media request api"; - homepage = "https://gitlab.com/postmarketOS/megapixels"; - changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${finalAttrs.version}"; + homepage = "https://gitlab.com/megapixels-org/Megapixels"; + changelog = "https://gitlab.com/megapixels-org/Megapixels/-/tags/${finalAttrs.version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ dotlambda Luflosi ]; platforms = platforms.linux; From a74abfa17d8164cae3d4ed0bed80ad69e86782a1 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 12 Feb 2024 13:12:55 +0100 Subject: [PATCH 5/5] megapixels: 1.7.0 -> 1.8.0 https://gitlab.com/megapixels-org/Megapixels/-/tags/1.8.0 --- pkgs/by-name/me/megapixels/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index 97ff59b9dbcc..eef5e4c7add3 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "megapixels"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitLab { owner = "megapixels-org"; repo = "Megapixels"; rev = finalAttrs.version; - hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc="; + hash = "sha256-J94kDSqQkfdltbYbzvJofd5o/Dhivtld475CaQs7+Ok="; }; nativeBuildInputs = [