Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8b5194ff167e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d39ec23b629
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 7, 2019

  1. antimony: 2018-10-20 -> 2019-10-30 

    (cherry picked from commit 4b62810)
    @rnhmjoj @c0bw3b
    rnhmjoj authored and c0bw3b committed Nov 7, 2019
    Copy the full SHA
    0d39ec2 View commit details
Showing with 7 additions and 6 deletions.
  1. +7 −6 pkgs/applications/graphics/antimony/default.nix
13 changes: 7 additions & 6 deletions pkgs/applications/graphics/antimony/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, libpng, python3
, libGLU_combined, qtbase, ncurses
, libGLU_combined, qtbase, wrapQtAppsHook, ncurses
, cmake, flex, lemon
}:

let
gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2";
gitRev = "6dfe6822e0279a4cc2f1c60e85b42212627285fe";
gitBranch = "develop";
gitTag = "0.9.3";
in
stdenv.mkDerivation {
pname = "antimony";
version = "2018-10-20";
version = "2019-10-30";

src = fetchFromGitHub {
owner = "mkeeter";
repo = "antimony";
rev = gitRev;
sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4";
sha256 = "07zlkwlk79czq8dy85b6n3ds3g36l8qy4ix849ady6ia3gm8981j";
};

patches = [ ./paths-fix.patch ];
@@ -29,7 +29,8 @@ in

buildInputs = [
libpng python3 python3.pkgs.boost
libGLU_combined qtbase ncurses
libGLU_combined qtbase wrapQtAppsHook
ncurses
];

nativeBuildInputs = [ cmake flex lemon ];
@@ -44,7 +45,7 @@ in

meta = with stdenv.lib; {
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;
maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.linux;