From 48276abd93a8843748ae21e935785b1c53378cb9 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 17 Sep 2024 12:37:00 +0200 Subject: [PATCH 1/4] maintainers: add mohe2015 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74569537259e..b62fa756b1f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13990,6 +13990,12 @@ githubId = 754512; name = "Mogria"; }; + mohe2015 = { + name = "Moritz Hedtke"; + email = "Moritz.Hedtke@t-online.de"; + github = "mohe2015"; + githubId = 13287984; + }; momeemt = { name = "Mutsuha Asada"; email = "me@momee.mt"; From 1b3e725693353175f3f8751fe15a5fabb5a595c8 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 17 Sep 2024 12:43:27 +0200 Subject: [PATCH 2/4] verapdf: init at 1.26.2 Co-authored-by: kilianar --- pkgs/by-name/ve/verapdf/package.nix | 80 +++++++++++++++++++ .../ve/verapdf/stable-maven-plugins.patch | 42 ++++++++++ 2 files changed, 122 insertions(+) create mode 100644 pkgs/by-name/ve/verapdf/package.nix create mode 100644 pkgs/by-name/ve/verapdf/stable-maven-plugins.patch diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix new file mode 100644 index 000000000000..1b772e74ed94 --- /dev/null +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -0,0 +1,80 @@ +{ + lib, + fetchFromGitHub, + maven, + makeWrapper, + stripJavaArchivesHook, + makeDesktopItem, + copyDesktopItems, + jre, +}: +maven.buildMavenPackage rec { + pname = "verapdf"; + version = "1.26.2"; + + mvnParameters = "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; + + src = fetchFromGitHub { + owner = "veraPDF"; + repo = "veraPDF-apps"; + rev = "v${version}"; + hash = "sha256-bWj4dX1qRQ2zzfF9GfskvMnrNU9pKC738Zllx6JsFww="; + }; + + patches = [ ./stable-maven-plugins.patch ]; + + mvnHash = "sha256-sVuzd4TUmrfvqhtiZL1L4obOF1DihMANbZNIy/LKyfw="; + + nativeBuildInputs = [ + makeWrapper + stripJavaArchivesHook + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + + install -Dm644 greenfield-apps/target/greenfield-apps-${lib.versions.majorMinor version}.0.jar $out/share/verapdf.jar + + makeWrapper ${jre}/bin/java $out/bin/verapdf-gui --add-flags "-jar $out/share/verapdf.jar" + makeWrapper ${jre}/bin/java $out/bin/verapdf --add-flags "-cp $out/share/verapdf.jar org.verapdf.apps.GreenfieldCliWrapper" + + install -Dm644 gui/src/main/resources/org/verapdf/gui/images/icon.png $out/share/icons/hicolor/256x256/apps/verapdf.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "veraPDF"; + comment = meta.description; + desktopName = "veraPDF"; + genericName = "PDF/A Conformance Checker"; + exec = "verapdf-gui"; + icon = "verapdf"; + categories = [ + "Development" + "Utility" + ]; + keywords = [ "PDF" ]; + mimeTypes = [ "application/pdf" ]; + }) + ]; + + meta = { + description = "Command line and GUI industry supported PDF/A and PDF/UA Validation"; + homepage = "https://github.com/veraPDF/veraPDF-apps"; + license = [ + lib.licenses.gpl3Plus + # or + lib.licenses.mpl20 + ]; + mainProgram = "verapdf-gui"; + maintainers = [ + lib.maintainers.mohe2015 + lib.maintainers.kilianar + ]; + }; +} diff --git a/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch b/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch new file mode 100644 index 000000000000..77257b5f2dfb --- /dev/null +++ b/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch @@ -0,0 +1,42 @@ +diff --git a/pom.xml b/pom.xml +index 015dca6..1557d54 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -125,6 +125,37 @@ + + + ++ ++ org.apache.maven.plugins ++ maven-enforcer-plugin ++ 3.5.0 ++ ++ ++ enforce-plugin-versions ++ ++ enforce ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-install-plugin ++ 3.1.3 ++ ++ ++ ++ org.apache.maven.plugins ++ maven-jar-plugin ++ 3.4.2 ++ ++ + + org.apache.maven.plugins + maven-compiler-plugin From 3b957cfd41cbd0dc4a7f9e924b5ea67417d55513 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Mon, 10 Jun 2024 21:14:31 -0400 Subject: [PATCH 3/4] fishPlugins.fish-you-should-use: init at 0-unstable-2022-02-13 --- pkgs/shells/fish/plugins/default.nix | 2 ++ .../fish/plugins/fish-you-should-use.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/shells/fish/plugins/fish-you-should-use.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 36a5a59e4398..6efb5029121b 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -26,6 +26,8 @@ lib.makeScope newScope (self: with self; { fishtape = callPackage ./fishtape.nix { }; fishtape_3 = callPackage ./fishtape_3.nix { }; + fish-you-should-use = callPackage ./fish-you-should-use.nix { }; + foreign-env = callPackage ./foreign-env { }; forgit = callPackage ./forgit.nix { }; diff --git a/pkgs/shells/fish/plugins/fish-you-should-use.nix b/pkgs/shells/fish/plugins/fish-you-should-use.nix new file mode 100644 index 000000000000..96c2e07447f3 --- /dev/null +++ b/pkgs/shells/fish/plugins/fish-you-should-use.nix @@ -0,0 +1,26 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, + unstableGitUpdater, +}: +buildFishPlugin { + pname = "fish-you-should-use"; + version = "0-unstable-2022-02-13"; + + src = fetchFromGitHub { + owner = "paysonwallach"; + repo = "fish-you-should-use"; + rev = "a332823512c0b51e71516ebb8341db0528c87926"; + hash = "sha256-MmGDFTgxEFgHdX95OjH3jKsVG1hdwo6bRht+Lvvqe5Y="; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fish plugin that reminds you to use your aliases"; + homepage = "https://github.com/paysonwallach/fish-you-should-use"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ anomalocaris ]; + }; +} From a2ed02c4c25b8c597f2f2865ebfba6585626d31b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 30 Sep 2024 19:41:04 +0200 Subject: [PATCH 4/4] cpython: add python team as maintainers --- pkgs/development/interpreters/python/cpython/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index bb3dba534b79..6d4bd47ba294 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -686,5 +686,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "python3" ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd; mainProgram = executable; + maintainers = lib.teams.python.members; }; })