Author: viric Date: 2010-06-21 20:34:23 +0000 (Mon, 21 Jun 2010) New Revision: 22364
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22364&view=rev Modified: nixpkgs/trunk/pkgs/applications/science/electronics/ngspice/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Updating ngspice Changes: Modified: nixpkgs/trunk/pkgs/applications/science/electronics/ngspice/default.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/science/electronics/ngspice/default.nix 2010-06-21 19:25:20 UTC (rev 22363) +++ nixpkgs/trunk/pkgs/applications/science/electronics/ngspice/default.nix 2010-06-21 20:34:23 UTC (rev 22364) @@ -1,17 +1,22 @@ -args: -args.stdenv.mkDerivation { - name = "ng-spice-rework-15c"; +{stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}: - src = args.fetchurl { - url = mirror://sourceforge/ngspice/ng-spice-rework-15c.tar.gz; - sha256 = "0v0pbdc54ra0s98dz6mhj80n333ggbn4xpf53vi66sd02hcjblmg"; +stdenv.mkDerivation { + name = "ng-spice-rework-21"; + + src = fetchurl { + url = mirror://sourceforge/ngspice/ng-spice-rework-21.tar.gz; + sha256 = "1hmvfl33dszy8xgbixx0zmiz4rdzjhl7lwlwm953jibd4dgx42j5"; }; - buildInputs =(with args; [readline]); + buildInputs = [ readline libX11 bison libICE libXaw libXext ]; + configureFlags = [ "--enable-x" "--with-x" "--with-readline" ]; + meta = { - description = "The Next Generation Spice (Electronic Circuit Simulator)."; - homepage = http://ngspice.sourceforge.net; - license = ["BSD" "GPLv2"]; + description = "The Next Generation Spice (Electronic Circuit Simulator)."; + homepage = http://ngspice.sourceforge.net; + license = ["BSD" "GPLv2"]; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-21 19:25:20 UTC (rev 22363) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-21 20:34:23 UTC (rev 22364) @@ -9543,7 +9543,8 @@ ### SCIENCE / ELECTRONICS ngspice = import ../applications/science/electronics/ngspice { - inherit fetchurl stdenv readline; + inherit fetchurl stdenv readline bison; + inherit (xlibs) libX11 libICE libXaw libXext; }; gtkwave = import ../applications/science/electronics/gtkwave { _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
