diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-02 13:20:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-02 13:20:59 +0000 |
commit | 08ac9ef5414a886c902f4c8e0cc4f1a2f35322d1 (patch) | |
tree | 573f221a926793f3572fb7b5aba1aea5dcf13b8d /pkgs | |
parent | 4182c8fca0e25fb80cc80c2207f335280e25914a (diff) | |
parent | a71eec4269298dd5943642f6a8fae4549b52bd27 (diff) | |
download | nixpkgs-08ac9ef5414a886c902f4c8e0cc4f1a2f35322d1.tar nixpkgs-08ac9ef5414a886c902f4c8e0cc4f1a2f35322d1.tar.gz nixpkgs-08ac9ef5414a886c902f4c8e0cc4f1a2f35322d1.tar.bz2 nixpkgs-08ac9ef5414a886c902f4c8e0cc4f1a2f35322d1.tar.lz nixpkgs-08ac9ef5414a886c902f4c8e0cc4f1a2f35322d1.tar.xz nixpkgs-08ac9ef5414a886c902f4c8e0cc4f1a2f35322d1.tar.zst nixpkgs-08ac9ef5414a886c902f4c8e0cc4f1a2f35322d1.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/logic/abc/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/nextpnr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/yosys/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/icon-lang/default.nix | 41 | ||||
-rw-r--r-- | pkgs/development/tools/trellis/default.nix | 13 |
5 files changed, 40 insertions, 34 deletions
diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 29d727d988e..426c5a9df32 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2020.06.22"; + version = "2020.11.24"; src = fetchFromGitHub { - owner = "berkeley-abc"; + owner = "yosyshq"; repo = "abc"; - rev = "341db25668f3054c87aa3372c794e180f629af5d"; - sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s"; + rev = "4f5f73d18b137930fb3048c0b385c82fa078db38"; + sha256 = "0z1kp223kix7i4r7mbj2bzawkdzc55nsgc41m85dmbajl9fsj1m0"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 1f5c6a3d4c4..664ceb79636 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.11.10"; + version = "2020.12.01"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "cf331ca2a7fa92d3414fabf003ce6fc7b515f76b"; - sha256 = "0ka8ncfq3v8v70m3gwb3nd2rb39sy4vz0lx9hi277cbdsprmf55j"; + rev = "868902fbdf0b476bdccf4d25cbb80ba602d2cc11"; + sha256 = "1kb5lhixb7f4q800gjyw9xm9ff1yaq3pgna17f5f0bw6b4ds56zc"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index f34c4fb7fe1..b16d76304e4 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+3675"; + version = "0.9+3715"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "71ca9a825309635511b64b3ec40e5e5e9b6ad49b"; - sha256 = "03jlhfvm5rxx8yybf94nqd3ld2y6brp8r0k6gfi56chv3iqqavy3"; + rev = "d021f4b4003bb7a374038134c65edd3f67473a92"; + sha256 = "0dgdpigqg8mwkry4233p6z6myjnrb1rq32873yhdfwvwqq230x51"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 8190dc0f29f..02992e71871 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,32 +1,41 @@ -{ stdenv, fetchFromGitHub -, libX11, libXt +{ stdenv +, fetchFromGitHub +, libX11 +, libXt , withGraphics ? true }: stdenv.mkDerivation rec { pname = "icon-lang"; - version = "9.5.20i"; - + version = "unstable-2020-02-05"; src = fetchFromGitHub { owner = "gtownsend"; repo = "icon"; - rev = "v${version}"; - sha256 = "0072b3jk8mc94w818z8bklhjdf9rf0d9a7lkvw40pz3niy7zv84s"; + rev = "829cff33de4a21546fb269de3ef5acd7b4f0c0c7"; + sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2"; }; buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; - configurePhase = let - target = if withGraphics then "X-Configure" else "Configure"; - platform = if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macintosh" - else if stdenv.isBSD then "bsd" - else if stdenv.isCygwin then "cygwin" - else if stdenv.isSunOS then "solaris" - else throw "unsupported system"; - in "make ${target} name=${platform}"; + configurePhase = + let + target = if withGraphics then "X-Configure" else "Configure"; + platform = + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macintosh" + else if stdenv.isBSD then "bsd" + else if stdenv.isCygwin then "cygwin" + else if stdenv.isSunOS then "solaris" + else throw "unsupported system"; + in + "make ${target} name=${platform}"; - installPhase = "make Install dest=$out"; + installPhase = '' + make Install dest=$out + rm $out/README + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/icon + ''; meta = with stdenv.lib; { description = ''A very high level general-purpose programming language''; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 89287b2ac4f..c9884a8eacd 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -3,23 +3,20 @@ , cmake }: -let - boostWithPython3 = boost.override { python = python3; enablePython = true; }; -in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.11.07"; + version = "2020.11.25"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-469-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-476-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "b013a135a9b95c18ece559e19aa73ad6c84446c9"; - sha256 = "09bx30jm9bgdxmbxf49a27spg4yd1nk5r5mympq7xi28hq1xwjnf"; + rev = "a441cd9d0390648e96bf27096626eb2c904096de"; + sha256 = "1rsck44n4mf9v3vfac51ksrhcs84s7q297nq1kjkzzvmsx09gd9k"; name = "trellis"; }) @@ -33,7 +30,7 @@ stdenv.mkDerivation rec { ]; sourceRoot = "trellis"; - buildInputs = [ boostWithPython3 ]; + buildInputs = [ boost ]; nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" |