Merge branch 'master' of https://git.dodsorf.as/Dandellion/NUR

pkgs/JAVMovieScraper/0001-disable_spotless.patch

@@ -0,0 +1,33 @@
+From 6b07d65a87c627a510af53717af74b265b0674df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= <daniel@dodsorf.as>
+Date: Sat, 2 Nov 2019 10:55:50 +0100
+Subject: [PATCH 1/3] disable_spotless
+
+---
+ build.gradle | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 89d9f44..54ca85e 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -79,11 +79,11 @@ shadowJar {
+ 	baseName = project.name
+ }
+ 
+-spotless {
+-	java {
+-		eclipse().configFile 'config/format/eclipseformat.xml'
+-	}
+-}
++#spotless {
++#	java {
++#		eclipse().configFile 'config/format/eclipseformat.xml'
++#	}
++#t}
+ 
+ jacocoTestReport {
+ 	reports {
+-- 
+2.19.3
+

pkgs/JAVMovieScraper/0002-respectXDG.patch

@@ -1,3 +1,13 @@
+From a347ad085f22d0282ad64926533f2b585e9c3a5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= <daniel@dodsorf.as>
+Date: Sun, 3 Nov 2019 13:55:09 +0100
+Subject: [PATCH 2/3] respectXDG
+
+---
+ .../AllAmalgamationOrderingPreferences.java            |  7 +++++--
+ .../doctord/model/preferences/Settings.java            | 10 +++++++---
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
 diff --git a/src/main/java/moviescraper/doctord/controller/amalgamation/AllAmalgamationOrderingPreferences.java b/src/main/java/moviescraper/doctord/controller/amalgamation/AllAmalgamationOrderingPreferences.java
 index ac9cf4e..ce57ee3 100644
 --- a/src/main/java/moviescraper/doctord/controller/amalgamation/AllAmalgamationOrderingPreferences.java
@@ -63,3 +73,6 @@ index 5810bf3..84fdde2 100644
 -}
 \ No newline at end of file
 +}
+-- 
+2.19.3
+

pkgs/JAVMovieScraper/0003-disable-codacy.patch

@@ -0,0 +1,81 @@
+From e089b69d28f36a69e5fc2e812f7ed1097dad9acf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= <daniel@dodsorf.as>
+Date: Tue, 25 Feb 2020 01:40:53 +0100
+Subject: [PATCH 3/3] disable codacy
+
+---
+ build.gradle                  | 10 ----------
+ gradle/codacy_coverage.gradle | 23 -----------------------
+ 2 files changed, 33 deletions(-)
+ delete mode 100644 gradle/codacy_coverage.gradle
+
+diff --git a/build.gradle b/build.gradle
+index 54ca85e..86b5507 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,14 +1,12 @@
+ plugins {
+ 	id 'application'
+ 	id 'com.github.johnrengelman.shadow' version '5.0.0'
+-	id "com.diffplug.gradle.spotless" version "3.13.0"
+ 	id "org.sonarqube" version "2.5"
+ }
+ 
+ apply plugin: 'java'
+ apply from: "gradle/git.gradle"
+ apply plugin: 'checkstyle'
+-apply plugin: "com.diffplug.gradle.spotless"
+ apply plugin: 'jacoco'
+ 
+ sourceCompatibility = '1.8'
+@@ -79,12 +77,6 @@ shadowJar {
+ 	baseName = project.name
+ }
+ 
+-#spotless {
+-#	java {
+-#		eclipse().configFile 'config/format/eclipseformat.xml'
+-#	}
+-#t}
+-
+ jacocoTestReport {
+ 	reports {
+ 		xml.enabled = true
+@@ -92,5 +84,3 @@ jacocoTestReport {
+ 	}
+ }
+ check.dependsOn jacocoTestReport
+-
+-apply from: "gradle/codacy_coverage.gradle"
+diff --git a/gradle/codacy_coverage.gradle b/gradle/codacy_coverage.gradle
+deleted file mode 100644
+index 685594f..0000000
+--- a/gradle/codacy_coverage.gradle
++++ /dev/null
+@@ -1,23 +0,0 @@
+-configurations { codacy }
+-
+-repositories {
+-	maven { url "https://jitpack.io" }
+-	maven { url "http://dl.bintray.com/typesafe/maven-releases" }
+-}
+-
+-dependencies {
+-	codacy 'com.github.codacy:codacy-coverage-reporter:-SNAPSHOT'
+-}
+-
+-// Coverage can be send with the following command: gradle -PprojectToken="TOKEN" sendCoverageToCodacy
+-task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
+-	main = "com.codacy.CodacyCoverageReporter"
+-	classpath = configurations.codacy
+-	args = [
+-			"report",
+-			"-l",
+-			"Java",
+-			"-r",
+-			"${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+-	]
+-}
+-- 
+2.19.3
+

pkgs/JAVMovieScraper/default.nix

@@ -13,7 +13,11 @@ buildGradle {
     sha256 = "0qwdzyfmscjj75jyh9mnk1rlmy12fnnsqbhvp9xdsnfhwy78x6xm";
   };
 
-  patches = [ ./disable_spotless.patch ./respectXDG.patch ];
+  patches = [
+    ./0001-disable_spotless.patch
+    ./0002-respectXDG.patch
+    ./0003-disable-codacy.patch
+  ];
 
   gradleFlags = [ "DistTar" ];
 
@@ -29,7 +33,7 @@ buildGradle {
   '';
 
   meta = with pkgs.stdenv.lib; {
-    broken = true;
+    #broken = true;
     description = "A program to fetch metadata for Japanese Adult Video";
     homepage = "https://github.com/DoctorD1501/JAVMovieScraper";
     license = licenses.gpl2;

pkgs/JAVMovieScraper/disable_spotless.patch

@@ -1,21 +0,0 @@
-diff --git a/build.gradle b/build.gradle
-index 89d9f44..54ca85e 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -79,11 +79,11 @@ shadowJar {
- 	baseName = project.name
- }
- 
--spotless {
--	java {
--		eclipse().configFile 'config/format/eclipseformat.xml'
--	}
--}
-+/*spotless {
-+	java {
-+		eclipse().configFile 'config/format/eclipseformat.xml'
-+	}
-+t}*/
- 
- jacocoTestReport {
- 	reports {