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

Commits on Sep 27, 2019

  1. python3Packages.dotnetcore2: 2.1.8.1 -> 2.1.9

    Jonathan Ringer committed Sep 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    nolmoonen Nol Moonen
    GPG key ID: 486F753FC25B6289
    Verified
    Learn about vigilant mode
    Copy the full SHA
    91ea039 View commit details

Commits on Sep 28, 2019

  1. Merge pull request #69680 from jonringer/bump-dotnetcore2 

    python3Packages.dotnetcore2: 2.1.8.1 -> 2.1.9
    @marsam
    marsam authored Sep 28, 2019
    Copy the full SHA
    e1f6775 View commit details
Showing with 7 additions and 4 deletions.
  1. +2 −2 pkgs/development/python-modules/dotnetcore2/default.nix
  2. +5 −2 pkgs/development/python-modules/dotnetcore2/runtime.patch
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/dotnetcore2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,15 +7,15 @@

buildPythonPackage rec {
pname = "dotnetcore2";
version = "2.1.8.1";
version = "2.1.9";
format = "wheel";
disabled = isPy27;

src = fetchPypi {
inherit pname version format;
python = "py3";
platform = "manylinux1_x86_64";
sha256 = "13zrff5j767d3f8drl397sjhl28winsrfa8pa20svf00xfcsy34s";
sha256 = "0h1igixk84md68z7gwj1vd6ki4d5drxh0ih5zww8xcr3qh5r0drb";
};

nativeBuildInputs = [ unzip ];
7 changes: 5 additions & 2 deletions pkgs/development/python-modules/dotnetcore2/runtime.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
diff a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
diff --git a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
index 475e2b4..5b578ec 100644
--- a/dotnetcore2/runtime.py
+++ b/dotnetcore2/runtime.py
@@ -39,13 +39,13 @@ def _get_bin_folder() -> str:
@@ -41,6 +41,7 @@ def _get_bin_folder() -> str:


def get_runtime_path():
+ return "@dotnet@/dotnet"
search_string = os.path.join(_get_bin_folder(), 'dotnet*')
matches = [f for f in glob.glob(search_string, recursive=True)]
return matches[0]
@@ -96,8 +97,7 @@ class _FileLock():


def ensure_dependencies() -> Optional[str]:
- if dist is None: