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

Commits on May 26, 2017

  1. packer: 0.12.2 -> 1.0.0

    @fpletz
    fpletz committed May 26, 2017
    Copy the full SHA
    963c32f View commit details

  2. webkitgtk: remove unreferenced 2.12 and patch

    @fpletz
    fpletz committed May 26, 2017
    Copy the full SHA
    3d6ed4a View commit details

  3. geolite-legacy: 2016-07-08 -> 2017-05-26

    @fpletz
    fpletz committed May 26, 2017

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    45372b1 View commit details

  4. miniupnpc_2: 2.0.20161216 -> 2.0.20170509 

    Fixes CVE-2017-8798.
    @fpletz
    fpletz committed May 26, 2017

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    1adbd2a View commit details

  5. miniupnpc_1: 1.9.20150430 -> 1.9.20160209

    @fpletz
    fpletz committed May 26, 2017

    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
    ea5d936 View commit details
14 changes: 7 additions & 7 deletions pkgs/data/misc/geolite-legacy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,26 +8,26 @@ let
in
stdenv.mkDerivation rec {
name = "geolite-legacy-${version}";
version = "2016-07-08";
version = "2017-05-26";

srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
"03rp862snj4pxpz272az2mjp0vdw9a6rzbzcml9bzwvsi1ap5sl7";
"04akk0jczvki8rdvz6z6v5s26ds0m27953lzvp3v0fsg7rl08q5n";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
"1s5y6r4ji1ljsl1d3w9mcqppxy2kvxjk5aq5lldbj616rbcp2v72";
"0i0885vvj0s5sysyafvk8pc8gr3znh7gmiy8rp4iiai7qnbylb7y";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
"07dp3wf5b6g62y6zgm9f1zfc7gn2wnss7fjdips879373kj3lgbr";
"0bgf4kfg4mmqvgmrff27lbiglnnb3pnd7f3i4fxzl68c33bizmbm";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
"1y7c8f84x99dbrqij124bylddc7bmcld1xp4h3qxvmmp8ch5hcxz";
"06slyw2644y2z5bgn4yl79aa4smf94mdcddybldh1glc3ay3p4iz";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"168z6j6adrn80sl3ip41fa0jfv2p26lfa8qil6w17sqhg8f61rnp";
"1gpvsqvq9z9pg9zfn86i50fb481llfyn79r1jwddwfflp1qqfrrv";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
"0q0vgjgxixcq5qnl5d6hxg3bpsbylmmjkhdp308vbbd68q6fws22";
"0nmhz82dn9clm5w2y6z861ifj7i761spy1p1zcam93046cdpqqaa";

meta = with stdenv.lib; {
description = "GeoLite Legacy IP geolocation databases";
10 changes: 0 additions & 10 deletions pkgs/development/libraries/webkitgtk/adding-libintl.patch
View file

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/development/tools/packer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "packer-${version}";
version = "0.12.2";
version = "1.0.0";

goPackagePath = "github.com/mitchellh/packer";

@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "mitchellh";
repo = "packer";
rev = "v${version}";
sha256 = "1li141y7rfbn021h33dnryhms5xwzqz8d92djnprbh7ba9ff02zm";
sha256 = "16hdh3iwvdg1jk3pswa9r9lq4qkhds1lrqwl19vd1v2yz2r76kzi";
};

meta = with stdenv.lib; {
8 changes: 4 additions & 4 deletions pkgs/tools/networking/miniupnpc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,11 +24,11 @@ let
};
in {
miniupnpc_2 = generic {
version = "2.0.20161216";
sha256 = "0gpxva9jkjvqwawff5y51r6bmsmdhixl3i5bmzlqsqpwsq449q81";
version = "2.0.20170509";
sha256 = "0spi75q6nafxp3ndnrhrlqagzmjlp8wwlr5x7rnvdpswgxi6ihyk";
};
miniupnpc_1 = generic {
version = "1.9.20150430";
sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
version = "1.9.20160209";
sha256 = "0vsbv6a8by67alx4rxfsrxxsnmq74rqlavvvwiy56whxrkm728ap";
};
}