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

Commits on Dec 5, 2018

  1. cyrus_sasl: remove old patch 

    it was removed with "cyrus_sasl: 2.1.26 -> 2.1.27" b13af1e
but reappeared in broken "Merge staging-next into staging" 9b81c7e
    @thoughtpolice
    volth authored and thoughtpolice committed Dec 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    RobinMalfait Robin Malfait
    GPG key ID: 92F53D68B9041AFE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9d1536 View commit details
Showing with 0 additions and 5 deletions.
  1. +0 −5 pkgs/development/libraries/cyrus-sasl/default.nix
5 changes: 0 additions & 5 deletions pkgs/development/libraries/cyrus-sasl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
patches = [
./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
./cyrus-sasl-ac-try-run-fix.patch
(fetchpatch {
name = "CVE-2013-4122.patch";
url = "mirror://sourceforge/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
})
] ++ lib.optional stdenv.isFreeBSD (
fetchurl {
url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";