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

Commits on Jan 28, 2021

  1. python37Packages.jsonmerge: 1.7.0 -> 1.8.0

    @r-ryantm
    r-ryantm committed Jan 28, 2021
    Copy the full SHA
    6c4b37d View commit details

Commits on Jan 29, 2021

  1. Merge pull request #110993 from r-ryantm/auto-update/python3.7-jsonmerge 

    python37Packages.jsonmerge: 1.7.0 -> 1.8.0
    @marsam
    marsam authored Jan 29, 2021

    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
    4610a9f View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/python-modules/jsonmerge/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/jsonmerge/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

buildPythonPackage rec {
pname = "jsonmerge";
version = "1.7.0";
version = "1.8.0";

src = fetchPypi {
inherit pname version;
sha256 = "2004a421890311176136fb911c339c4bab45984808814feaed6a328c6e211ba2";
sha256 = "a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558";
};

propagatedBuildInputs = [ jsonschema ];