From 61f655ccec8decd3df9efad56ec9756350a330cd Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Wed, 25 May 2022 18:20:59 +0300 Subject: [PATCH 1/2] Revert "metamorphose2: drop" This reverts commit 608cde3bd4485d8e0337dc9495ed3909459a052a. --- .../misc/metamorphose2/default.nix | 43 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 + 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/metamorphose2/default.nix diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix new file mode 100644 index 000000000000..277d00fe050b --- /dev/null +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchgit, makeWrapper, gettext +, python27, python2Packages +}: + +stdenv.mkDerivation { + pname = "metamorphose2"; + version = "0.9.0beta"; + + # exif-py vendored via submodule + # mutagen vendored via copy + src = fetchgit { + url = "https://github.com/metamorphose/metamorphose2.git"; + #rev = "refs/tags/v2.${version}"; #for when wxPython3 support is released + rev = "d2bdd6a86340b9668e93b35a6a568894c9909d68"; + sha256 = "0ivcb3c8hidrff0ivl4dnwa2p3ihpqjdbvdig8dhg9mm5phdbabn"; + }; + + postPatch = '' + substituteInPlace messages/Makefile \ + --replace "\$(shell which msgfmt)" "${gettext}/bin/msgfmt" + ''; + + postInstall = '' + rm $out/bin/metamorphose2 + makeWrapper ${python27}/bin/python $out/bin/metamorphose2 \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ + --add-flags "-O $out/share/metamorphose2/metamorphose2.py -w=3" + ''; + + buildInput = [ gettext python27 ]; + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ python2Packages.wxPython python2Packages.pillow ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "a graphical mass renaming program for files and folders"; + homepage = "https://github.com/metamorphose/metamorphose2"; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d5f06f4fbbe..f040a9ec9769 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -820,7 +820,6 @@ mapAliases ({ mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mess = mame; # Added 2019-10-30 - metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2"; # Added 2022-01-12 mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12 midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98c681368583..b8f496af9947 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8284,6 +8284,8 @@ with pkgs; mencal = callPackage ../applications/misc/mencal { } ; + metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; + metar = callPackage ../applications/misc/metar { }; mfcuk = callPackage ../tools/security/mfcuk { }; From 4a0a6218a5258d79cbf32626fbbdb80cf6b8d099 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Wed, 25 May 2022 20:16:54 +0300 Subject: [PATCH 2/2] metamorphose2: 0.9.0 -> 0.10.0 --- .../misc/metamorphose2/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 277d00fe050b..86b4bc66d296 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -1,41 +1,42 @@ -{ lib, stdenv, fetchgit, makeWrapper, gettext -, python27, python2Packages +{ lib, stdenv, fetchFromGitHub, makeWrapper, gettext +, python3 }: stdenv.mkDerivation { pname = "metamorphose2"; - version = "0.9.0beta"; + version = "0.10.0beta"; # exif-py vendored via submodule - # mutagen vendored via copy - src = fetchgit { - url = "https://github.com/metamorphose/metamorphose2.git"; - #rev = "refs/tags/v2.${version}"; #for when wxPython3 support is released - rev = "d2bdd6a86340b9668e93b35a6a568894c9909d68"; - sha256 = "0ivcb3c8hidrff0ivl4dnwa2p3ihpqjdbvdig8dhg9mm5phdbabn"; + src = fetchFromGitHub { + owner = "timinaust"; + repo = "metamorphose2"; + rev = "ba0666dd02e4f3f58c1dadc309e7ec1cc13fe851"; + sha256 = "0w9l1vyyswdhdwrmi71g23qyslvhg1xym4ksifd42vwf9dxy55qp"; + fetchSubmodules = true; }; postPatch = '' + rm -rf ./src/mutagen substituteInPlace messages/Makefile \ --replace "\$(shell which msgfmt)" "${gettext}/bin/msgfmt" ''; postInstall = '' rm $out/bin/metamorphose2 - makeWrapper ${python27}/bin/python $out/bin/metamorphose2 \ + makeWrapper ${python3.interpreter} $out/bin/metamorphose2 \ --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --add-flags "-O $out/share/metamorphose2/metamorphose2.py -w=3" ''; - buildInput = [ gettext python27 ]; + buildInput = [ gettext python3 ]; nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ python2Packages.wxPython python2Packages.pillow ]; + propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_1 pillow six ]; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "a graphical mass renaming program for files and folders"; - homepage = "https://github.com/metamorphose/metamorphose2"; + homepage = "https://github.com/timinaust/metamorphose2"; license = with licenses; gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux;