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: 81487f73eb5e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2455b2e3091d
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 4, 2019

  1. cbc: 2.10.2 -> 2.10.3

    @orivej
    orivej committed Oct 4, 2019
    Copy the full SHA
    3dc7084 View commit details

  2. or-tools: 7.0 -> 7.3

    @orivej
    orivej committed Oct 4, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2455b2e View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/cbc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "cbc";
version = "2.10.2";
version = "2.10.3";

src = fetchurl {
url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz";
sha256 = "0frbxkh6nbh46kaxsx5bmzridgip3v7aq75l8yak5npiiq4jlwv3";
sha256 = "1zzcg40ky5v96s7br2hqlkqdspwrn43kf3757g6c35wl29bq6f5d";
};

configureFlags = [ "-C" ];
5 changes: 5 additions & 0 deletions pkgs/development/libraries/science/math/or-tools/build.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
--- a/makefiles/Makefile.python.mk
+++ b/makefiles/Makefile.python.mk
@@ -1070 +1070 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/data: $(PYDATA_LIBS) | $(PYPI_ARCHIVE_T
-$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYUTIL_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
+$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYSORTED_INTERVAL_LIST_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
11 changes: 8 additions & 3 deletions pkgs/development/libraries/science/math/or-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,15 +5,20 @@

stdenv.mkDerivation rec {
pname = "or-tools";
version = "v7.0";
version = "7.3";

src = fetchFromGitHub {
owner = "google";
repo = "or-tools";
rev = version;
sha256 = "09rs2j3w4ljw9qhhnsjlvfii297njjszwvkbgj1i6kns3wnlr7cp";
rev = "v${version}";
sha256 = "0q06vxmds6nm3dpjw4y5jzr8j98qgfb9i8pbm9pfhmqigv791hwc";
};

patches = [
./build.patch # https://github.com/google/or-tools/pull/1619
./protobuf.patch # Otherwise it tries to install protobuf from pypi.
];

# The original build system uses cmake which does things like pull
# in dependencies through git and Makefile creation time. We
# obviously don't want to do this so instead we provide the
10 changes: 10 additions & 0 deletions pkgs/development/libraries/science/math/or-tools/protobuf.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/makefiles/Makefile.third_party.unix.mk
+++ b/makefiles/Makefile.third_party.unix.mk
@@ -24,1 +24,1 @@ GLOG_TAG = 0.4.0
-PROTOBUF_TAG = 3.9.0
+PROTOBUF_TAG = 3.7.0
--- a/makefiles/Makefile.third_party.win.mk
+++ b/makefiles/Makefile.third_party.win.mk
@@ -40 +40 @@ GLOG_TAG = 0.4.0
-PROTOBUF_TAG = 3.9.0
+PROTOBUF_TAG = 3.7.0