Merge master into staging-next

maintainers/maintainer-list.nix

@@ -14159,6 +14159,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";

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
+    ];
+  };
+}

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 @@
+   <build>
+ 
+     <plugins>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-enforcer-plugin</artifactId>
++        <version>3.5.0</version>
++        <executions>
++          <execution>
++            <id>enforce-plugin-versions</id>
++            <goals>
++              <goal>enforce</goal>
++            </goals>
++            <configuration>
++              <rules>
++                <requirePluginVersions />
++              </rules>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-install-plugin</artifactId>
++        <version>3.1.3</version>
++      </plugin>
++
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-jar-plugin</artifactId>
++        <version>3.4.2</version>
++      </plugin>
++
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-compiler-plugin</artifactId>

pkgs/development/interpreters/python/cpython/default.nix

@@ -657,5 +657,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;
   };
 })

pkgs/shells/fish/plugins/default.nix

@@ -28,6 +28,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 { };

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 ];
+  };
+}