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

Commits on Jan 18, 2018

  1. webkitgtk: 2.18.4 -> 2.18.5 

    CVE-2017-5753
CVE-2017-5715
    @bendlas
    bendlas committed Jan 18, 2018
    Copy the full SHA
    d17dd86 View commit details

  2. leiningen: 2.7.1 -> 2.8.1

    @bendlas
    bendlas committed Jan 18, 2018
    Copy the full SHA
    3d02b91 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/development/libraries/webkitgtk/2.18.nix
  2. +3 −3 pkgs/development/tools/build-managers/leiningen/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/webkitgtk/2.18.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
version = "2.18.4";
version = "2.18.5";

meta = {
description = "Web content rendering engine, GTK+ port";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "1f1j0r996l20cgkvbwpizn7d4yp58cy334b1pvn4kfb5c2dbpdl7";
sha256 = "1f1rsp14gkb2r1mrrxn2cnbs45vg38da27q4cf02zlxmgv680v8c";
};

# see if we can clean this up....
6 changes: 3 additions & 3 deletions pkgs/development/tools/build-managers/leiningen/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,18 +3,18 @@

stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.7.1";
version = "2.8.1";
name = "${pname}-${version}";

src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "0rmshl4xchf3blwvar4q9dpxm9xznn3yzas4vwxqiq3yhapgqkn0";
sha256 = "0wk4m7m66xxx7i3nis08mc8qna7acgcmpim562vdyyrpbxdhj24i";
};

jarsrc = fetchurl {
# NOTE: This is actually a .jar, Github has issues
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
sha256 = "0ivwb1qlxs1hyical0fjgavm9wfkw3f10sk67p5g2p5lpf4pxp1d";
sha256 = "0n3wkb0a9g25r1xq93lskay2lw210qymz2qakjnl5vr5zz3vnjgw";
};

JARNAME = "${name}-standalone.jar";