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

Commits on Aug 6, 2018

  1. gwyddion, ripser: fix derivation name (#44577)

    @symphorien @xeji
    symphorien authored and xeji committed Aug 6, 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
    0ca40a5 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/applications/science/chemistry/gwyddion/default.nix
  2. +1 −1 pkgs/applications/science/math/ripser/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/chemistry/gwyddion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

with stdenv.lib;

let version = "2.48"; in
stdenv.mkDerivation {
name = "gwyddion-${version}";
version = "2.48";
src = fetchurl {
url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz";
url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz";
sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx";
};
nativeBuildInputs = [ pkgconfig ];
2 changes: 1 addition & 1 deletion pkgs/applications/science/math/ripser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,10 +13,10 @@ assert useGoogleHashmap -> sparsehash != null;

let
inherit (stdenv.lib) optional;
version = "1.0";
in
stdenv.mkDerivation {
name = "ripser-${version}";
version = "1.0";

src = fetchFromGitHub {
owner = "Ripser";