Merge branch 'master' of https://git.dodsorf.as/Dandellion/NUR
This commit is contained in:
Daniel Olsen
commit
c8d3271085
13
default.nix
13
default.nix
|
|
@ -18,24 +18,21 @@ in
|
|||
overlays = import ./overlays; # nixpkgs overlays
|
||||
|
||||
colors = pkgs.callPackage ./pkgs/colors { };
|
||||
eplot = pkgs.callPackage ./pkgs/eplot { };
|
||||
|
||||
rank_photos = pkgs.callPackage ./pkgs/rank_photos { };
|
||||
JAVMovieScraper = pkgs.callPackage ./pkgs/JAVMovieScraper { };
|
||||
vcsi = pkgs.callPackage ./pkgs/vcsi {};
|
||||
|
||||
janus = pkgs.libsForQt5.callPackage ./pkgs/JanusVR/client { };
|
||||
grav1 = pkgs.callPackage ./pkgs/grav1/server.nix { wsgiserver = wsgiserver; setuptools = pkgs.python3Packages.setuptools; };
|
||||
grav1c = pkgs.callPackage ./pkgs/grav1/client.nix { };
|
||||
|
||||
av1client = pkgs.callPackage ./pkgs/av1master/client.nix { };
|
||||
|
||||
radical-native = pkgs.callPackage ./pkgs/radical-native { };
|
||||
photini = pkgs.libsForQt5.callPackage ./pkgs/photini { };
|
||||
|
||||
plotbitrate = pkgs.callPackage ./pkgs/plotbitrate { };
|
||||
|
||||
mangohud = pkgs.callPackage ./pkgs/MangoHUD { };
|
||||
grav1 = pkgs.callPackage ./pkgs/grav1/server.nix { wsgiserver = wsgiserver; setuptools = pkgs.python3Packages.setuptools; };
|
||||
grav1c = pkgs.callPackage ./pkgs/grav1/client.nix { };
|
||||
|
||||
botamusique = pkgs.callPackage ./pkgs/botamusique { };
|
||||
|
||||
mesloNFp10k = pkgs.callPackage ./pkgs/fonts/MesloNFp10k.nix { };
|
||||
|
||||
wallpapers = pkgs.callPackage ./pkgs/wallpapers/monogatari { };
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
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
|
||||
+++ b/src/main/java/moviescraper/doctord/controller/amalgamation/AllAmalgamationOrderingPreferences.java
|
||||
@@ -29,7 +29,8 @@ import moviescraper.doctord.controller.siteparsingprofile.specific.TheMovieDatab
|
||||
public class AllAmalgamationOrderingPreferences {
|
||||
|
||||
Map<ScraperGroupName, ScraperGroupAmalgamationPreference> allAmalgamationOrderingPreferences;
|
||||
- private static final String settingsFileName = "AmalgamationSettings.json";
|
||||
+ private final static String folderNameOfSettings = (System.getenv("XDG_CONFIG_HOME") != null ? System.getenv("XDG_CONFIG_HOME") : System.getenv("HOME")) + "/.config/JAVMovieSraper";
|
||||
+ private static final String settingsFileName = folderNameOfSettings + "/AmalgamationSettings.json";
|
||||
|
||||
public AllAmalgamationOrderingPreferences() {
|
||||
allAmalgamationOrderingPreferences = new Hashtable<>();
|
||||
@@ -89,7 +90,9 @@ public class AllAmalgamationOrderingPreferences {
|
||||
}
|
||||
|
||||
public void saveToPreferencesFile() {
|
||||
- try (FileOutputStream outputStream = new FileOutputStream(settingsFileName); JsonWriter jw = new JsonWriter(outputStream);) {
|
||||
+ File f = new File(settingsFileName);
|
||||
+ f.getParentFile().mkdirs();
|
||||
+ try (FileOutputStream outputStream = new FileOutputStream(f); JsonWriter jw = new JsonWriter(outputStream);) {
|
||||
jw.write(this);
|
||||
System.out.println("Saved amalgamation preferences to " + settingsFileName);
|
||||
} catch (IOException e1) {
|
||||
diff --git a/src/main/java/moviescraper/doctord/model/preferences/Settings.java b/src/main/java/moviescraper/doctord/model/preferences/Settings.java
|
||||
index 5810bf3..84fdde2 100644
|
||||
--- a/src/main/java/moviescraper/doctord/model/preferences/Settings.java
|
||||
+++ b/src/main/java/moviescraper/doctord/model/preferences/Settings.java
|
||||
@@ -3,6 +3,7 @@ package moviescraper.doctord.model.preferences;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
+import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.InvalidPropertiesFormatException;
|
||||
import java.util.Properties;
|
||||
@@ -10,7 +11,8 @@ import java.util.Properties;
|
||||
public class Settings {
|
||||
|
||||
private final static Properties programPreferences = new Properties();
|
||||
- private static final String fileNameOfPreferences = "settings.xml";
|
||||
+ private final static String folderNameOfPreferences = (System.getenv("XDG_CONFIG_HOME") != null ? System.getenv("XDG_CONFIG_HOME") : System.getenv("HOME")) + "/.config/JAVMovieSraper";
|
||||
+ private static final String fileNameOfPreferences = folderNameOfPreferences + "/settings.xml";
|
||||
|
||||
protected interface Key {
|
||||
String getKey();
|
||||
@@ -39,7 +41,9 @@ public class Settings {
|
||||
}
|
||||
|
||||
public static void savePreferences() {
|
||||
- try (FileOutputStream settingsOutputStream = new FileOutputStream(fileNameOfPreferences);) {
|
||||
+ File f = new File(fileNameOfPreferences);
|
||||
+ f.getParentFile().mkdirs();
|
||||
+ try (FileOutputStream settingsOutputStream = new FileOutputStream(f);) {
|
||||
programPreferences.storeToXML(settingsOutputStream, "");
|
||||
} catch (FileNotFoundException e) {
|
||||
// TODO Auto-generated catch block
|
||||
@@ -115,4 +119,4 @@ public class Settings {
|
||||
public String toString() {
|
||||
return programPreferences.toString();
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
--
|
||||
2.19.3
|
||||
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
{ pkgs, fetchFromGitHub, gradleGen, openjdk11}:
|
||||
with pkgs;
|
||||
let
|
||||
buildGradle = callPackage ./gradle-env.nix { gradleGen = gradleGen.override { java = openjdk11; }; };
|
||||
in
|
||||
buildGradle {
|
||||
envSpec = ./gradle-env.json;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DoctorD1501";
|
||||
repo = "JAVMovieScraper";
|
||||
rev = "fcd695b2981d36aea01c9153ee2ef1c27cd42c78";
|
||||
sha256 = "0qwdzyfmscjj75jyh9mnk1rlmy12fnnsqbhvp9xdsnfhwy78x6xm";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-disable_spotless.patch
|
||||
./0002-respectXDG.patch
|
||||
./0003-disable-codacy.patch
|
||||
];
|
||||
|
||||
gradleFlags = [ "DistTar" ];
|
||||
|
||||
buildInputs = [ openjdk11 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
tar xvf ./build/distributions/source--1.tar
|
||||
cd source--1/
|
||||
cp -r ./lib $out
|
||||
cat ./bin/source | sed 's~$JAVA_HOME~${openjdk11}~' > $out/bin/JAVMovieScraper
|
||||
chmod +x $out/bin/JAVMovieScraper
|
||||
'';
|
||||
|
||||
meta = with pkgs.stdenv.lib; {
|
||||
broken = true;
|
||||
description = "A program to fetch metadata for Japanese Adult Video";
|
||||
homepage = "https://github.com/DoctorD1501/JAVMovieScraper";
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,271 +0,0 @@
|
|||
# This file is generated by gradle2nix.
|
||||
#
|
||||
# Example usage (e.g. in default.nix):
|
||||
#
|
||||
# with (import <nixpkgs> {});
|
||||
# let
|
||||
# buildGradle = callPackage ./gradleEnv.nix {};
|
||||
# in
|
||||
# buildGradle {
|
||||
# envSpec = ./gradle-env.json;
|
||||
#
|
||||
# src = ./.;
|
||||
#
|
||||
# gradleFlags = [ "installDist" ];
|
||||
#
|
||||
# installPhase = ''
|
||||
# mkdir -p $out
|
||||
# cp -r app/build/install/myproject $out
|
||||
# '';
|
||||
# }
|
||||
|
||||
{ stdenv, buildEnv, fetchurl, gradleGen, writeText, writeTextDir }:
|
||||
|
||||
{ envSpec
|
||||
, pname ? null
|
||||
, version ? null
|
||||
, enableParallelBuilding ? true
|
||||
, gradleFlags ? [ "build" ]
|
||||
, gradlePackage ? null
|
||||
, enableDebug ? false
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
inherit (builtins)
|
||||
filter sort replaceStrings attrValues match fromJSON
|
||||
concatStringsSep;
|
||||
|
||||
inherit (stdenv.lib)
|
||||
versionOlder unique mapAttrs last concatMapStringsSep removeSuffix
|
||||
optionalString groupBy' readFile hasSuffix;
|
||||
|
||||
mkDep = depSpec: stdenv.mkDerivation {
|
||||
inherit (depSpec) name;
|
||||
|
||||
src = fetchurl {
|
||||
inherit (depSpec) urls sha256;
|
||||
};
|
||||
|
||||
phases = "installPhase";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/${depSpec.path}
|
||||
ln -s $src $out/${depSpec.path}/${depSpec.name}
|
||||
'';
|
||||
};
|
||||
|
||||
mkModuleMetadata = deps:
|
||||
let
|
||||
ids = filter
|
||||
(id: id.type == "pom")
|
||||
(map (dep: dep.id) deps);
|
||||
|
||||
modules = groupBy'
|
||||
(meta: id:
|
||||
let
|
||||
isNewer = versionOlder meta.latest id.version;
|
||||
isNewerRelease =
|
||||
!(hasSuffix "-SNAPSHOT" id.version) &&
|
||||
versionOlder meta.release id.version;
|
||||
in {
|
||||
groupId = id.group;
|
||||
artifactId = id.name;
|
||||
latest = if isNewer then id.version else meta.latest;
|
||||
release = if isNewerRelease then id.version else meta.release;
|
||||
versions = meta.versions ++ [id.version];
|
||||
}
|
||||
)
|
||||
{
|
||||
latest = "";
|
||||
release = "";
|
||||
versions = [];
|
||||
}
|
||||
(id: "${replaceStrings ["."] ["/"] id.group}/${id.name}/maven-metadata.xml")
|
||||
ids;
|
||||
|
||||
in
|
||||
attrValues (mapAttrs (path: meta:
|
||||
let
|
||||
versions' = sort versionOlder (unique meta.versions);
|
||||
in
|
||||
with meta; writeTextDir path ''
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata modelVersion="1.1">
|
||||
<groupId>${groupId}</groupId>
|
||||
<artifactId>${artifactId}</artifactId>
|
||||
<versioning>
|
||||
${optionalString (latest != "") "<latest>${latest}</latest>"}
|
||||
${optionalString (release != "") "<release>${release}</release>"}
|
||||
<versions>
|
||||
${concatMapStringsSep "\n " (v: "<version>${v}</version>") versions'}
|
||||
</versions>
|
||||
</versioning>
|
||||
</metadata>
|
||||
''
|
||||
) modules);
|
||||
|
||||
mkSnapshotMetadata = deps:
|
||||
let
|
||||
snapshotDeps = filter (dep: dep ? build && dep ? timestamp) deps;
|
||||
|
||||
modules = groupBy'
|
||||
(meta: dep:
|
||||
let
|
||||
id = dep.id;
|
||||
isNewer = dep.build > meta.buildNumber;
|
||||
# Timestamp values can be bogus, e.g. jitpack.io
|
||||
updated = if (match "[0-9]{8}\.[0-9]{6}" dep.timestamp) != null
|
||||
then replaceStrings ["."] [""] dep.timestamp
|
||||
else "";
|
||||
in {
|
||||
groupId = id.group;
|
||||
artifactId = id.name;
|
||||
version = id.version;
|
||||
timestamp = if isNewer then dep.timestamp else meta.timestamp;
|
||||
buildNumber = if isNewer then dep.build else meta.buildNumber;
|
||||
lastUpdated = if isNewer then updated else meta.lastUpdated;
|
||||
versions = meta.versions or [] ++ [{
|
||||
classifier = id.classifier or "";
|
||||
extension = id.extension;
|
||||
value = "${removeSuffix "-SNAPSHOT" id.version}-${dep.timestamp}-${toString dep.build}";
|
||||
updated = updated;
|
||||
}];
|
||||
}
|
||||
)
|
||||
{
|
||||
timestamp = "";
|
||||
buildNumber = -1;
|
||||
lastUpdated = "";
|
||||
}
|
||||
(dep: "${replaceStrings ["."] ["/"] dep.id.group}/${dep.id.name}/${dep.id.version}/maven-metadata.xml")
|
||||
snapshotDeps;
|
||||
|
||||
mkSnapshotVersion = version: ''
|
||||
<snapshotVersion>
|
||||
${optionalString (version.classifier != "") "<classifier>${version.classifier}</classifier>"}
|
||||
<extension>${version.extension}</extension>
|
||||
<value>${version.value}</value>
|
||||
${optionalString (version.updated != "") "<updated>${version.updated}</updated>"}
|
||||
</snapshotVersion>
|
||||
'';
|
||||
|
||||
in
|
||||
attrValues (mapAttrs (path: meta:
|
||||
with meta; writeTextDir path ''
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata modelVersion="1.1">
|
||||
<groupId>${groupId}</groupId>
|
||||
<artifactId>${artifactId}</artifactId>
|
||||
<version>${version}</version>
|
||||
<versioning>
|
||||
<snapshot>
|
||||
${optionalString (timestamp != "") "<timestamp>${timestamp}</timestamp>"}
|
||||
${optionalString (buildNumber != -1) "<buildNumber>${toString buildNumber}</buildNumber>"}
|
||||
</snapshot>
|
||||
${optionalString (lastUpdated != "") "<lastUpdated>${lastUpdated}</lastUpdated>"}
|
||||
<snapshotVersions>
|
||||
${concatMapStringsSep "\n " mkSnapshotVersion versions}
|
||||
</snapshotVersions>
|
||||
</versioning>
|
||||
</metadata>
|
||||
''
|
||||
) modules);
|
||||
|
||||
mkRepo = project: type: deps: buildEnv {
|
||||
name = "${project}-gradle-${type}-env";
|
||||
paths = map mkDep deps ++ mkModuleMetadata deps ++ mkSnapshotMetadata deps;
|
||||
};
|
||||
|
||||
mkInitScript = projectSpec:
|
||||
let
|
||||
repos = mapAttrs (mkRepo projectSpec.name) projectSpec.dependencies;
|
||||
in
|
||||
writeText "init.gradle" ''
|
||||
static def offlineRepo(RepositoryHandler repositories, String env, String path) {
|
||||
repositories.clear()
|
||||
repositories.maven {
|
||||
name "Nix''${env.capitalize()}MavenOffline"
|
||||
url path
|
||||
metadataSources {
|
||||
it.gradleMetadata()
|
||||
it.mavenPom()
|
||||
it.artifact()
|
||||
}
|
||||
}
|
||||
repositories.ivy {
|
||||
name "Nix''${env.capitalize()}IvyOffline"
|
||||
url path
|
||||
layout "maven"
|
||||
metadataSources {
|
||||
it.gradleMetadata()
|
||||
it.ivyDescriptor()
|
||||
it.artifact()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gradle.settingsEvaluated {
|
||||
offlineRepo(it.pluginManagement.repositories, "plugin", "${repos.plugin}")
|
||||
}
|
||||
|
||||
gradle.projectsLoaded {
|
||||
allprojects {
|
||||
buildscript {
|
||||
offlineRepo(repositories, "buildscript", "${repos.buildscript}")
|
||||
}
|
||||
offlineRepo(repositories, "project", "${repos.project}")
|
||||
}
|
||||
}
|
||||
'';
|
||||
|
||||
mkGradle = gradleSpec:
|
||||
gradleGen.gradleGen {
|
||||
inherit (gradleSpec) nativeVersion;
|
||||
|
||||
name = "gradle-${gradleSpec.version}-${gradleSpec.type}";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (gradleSpec) url sha256;
|
||||
};
|
||||
};
|
||||
|
||||
mkProjectEnv = projectSpec: {
|
||||
inherit (projectSpec) name version;
|
||||
initScript = mkInitScript projectSpec;
|
||||
gradle = args.gradlePackage or mkGradle projectSpec.gradle;
|
||||
};
|
||||
|
||||
gradleEnv = mapAttrs
|
||||
(_: p: mkProjectEnv p)
|
||||
(fromJSON (readFile envSpec));
|
||||
|
||||
projectEnv = gradleEnv."";
|
||||
pname = args.pname or projectEnv.name;
|
||||
version = args.version or projectEnv.version;
|
||||
|
||||
in stdenv.mkDerivation (args // {
|
||||
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ projectEnv.gradle ];
|
||||
|
||||
buildPhase = args.buildPhase or ''
|
||||
runHook preBuild
|
||||
|
||||
(
|
||||
set -x
|
||||
env \
|
||||
"GRADLE_USER_HOME=$(mktemp -d)" \
|
||||
gradle --offline --no-daemon --no-build-cache \
|
||||
--info --full-stacktrace --warning-mode=all \
|
||||
${optionalString enableParallelBuilding "--parallel"} \
|
||||
${optionalString enableDebug "-Dorg.gradle.debug=true"} \
|
||||
--init-script ${projectEnv.initScript} \
|
||||
${concatStringsSep " " gradleFlags}
|
||||
)
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
})
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub,
|
||||
bullet, libopus, vlc, openal, assimp, libvorbis,
|
||||
qtbase, qt5, mesa_glu, mesa, tree, git, git-lfs, zlib}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "janus";
|
||||
version = "66.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janusvr";
|
||||
repo = "janus";
|
||||
rev = "ed2c4686e9f255f3381d9876886ed73040e85897";
|
||||
sha256 = "0x0p1i5mzv5b5krj9zick7yb2iiylvj0p3syq6d7yf23yyxnaxxb";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
tree
|
||||
mesa_glu
|
||||
mesa
|
||||
vlc
|
||||
qt5.qmake
|
||||
qt5.qtwebsockets
|
||||
qt5.qtwebengine
|
||||
qt5.qtscript
|
||||
bullet
|
||||
libopus
|
||||
libvorbis
|
||||
openal
|
||||
assimp
|
||||
zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
# pkgconfig
|
||||
git
|
||||
git-lfs
|
||||
];
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${bullet}/include/bullet"
|
||||
export BUILD_DIR="dist/linux/"
|
||||
|
||||
#qmake FireBox.pro -spec linux-g++ CONFIG+=release CONFIG+=force_debug_info
|
||||
|
||||
touch riftid.txt
|
||||
'';
|
||||
|
||||
# buildPhase = ''
|
||||
# make
|
||||
# '';
|
||||
|
||||
postBuild = ''
|
||||
find . -name "*openvr*"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
cp -v janusvr $out/bin
|
||||
cp -v dependencies/linux/libopenvr_api.so $out/lib
|
||||
cp -r -v assets $out/bin/assets
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "VR Social app like the web";
|
||||
broken = false;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
{ stdenv, lib, fetchFromGitHub
|
||||
, pkgconfig, ninja, meson
|
||||
, python3Packages, glslang, libglvnd
|
||||
, xorg, git, vulkan-loader, vulkan-headers, mesa }:
|
||||
|
||||
let
|
||||
version = "0.3.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mangohud";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
owner = "flightlessmango";
|
||||
repo = "MangoHud";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sh5kvx3ww0m30zcqc1zjhcw8sqdzv6ay41fb35m7p07f82n95ys";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Dappend_libdir_mangohud=false"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libglvnd glslang python3Packages.Mako
|
||||
xorg.libX11 vulkan-loader vulkan-headers mesa
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig meson ninja
|
||||
python3Packages.python python3Packages.Mako
|
||||
git
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
ln -sf "${vulkan-headers}/share/vulkan/registry" ./modules/Vulkan-Headers/
|
||||
ln -sf "${vulkan-headers}/include" ./modules/Vulkan-Headers/
|
||||
'';
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
{
|
||||
lib, stdenv, fetchFromGitLab, makeWrapper,
|
||||
bash, ffmpeg, libaom, libvmaf, curl, jq, coreutils,
|
||||
cacert, shipCACerts ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "av1client";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.dodsorf.as";
|
||||
owner = "dandellion";
|
||||
repo = "av1master";
|
||||
rev = "ecf32d4045e90a524917eaad202ddb6f249f7d28";
|
||||
sha256 = "1wzx4mfhhd309a2gdkmqmnmj47g9ncv40d0ynj1hnpimjsw29510";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ bash ffmpeg libaom libvmaf curl jq coreutils cacert ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp src/static/client.sh $out/bin/av1client
|
||||
chmod +x $out/bin/av1client
|
||||
|
||||
${if shipCACerts == true
|
||||
then
|
||||
"sed -i \'s,curl,curl --cacert " + cacert + "/etc/ssl/certs/ca-bundle.crt" + ",\' $out/bin/av1client"
|
||||
else
|
||||
""
|
||||
}
|
||||
|
||||
wrapProgram $out/bin/av1client \
|
||||
--prefix PATH : ${lib.makeBinPath [ffmpeg libaom curl jq coreutils]}
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
{ fetchFromGitHub, python3, python3Packages, ffmpeg, opusTools }:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages (pythonPackages: with pythonPackages; [
|
||||
opuslib
|
||||
protobuf
|
||||
flask
|
||||
youtube-dl
|
||||
magic
|
||||
pillow
|
||||
mutagen
|
||||
requests
|
||||
packaging
|
||||
]);
|
||||
in
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "botamusique";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azlux";
|
||||
repo = "botamusique";
|
||||
fetchSubmodules = true;
|
||||
rev = "${version}";
|
||||
sha256 = "0fmdxi8fsi3qqx9f8sjlnml656l46dx93l7amhhp6zvpnmr6fl1n";
|
||||
};
|
||||
|
||||
buildInputs = [ ffmpeg opusTools ];
|
||||
|
||||
meta = {
|
||||
broken = true;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv, fetchFromGitHub, gnuplot, ruby }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "eplot-unstable-2018-09-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chriswolfvision";
|
||||
repo = "eplot";
|
||||
rev = "77bbe535f08a4377a7d86f11a21a726b06470323";
|
||||
sha256 = "0y81dbvzmybv9zgvcfw9kzbn0d5sqs6y2hqzq2klsqchcna4b1dn";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp eplot ec $out/bin/
|
||||
chmod +x $out/bin/*
|
||||
|
||||
sed -i -e "s|gnuplot -persist|${gnuplot}/bin/gnuplot -persist|" "$out/bin/eplot"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Create plots quickly with gnuplot";
|
||||
longDescription = ''
|
||||
eplot ("easy gnuplot") is a ruby script which allows to pipe data easily
|
||||
through gnuplot and create plots quickly, which can be saved in
|
||||
postscript, PDF, PNG or EMF files. Plotting of multiple files into a
|
||||
single diagram is supported.
|
||||
|
||||
This package also includes the complementary 'ec' tool (say "extract
|
||||
column").
|
||||
'';
|
||||
homepage = http://liris.cnrs.fr/christian.wolf/software/eplot/;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -14,14 +14,14 @@ stdenv.mkDerivation {
|
|||
pname = "grav1";
|
||||
version = "0.0.0-20200708";
|
||||
|
||||
# src = fetchFromGitHub {
|
||||
# owner = "wwww-wwww";
|
||||
# repo = "grav1";
|
||||
# rev = "975e16d7fedc2d4f012c694cb5b1b0876c3cac01";
|
||||
# sha256 = "11vingnczwy7wxrzp0hqij0jwwzbwjjd8l35wk2zps28npazaly3";
|
||||
# };
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwww-wwww";
|
||||
repo = "grav1";
|
||||
rev = "975e16d7fedc2d4f012c694cb5b1b0876c3cac01";
|
||||
sha256 = "11vingnczwy7wxrzp0hqij0jwwzbwjjd8l35wk2zps28npazaly3";
|
||||
};
|
||||
|
||||
src = ./grav1;
|
||||
# src = ./grav1;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ pythonEnv ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
fetchFromGitHub, python3, python3Packages, gexiv2, gobject-introspection, wrapGAppsHook, qtbase, qt5, ffmpeg,
|
||||
enableSpellCheck ? false, enableFlickr ? false, enableGPhotos ? false
|
||||
enableSpellCheck ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
}:
|
||||
|
||||
let
|
||||
|
||||
host =
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "radical-native";
|
||||
|
|
@ -35,13 +34,8 @@ let
|
|||
}
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
buildEnv {
|
||||
|
||||
name = "radical-nativeFull";
|
||||
|
||||
paths = [ host manifest ];
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue