Merge pull request #72708 from rnhmjoj/sb

antimony: 2018-10-20 -> 2019-10-30
This commit is contained in:
Renaud 2019-11-07 23:21:30 +01:00 committed by GitHub
commit 5076d18d60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions

View File

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, libpng, python3 { stdenv, fetchFromGitHub, libpng, python3
, libGLU_combined, qtbase, ncurses , libGLU_combined, qtbase, wrapQtAppsHook, ncurses
, cmake, flex, lemon , cmake, flex, lemon
}: }:
let let
gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2"; gitRev = "6dfe6822e0279a4cc2f1c60e85b42212627285fe";
gitBranch = "develop"; gitBranch = "develop";
gitTag = "0.9.3"; gitTag = "0.9.3";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "antimony"; pname = "antimony";
version = "2018-10-20"; version = "2019-10-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mkeeter"; owner = "mkeeter";
repo = "antimony"; repo = "antimony";
rev = gitRev; rev = gitRev;
sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4"; sha256 = "07zlkwlk79czq8dy85b6n3ds3g36l8qy4ix849ady6ia3gm8981j";
}; };
patches = [ ./paths-fix.patch ]; patches = [ ./paths-fix.patch ];
@ -29,7 +29,8 @@ in
buildInputs = [ buildInputs = [
libpng python3 python3.pkgs.boost libpng python3 python3.pkgs.boost
libGLU_combined qtbase ncurses libGLU_combined qtbase wrapQtAppsHook
ncurses
]; ];
nativeBuildInputs = [ cmake flex lemon ]; nativeBuildInputs = [ cmake flex lemon ];
@ -44,7 +45,7 @@ in
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A computer-aided design (CAD) tool from a parallel universe"; description = "A computer-aided design (CAD) tool from a parallel universe";
homepage = "https://github.com/mkeeter/antimony"; homepage = https://github.com/mkeeter/antimony;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ rnhmjoj ]; maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.linux; platforms = platforms.linux;