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

Commits on Jul 11, 2020

  1. python3Packages.fx2: unstable-2020-01-25 -> 0.9

    @matthuszagh
    matthuszagh committed Jul 11, 2020
    Copy the full SHA
    e8fe2e6 View commit details

  2. python3Packages.glasgow: unstable-2020-02-08 -> unstable-2020-06-29 

    Includes new analyzer applet.
    @matthuszagh
    matthuszagh committed Jul 11, 2020
    Copy the full SHA
    3a8c2f7 View commit details

  3. Merge pull request #92879 from matthuszagh/glasgow 

    python3Packages.glasgow: unstable-2020-02-08 -> unstable-2020-06-29
    @flokli
    flokli authored Jul 11, 2020
    Copy the full SHA
    9a3c189 View commit details
Showing with 7 additions and 7 deletions.
  1. +4 −4 pkgs/development/python-modules/fx2/default.nix
  2. +3 −3 pkgs/development/python-modules/glasgow/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/fx2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,15 +7,15 @@
, crcmod
}:

buildPythonPackage {
buildPythonPackage rec {
pname = "fx2";
version = "unstable-2020-01-25";
version = "0.9";

src = fetchFromGitHub {
owner = "whitequark";
repo = "libfx2";
rev = "d3e37f640d706aac5e69ae4476f6cd1bd0cd6a4e";
sha256 = "1dsyknjpgf4wjkfr64lln1lcy7qpxdx5x3qglidrcswzv9b3i4fg";
rev = version;
sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk=";
};

nativeBuildInputs = [ sdcc ];
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/glasgow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,15 +18,15 @@

buildPythonPackage rec {
pname = "glasgow";
version = "unstable-2020-02-08";
version = "unstable-2020-06-29";
# python software/setup.py --version
realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}";

src = fetchFromGitHub {
owner = "GlasgowEmbedded";
repo = "glasgow";
rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498";
sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m";
rev = "f885790d7927b893e631c33744622d6ebc18b5e3";
sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk=";
};

nativeBuildInputs = [ setuptools_scm sdcc ];