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

Commits on Jul 12, 2017

  1. apr: 1.5.2 -> 1.6.2

    @edolstra
    edolstra committed Jul 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    770b2b6 View commit details

  2. apr-util: 1.5.4 -> 1.6.0

    @edolstra
    edolstra committed Jul 12, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    222c2b3 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/libraries/apr-util/default.nix
  2. +2 −2 pkgs/development/libraries/apr/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/apr-util/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ assert ldapSupport -> openldap != null;
with stdenv.lib;

stdenv.mkDerivation rec {
name = "apr-util-1.5.4";
name = "apr-util-1.6.0";

src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
sha256 = "0k6a90d67xl36brz69s7adgkswjmw7isnjblm1naqmjblwzwjx44";
};

patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/apr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "apr-1.5.2";
name = "apr-1.6.2";

src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
sha256 = "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx";
sha256 = "1gffipa87pflvgvw01dbkvgh75p8n2sr56m1pcl01avv6zm9q409";
};

patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];