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

Commits on Nov 4, 2018

  1. phototonic: 1.7.1 -> 2.1

    @woffs
    woffs committed Nov 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: C4844408C0657052
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fc84be0 View commit details

Commits on Nov 5, 2018

  1. Merge pull request #49751 from woffs/phototonic-2.1 

    phototonic: 1.7.1 -> 2.1
    @pSub
    pSub authored Nov 5, 2018

    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
    c7a5b77 View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −5 pkgs/applications/graphics/phototonic/default.nix
8 changes: 3 additions & 5 deletions pkgs/applications/graphics/phototonic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,13 @@

stdenv.mkDerivation rec {
name = "phototonic-${version}";
version = "1.7.1";
version = "2.1";

src = fetchFromGitHub {
repo = "phototonic";
owner = "oferkv";
# There is currently no tag for 1.7.1 see
# https://github.com/oferkv/phototonic/issues/214
rev = "c37070e4a068570d34ece8de1e48aa0882c80c5b";
sha256 = "1agd3bsrpljd019qrjvlbim5l0bhpx53dhpc0gvyn0wmcdzn92gj";
rev = "v${version}";
sha256 = "0csidmxl1sfmn6gq81vn9f9jckb4swz3sgngnwqa4f75lr6604h7";
};

buildInputs = [ qtbase exiv2 ];