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: a70010cab366
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 23726618f88f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 1, 2017

  1. autofs: do not strip needed symbols 

    Fixes #28282 after #27415

(cherry picked from commit 2ad3933)
    @orivej @fpletz
    orivej authored and fpletz committed Nov 1, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    mogorman Matthew O'Gorman
    GPG key ID: F71F32386DEAE4B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4200dcd View commit details

  2. caddy: 0.10.9 -> 0.10.10 

    (cherry picked from commit 314979f)
    @zimbatm @fpletz
    zimbatm authored and fpletz committed Nov 1, 2017
    Copy the full SHA
    2372661 View commit details
Showing with 4 additions and 12 deletions.
  1. +2 −0 pkgs/os-specific/linux/autofs/default.nix
  2. +2 −12 pkgs/servers/caddy/default.nix
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/autofs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@ in stdenv.mkDerivation {
export E2FSCK=${e2fsprogs}/bin/fsck.ext2
export E3FSCK=${e2fsprogs}/bin/fsck.ext3
export E4FSCK=${e2fsprogs}/bin/fsck.ext4
unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
'';

installPhase = ''
14 changes: 2 additions & 12 deletions pkgs/servers/caddy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
name = "caddy-${version}";
version = "0.10.9";
version = "0.10.10";

goPackagePath = "github.com/mholt/caddy";

@@ -12,19 +12,9 @@ buildGoPackage rec {
owner = "mholt";
repo = "caddy";
rev = "v${version}";
sha256 = "1shry7dqcbb5d3hp9xz5l3jx9a6i18wssz3m28kpjf3cks427v55";
sha256 = "1x7f1yz5vnsy9n50ak0vjrm4w8fqc1qvhv8fmqnsc8cgbp7f3p8w";
};

patches = [
# This header was added in 0.10.9 and was since reverted but no new release made
# remove this patch when updating to next release
(fetchpatch {
url = "https://github.com/mholt/caddy/commit/d267b62fe9fdd008f13774afc72d95335934d133.patch";
name = "revert-sponsors-header.patch";
sha256 = "192g23kzkrwgif7ii9c70mh1a25gwhm1l1mzyqm9i0d3jifsfc2j";
})
];

buildFlagsArray = ''
-ldflags=
-X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version}