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: 3516b2dad23c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 218f12db701f
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 13, 2018

  1. solc: 0.4.25 -> 0.5.0

    @asymmetric
    asymmetric committed Nov 13, 2018
    Copy the full SHA
    4905157 View commit details

Commits on Nov 15, 2018

  1. z3: restrict to x86_64 

    it uses x86-only header:

include <immintrin.h>
          ^~~~~~~~~~~~~
compilation terminated.
src/sat/sat_probing.cpp
make: *** [Makefile:182: util/mpz.o] Error 1
make: *** Waiting for unfinished jobs....
src/sat/sat_parallel.cpp
builder for '/nix/store/vd2wkhic8g77izxv659ackh6hcaamic3-z3-4.8.1.drv' failed with exit code 2
cannot build derivation '/nix/store/h5imnjsf31c45l558gw66vyzb0ickc1m-solc-0.5.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/h5imnjsf31c45l558gw66vyzb0ickc1m-solc-0.5.0.drv' failed
    @Mic92
    Mic92 committed Nov 15, 2018
    Copy the full SHA
    abb0c81 View commit details

  2. Merge pull request #50324 from asymmetric/solc 

    solc: 0.4.25 -> 0.5.0
    @Mic92
    Mic92 authored Nov 15, 2018
    Copy the full SHA
    218f12d View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 pkgs/applications/science/logic/z3/default.nix
  2. +3 −3 pkgs/development/compilers/solc/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/science/logic/z3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
description = "A high-performance theorem prover and SMT solver";
homepage = "https://github.com/Z3Prover/z3";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
platforms = stdenv.lib.platforms.x86_64;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}
6 changes: 3 additions & 3 deletions pkgs/development/compilers/solc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:

let
version = "0.4.25";
rev = "59dbf8f1085b8b92e8b7eb0ce380cbeb642e97eb";
sha256 = "11lss1sldzjg4689c06iw0iivyi9f4zpi4l9za0fgy6k85qz43v9";
version = "0.5.0";
rev = "1d4f565a64988a3400847d2655ca24f73f234bc6";
sha256 = "0phzk2whvgrrf8xpl5pz886glhd5s40y1hbbvq9q3fxf6vc3lisy";
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
jsoncpp = fetchzip {
url = jsoncppURL;