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

Commits on Feb 10, 2020

  1. maintainers: update my name

    @ftrvxmtrx
    ftrvxmtrx committed Feb 10, 2020
    Copy the full SHA
    9e0175e View commit details

  2. yoshimi: 1.6.1 -> 1.7.0.1

    @ftrvxmtrx
    ftrvxmtrx committed Feb 10, 2020
    Copy the full SHA
    6808f48 View commit details

Commits on Feb 28, 2020

  1. Merge pull request #79694 from ftrvxmtrx/yoshimi 

    yoshimi: 1.6.1 -> 1.7.0.1
    @cillianderoiste
    cillianderoiste authored Feb 28, 2020

    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
    ddc2f88 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 maintainers/maintainer-list.nix
  2. +2 −2 pkgs/applications/audio/yoshimi/default.nix
2 changes: 1 addition & 1 deletion maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -2613,7 +2613,7 @@
email = "ftrvxmtrx@gmail.com";
github = "ftrvxmtrx";
githubId = 248148;
name = "Siarhei Zirukin";
name = "Sigrid Solveig Haflínudóttir";
};
fuerbringer = {
email = "severin@fuerbringer.info";
4 changes: 2 additions & 2 deletions pkgs/applications/audio/yoshimi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ assert stdenv ? glibc;

stdenv.mkDerivation rec {
pname = "yoshimi";
version = "1.6.1";
version = "1.7.0.1";

src = fetchurl {
url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2";
sha256 = "044k2pcdsb43znc8q63mc4niggpain7wl9s5c4sgsfmrjh0bjapj";
sha256 = "1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c";
};

buildInputs = [