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

Commits on Oct 27, 2019

  1. atlassian-jira: 8.4.2 -> 8.5.0 

    (cherry picked from commit 3eff8b1)
    @ciil
    ciil committed Oct 27, 2019
    Copy the full SHA
    674f7fe View commit details

Commits on Oct 28, 2019

  1. nixos/acme: fix staging endpoint url 

    fixes #72067

(cherry picked from commit 5d22f7a)
    @fpletz
    fpletz committed Oct 28, 2019
    Copy the full SHA
    1225e6a View commit details

  2. caddy: 1.0.0 -> 1.0.3 

    (cherry picked from commit 4d178d9)
    @marsam @fpletz
    marsam authored and fpletz committed Oct 28, 2019
    Copy the full SHA
    4f6ac37 View commit details

  3. caddy: disable telemetry 

    Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
(cherry picked from commit b53710e)
    @marsam @fpletz
    marsam authored and fpletz committed Oct 28, 2019
    Copy the full SHA
    ab486c5 View commit details

  4. libressl_3_0: 3.0.1 -> 3.0.2 

    (cherry picked from commit 1126db8)
    @ruuda @fpletz
    ruuda authored and fpletz committed Oct 28, 2019
    Copy the full SHA
    78c220e View commit details

  5. libressl_2_8: remove, not maintained anymore 

    Stable LibreSSL releases are supported one year after their OpenBSD release.
OpenBSD 6.4 with this branch was released on 2018-10-18.

(cherry picked from commit 671a118)
    @ruuda @fpletz
    ruuda authored and fpletz committed Oct 28, 2019
    Copy the full SHA
    d941f05 View commit details

  6. Merge pull request #72110 from ciil/jira-update-19.09 

    atlassian-jira: 8.4.2 -> 8.5.0 [release-19.09]
    @fpletz
    fpletz authored Oct 28, 2019
    Copy the full SHA
    5a0de42 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/security/acme.nix
View file
Original file line number Diff line number Diff line change
@@ -198,7 +198,7 @@ in
++ optionals (data.email != null) [ "--email" data.email ]
++ concatMap (p: [ "-f" p ]) data.plugins
++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
++ optionals (!cfg.production) ["--server" "https://acme-staging.api.letsencrypt.org/directory"];
++ optionals (!cfg.production) ["--server" "https://acme-staging-v02.api.letsencrypt.org/directory"];
acmeService = {
description = "Renew ACME Certificate for ${cert}";
after = [ "network.target" "network-online.target" ];
9 changes: 2 additions & 7 deletions pkgs/development/libraries/libressl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -57,18 +57,13 @@ let

in {

libressl_2_8 = generic {
version = "2.8.3";
sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v";
};

libressl_2_9 = generic {
version = "2.9.2";
sha256 = "1m6mz515dcbrbnyz8hrpdfjzdmj1c15vbgnqxdxb89g3z9kq3iy4";
};

libressl_3_0 = generic {
version = "3.0.1";
sha256 = "1js3fddxwzafiyspif0bwmvpp1fz98mkv10q5xaagqzvjw8xnsk4";
version = "3.0.2";
sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz";
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "8.4.2";
version = "8.5.0";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "0f0l9ss8jv06iidg8jw7yk5z42r1m0cbmlgj1wgli9a21ssp65sh";
sha256 = "093706cpaw1a1vwvzpa85j7n338d748w372vsk8c9lvagaskiwh2";
};

buildPhase = ''
24 changes: 15 additions & 9 deletions pkgs/servers/caddy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,23 +2,29 @@

buildGoModule rec {
pname = "caddy";
version = "1.0.0";
version = "1.0.3";

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

subPackages = [ "caddy" ];

src = fetchFromGitHub {
owner = "mholt";
repo = "caddy";
owner = "caddyserver";
repo = pname;
rev = "v${version}";
sha256 = "08hknms0lg5c6yhkz9g1i32d11xch2kqkjbk4w4kd1f1xpa6jvmz";
sha256 = "1n7i9w4vva5x5wry7gzkyfylk39x40ykv7ypf1ca3zbbk7w5x6mw";
};
modSha256 = "02cb3swc180kh5vc2s5w8a6vidvw768l9bv5zg8zya183wzvfczs";
modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q";

buildFlagsArray = ''
-ldflags=
-X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version}
preBuild = ''
cat << EOF > caddy/main.go
package main
import "github.com/caddyserver/caddy/caddy/caddymain"
func main() {
caddymain.EnableTelemetry = false
caddymain.Run()
}
EOF
'';

meta = with stdenv.lib; {
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -12904,7 +12904,6 @@ in
openvdb = callPackage ../development/libraries/openvdb {};

inherit (callPackages ../development/libraries/libressl { })
libressl_2_8
libressl_2_9
libressl_3_0;