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: b008a0505a12
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: 1d56d73aec21
Choose a head ref
  • 2 commits
  • 2 files changed
  • 3 contributors

Commits on Jul 5, 2020

  1. crispyDoom: fixed CVE-2020-14983 (#92358) 

    (cherry picked from commit 2d24b8b)

Co-authored-by: Sage Raflik <neonfuz@gmail.com>
    @danieldk @neonfuz
    danieldk and neonfuz authored Jul 5, 2020
    Copy the full SHA
    74f2559 View commit details

  2. roundcube: 1.4.6 -> 1.4.7 

    https://github.com/roundcube/roundcubemail/releases/tag/1.4.7
(cherry picked from commit d4cf52c)
    @Ma27
    Ma27 committed Jul 5, 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
    1d56d73 View commit details
Showing with 15 additions and 3 deletions.
  1. +13 −1 pkgs/games/crispy-doom/default.nix
  2. +2 −2 pkgs/servers/roundcube/default.nix
14 changes: 13 additions & 1 deletion pkgs/games/crispy-doom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }:
{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }:

stdenv.mkDerivation rec {
pname = "crispy-doom";
@@ -11,6 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2";
};

patches = [
# Fixes CVE-2020-14983
(fetchpatch {
url = "https://github.com/chocolate-doom/chocolate-doom/commit/f1a8d991aa8a14afcb605cf2f65cd15fda204c56.diff";
sha256 = "1z6pxg9azcqq7g09hjc09d01knd803nhqilkw2kbx8648hil9mgn";
})
(fetchpatch {
url = "https://github.com/chocolate-doom/chocolate-doom/commit/54fb12eeaa7d527defbe65e7e00e37d5feb7c597.diff";
sha256 = "0ww21jn02ld73rkp06f7fqy92jqv8c9q4d1mvsryag1gmvy57znj";
})
];

postPatch = ''
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
'';
4 changes: 2 additions & 2 deletions pkgs/servers/roundcube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.4.6";
version = "1.4.7";

src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "06xxzvjd06r90fxpq9zh9fwylg6sbd26c08rxfd553jikyp5znsm";
sha256 = "1jdcda6102n948l6qzhjsiylnmx5fkgjg2hn17g93x3yzwkmvn16";
};

patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];