Unverified Commit 4daf3774 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

projectlibre: 1.9.3 -> 1.9.8, move to pkgs/by-name (#405413)

parents 29a12c0a 56ddafb2

pkgs/applications/misc/projectlibre/default.nix→pkgs/by-name/pr/projectlibre/package.nix

+10 −10
Original line number Diff line number Diff line
@@ -2,30 +2,32 @@ 
  lib,

  stdenv,

  fetchgit,



  ant,

  jdk,

  stripJavaArchivesHook,

  makeWrapper,

  jre,

  stripJavaArchivesHook,



  coreutils,

  jre,

  which,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "projectlibre";

  version = "1.9.3";

  version = "1.9.8";



  src = fetchgit {

    url = "https://git.code.sf.net/p/projectlibre/code";

    rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16"; # version 1.9.3 was not tagged

    hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU=";

    rev = "0530be227f4a10c5545cce8d3db20ac5a4d76a66"; # version 1.9.8 was not tagged

    hash = "sha256-eGoPtHy1XfPLnJXNDOMcek4spNKkNyZdby0IsZFZfME=";

  };



  nativeBuildInputs = [

    ant

    jdk

    stripJavaArchivesHook

    makeWrapper

    stripJavaArchivesHook

  ];



  runtimeDeps = [
@@ -34,8 +36,6 @@ stdenv.mkDerivation (finalAttrs: { 
    which

  ];



  env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8";



  buildPhase = ''

    runHook preBuild

    ant -f projectlibre_build/build.xml

pkgs/top-level/all-packages.nix

+0 −5
Original line number Diff line number Diff line
@@ -4234,11 +4234,6 @@ with pkgs; 














  polaris-web = callPackage ../servers/polaris/web.nix { };



























  projectlibre = callPackage ../applications/misc/projectlibre {













    jre = jre8;













    jdk = jdk8;













  };



























  projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { };





























  proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };