git.iko.soy/typeable/nixpkgs
on master help sign in
processing: 3.4 -> 3.5.3
commit939cd1bf4c1a9eb633870d76b192e5440429e0c5 authorBen Wolsieffer <benwolsieffer@gmail.com> dateFri 16 Aug 2019, 22:21 (7 years ago) parent33d3777
3 files changed+12−12
pkgs/applications/graphics/processing3/default.nix → pkgs/applications/graphics/processing/default.nix+10−10 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−2
pkgs/applications/graphics/processing3/default.nix → pkgs/applications/graphics/processing/default.nixrenamed+10−10
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
22
33stdenv.mkDerivation rec {
4− version = "3.4";
5− name = "processing3-${version}";
4+ pname = "processing";
5+ version = "3.5.3";
66
77 src = fetchFromGitHub {
88 owner = "processing";
99 repo = "processing";
10− rev = "processing-0265-${version}";
11− sha256 = "12wpxgn2wd5vbasx9584w5yb1s319smq1zh8m7dvp7gkqw9plwp4";
10+ rev = "processing-0269-${version}";
11+ sha256 = "0ajniy3a0i0rx7is46r85yh3ah4zm4ra1gbllmihw9pmnfjgfajn";
1212 };
1313
1414 nativeBuildInputs = [ ant rsync makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml
2424 install -D -m0444 ${fetchurl {
2525 url = http://download.processing.org/reference.zip;
26− sha256 = "0ai0cr62gc7n6y22ki3qibyj1qnlaxv1miqxmmahfk3hpbyfqz9n";
26+ sha256 = "198bpk8mzns6w5h0zdf50wr6iv7sgdi6v7jznj5rbsnpgyilxz35";
2727 }
2828 } ./java/reference.zip
2929
@@ -39,16 +39,16 @@ stdenv.mkDerivation rec {
3939
4040 installPhase = ''
4141 mkdir $out
42− cp -dpR build/linux/work $out/${name}
42+ cp -dpR build/linux/work $out/${pname}
4343
44− rmdir $out/${name}/java
45− ln -s ${jdk} $out/${name}/java
44+ rmdir $out/${pname}/java
45+ ln -s ${jdk} $out/${pname}/java
4646
47− makeWrapper $out/${name}/processing $out/bin/processing \
47+ makeWrapper $out/${pname}/processing $out/bin/processing \
4848 --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
4949 --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
5050 --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
51− makeWrapper $out/${name}/processing-java $out/bin/processing-java \
51+ makeWrapper $out/${pname}/processing-java $out/bin/processing-java \
5252 --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
5353 --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
5454 --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
pkgs/top-level/aliases.nix+1
@@ -274,6 +274,7 @@ mapAliases ({
274274 postgis = postgresqlPackages.postgis;
275275 # end
276276 ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
277+ processing3 = processing; # added 2019-08-16
277278 procps-ng = procps; # added 2018-06-08
278279 pulseaudioLight = pulseaudio; # added 2018-04-25
279280 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
pkgs/top-level/all-packages.nix+1−2
@@ -19919,8 +19919,7 @@ in
1991919919
1992019920 qiv = callPackage ../applications/graphics/qiv { };
1992119921
19922− processing = processing3;
19923− processing3 = callPackage ../applications/graphics/processing3 {
19922+ processing = callPackage ../applications/graphics/processing {
1992419923 jdk = oraclejdk8;
1992519924 };
1992619925