Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c6d9f55e0c3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 19a4f3f79ce7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 4 contributors

Commits on Mar 4, 2020

  1. nixos/acme: force symlink from fullchain.pem to cert.pem 

    (cherry picked from commit c32da2e)

Co-authored-by: emily <vcs@emily.moe>
    @lukateras @emilazy
    lukateras and emilazy committed Mar 4, 2020
    Copy the full SHA
    08795a9 View commit details

  2. Revert "defaultGemConfig: remove asciidoctor-diagram JARs" (#81737) 

    This reverts commit 1ac11cc.

asciidoctor-diagram starts Java processes, so the JARs are necessary
on all platforms.

See NixOS/nixpkgs#77149 (comment).

(cherry picked from commit 89a0945)
    @zimbatm
    zimbatm committed Mar 4, 2020
    Copy the full SHA
    eaea08b View commit details

  3. Merge pull request #81709 from yegortimoshenko/acme-fullchain-force-s… 

    …ymlink-20.03

[20.03] nixos/acme: force symlink from fullchain.pem to cert.pem
    @infinisil
    infinisil authored Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    lovesegfault Bernardo Meurer
    GPG key ID: E421C74191EA186C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    19a4f3f View commit details
Showing with 1 addition and 10 deletions.
  1. +1 −1 nixos/modules/security/acme.nix
  2. +0 −9 pkgs/development/ruby-modules/gem-config/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/security/acme.nix
View file
Original file line number Diff line number Diff line change
@@ -327,7 +327,7 @@ in
cp -p ${spath}/certificates/${keyName}.key key.pem
cp -p ${spath}/certificates/${keyName}.crt fullchain.pem
cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
ln -s fullchain.pem cert.pem
ln -sf fullchain.pem cert.pem
cat key.pem fullchain.pem > full.pem
chmod ${rights} *.pem
chown '${data.user}:${data.group}' *.pem
9 changes: 0 additions & 9 deletions pkgs/development/ruby-modules/gem-config/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,15 +39,6 @@ let
in

{
asciidoctor-diagram = { version, ruby, ... }: {
postInstall = ''
# Delete vendored JAR files unless using JRuby.
if ruby -e 'exit(RUBY_PLATFORM != "java")'; then
rm -v $out/${ruby.gemPath}/gems/$gemName-${version}/lib/*.jar
fi
'';
};

atk = attrs: {
dependencies = attrs.dependencies ++ [ "gobject-introspection" ];
nativeBuildInputs = [ rake bundler pkgconfig ];