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

Commits on Aug 8, 2018

  1. cgit: 1.1 -> 1.2.1 

    Fixes CVE-2018-14912.

(cherry picked from commit 970d5ef)

Trivial conflict from commit 57bccb3
("treewide: http -> https sources (#42676)") on master branch.
    @bjornfor
    bjornfor committed Aug 8, 2018
    Copy the full SHA
    0689d27 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/applications/version-management/git-and-tools/cgit/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/git-and-tools/cgit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,19 +6,19 @@

stdenv.mkDerivation rec {
name = "cgit-${version}";
version = "1.1";
version = "1.2.1";

src = fetchurl {
url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288";
sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w";
};

# cgit is tightly coupled with git and needs a git source tree to build.
# IMPORTANT: Remember to check which git version cgit needs on every version
# bump (look for "GIT_VER" in the top-level Makefile).
gitSrc = fetchurl {
url = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz";
sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz";
sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
};

nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];