Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 674ab2dffa58
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: add5529b3ee2
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Jul 12, 2020

  1. audacity: fix hash for replaced release tarball 

    Initially the 2.3.3 release was based on the wrong commit by upstream,
later retagged (see [1]). This resulted in resulted in Audacity
complaining it is an alpha release.

This commit changes the hash to the fixed upstream tarball.

[1]: audacity/audacity#421
    @yurkobb
    yurkobb committed Jul 12, 2020
    Copy the full SHA
    38c0a59 View commit details

  2. mutt: 1.13.3 -> 1.14.6

    @rnhmjoj
    rnhmjoj committed Jul 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ddaf14 View commit details

  3. Merge pull request #93020 from yurkobb/nixos-20.03-fix-audacity 

    [20.03] audacity: fix hash for replaced release tarball
    @worldofpeace
    worldofpeace authored Jul 12, 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
    2f92f28 View commit details

Commits on Jul 13, 2020

  1. Merge pull request #93025 from rnhmjoj/mutt-20.03 

    [20.03] mutt: 1.13.3 -> 1.14.6
    @rnhmjoj
    rnhmjoj authored Jul 13, 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
    add5529 View commit details
Showing with 4 additions and 10 deletions.
  1. +1 −1 pkgs/applications/audio/audacity/default.nix
  2. +3 −9 pkgs/applications/networking/mailreaders/mutt/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/audio/audacity/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

src = fetchzip {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "0ddc03dbm4ixy877czmwd03fpjgr3y68bxfgb6n2q6cv4prp30ig";
sha256 = "0707fsnrl4vjalsi21w4blwgz024qhd0w8rdd5j5vpxf5lyk2rbk";
};

preConfigure = /* we prefer system-wide libs */ ''
12 changes: 3 additions & 9 deletions pkgs/applications/networking/mailreaders/mutt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,20 +27,14 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "mutt";
version = "1.13.3";
version = "1.14.6";

src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "0y3ks10mc7m8c7pd4c4j8pj7n5rqcvzrjs8mzldv7z7jnlb30hkq";
sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7";
};

patches = [
# patch for CVE-2020-14093
(fetchpatch {
url = "https://github.com/muttmua/mutt/commit/3e88866dc60b5fa6aaba6fd7c1710c12c1c3cd01.patch";
sha256 = "1md4krh76kjbg6nkyvbpjn6iz17c7m7xvdj6gjvjr7akqjhfw48h";
})
] ++ optional smimeSupport (fetchpatch {
patches = optional smimeSupport (fetchpatch {
url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch";
sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi";
});