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

Commits on Jun 18, 2019

  1. caddy: 0.11.4 -> 1.0.0 

    https://github.com/mholt/caddy/releases/tag/v0.11.5
https://github.com/mholt/caddy/releases/tag/v1.0.0-beta1
https://github.com/mholt/caddy/releases/tag/v1.0.0-beta2
https://github.com/mholt/caddy/releases/tag/v1.0.0
    @allowthere
    allowthere authored Jun 18, 2019
    1

    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
    066fd6c View commit details

Commits on Jun 20, 2019

  1. caddy is in ${caddy}/bin/caddy

    @allowthere
    allowthere authored Jun 20, 2019

    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
    90486a9 View commit details

  2. Merge pull request #63485 from allowthere/update/caddy-1.0.0 

    caddy: 0.11.4 -> 1.0.0
    @zimbatm
    zimbatm authored Jun 20, 2019

    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
    10f2815 View commit details
Showing with 6 additions and 5 deletions.
  1. +1 −1 pkgs/applications/misc/styx/default.nix
  2. +5 −4 pkgs/servers/caddy/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/misc/styx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl";
};

server = "${caddy.bin}/bin/caddy";
server = "${caddy}/bin/caddy";
linkcheck = "${linkchecker}/bin/linkchecker";

nativeBuildInputs = [ asciidoctor ];
9 changes: 5 additions & 4 deletions pkgs/servers/caddy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
name = "caddy-${version}";
version = "0.11.4";
version = "1.0.0";

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

@@ -12,8 +12,9 @@ buildGoPackage rec {
owner = "mholt";
repo = "caddy";
rev = "v${version}";
sha256 = "1h7zx5gzv40xkxab8pc6hgd9zkpbnhiy1hnldriybpf2ya2lac9a";
sha256 = "08hknms0lg5c6yhkz9g1i32d11xch2kqkjbk4w4kd1f1xpa6jvmz";
};
modSha256 = "02cb3swc180kh5vc2s5w8a6vidvw768l9bv5zg8zya183wzvfczs";

buildFlagsArray = ''
-ldflags=