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: 54792ee58493
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: 35eb7793a3c1
Choose a head ref
  • 8 commits
  • 6 files changed
  • 7 contributors

Commits on Apr 17, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    immae Immae
    Copy the full SHA
    8e88b8d View commit details

Commits on Apr 18, 2020

  1. nixos/rss2email: globally install rss2email

    For man pages.
    alyssais committed Apr 18, 2020
    Copy the full SHA
    1b0d801 View commit details
  2. httpie: 2.0.0 -> 2.1.0

    Br1ght0ne committed Apr 18, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    9524aaf View commit details
  3. pythonPackages.pdfposter init at 0.7.post1 (#82926)

    Signed-off-by: Markus S. Wamser <github-dev@mail2013.wamser.eu>
    wamserma authored Apr 18, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5fbab6d View commit details
  4. Merge pull request #85365 from immae/fix_acme_postrun

     nixos/acme: Fix postRun in acme certificate being ran at every run
    worldofpeace authored Apr 18, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    996ae85 View commit details
  5. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3940ec2 View commit details
  6. nixos: Introduce nix.buildLocation option

    Allow to specify where package build will happens.
    It helps big packages (like browsers) not to overflow tmpfs.
    avnik committed Apr 18, 2020
    Copy the full SHA
    5291925 View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    35eb779 View commit details
7 changes: 6 additions & 1 deletion nixos/modules/security/acme.nix
Original file line number Diff line number Diff line change
@@ -343,7 +343,9 @@ in
# Test that existing cert is older than new cert
KEY=${spath}/certificates/${keyName}.key
KEY_CHANGED=no
if [ -e $KEY -a $KEY -nt key.pem ]; then
KEY_CHANGED=yes
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
@@ -354,7 +356,10 @@ in
chmod ${fileMode} *.pem
chown '${data.user}:${data.group}' *.pem
${data.postRun}
if [ "$KEY_CHANGED" = "yes" ]; then
: # noop in case postRun is empty
${data.postRun}
fi
'';
in
"+${script}";
2 changes: 2 additions & 0 deletions nixos/modules/services/mail/rss2email.nix
Original file line number Diff line number Diff line change
@@ -91,6 +91,8 @@ in {
};
};

environment.systemPackages = with pkgs; [ rss2email ];

services.rss2email.config.to = cfg.to;

systemd.tmpfiles.rules = [
16 changes: 15 additions & 1 deletion nixos/modules/services/misc/nix-daemon.nix
Original file line number Diff line number Diff line change
@@ -430,6 +430,16 @@ in
'';
};

buildLocation = mkOption {
type = types.str;
default = "/tmp";
example = "/var/buildroot";
description = ''
Temporary directory, which used to unpack and build source packages.
(by default <filename>/tmp</filename> is used, which commonly reside on tmpfs,
and big packages (like browsers) can just not fit there)
'';
};
};

};
@@ -476,7 +486,9 @@ in
++ optionals cfg.distributedBuilds [ pkgs.gzip ];

environment = cfg.envVars
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt";
TMPDIR = cfg.buildLocation;
}
// config.networking.proxy.envVars;

unitConfig.RequiresMountsFor = "/nix/store";
@@ -490,6 +502,8 @@ in
restartTriggers = [ nixConf ];
};

systemd.tmpfiles.rules = [ "d ${cfg.buildLocation} 0775 root root -" ];

# Set up the environment variables for running Nix.
environment.sessionVariables = cfg.envVars //
{ NIX_PATH = cfg.nixPath;
20 changes: 20 additions & 0 deletions pkgs/development/python-modules/pdfposter/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, pypdf2 }:

buildPythonPackage rec {
pname = "pdftools.pdfposter";
version = "0.7.post1";

propagatedBuildInputs = [ pypdf2 ];

src = fetchPypi {
inherit pname version;
sha256 = "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j";
};

meta = with stdenv.lib; {
description = "Split large pages of a PDF into smaller ones for poster printing";
homepage = "https://pdfposter.readthedocs.io";
license = licenses.gpl3;
maintainers = with maintainers; [ wamserma ];
};
}
4 changes: 2 additions & 2 deletions pkgs/tools/networking/httpie/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

python3Packages.buildPythonApplication rec {
pname = "httpie";
version = "2.0.0";
version = "2.1.0";

src = fetchFromGitHub {
owner = "jakubroztocil";
repo = "httpie";
rev = version;
sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0";
sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2";
};

outputs = [ "out" "doc" "man" ];
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -1025,6 +1025,8 @@ in {

pdfminer = callPackage ../development/python-modules/pdfminer_six { };

pdfposter = callPackage ../development/python-modules/pdfposter { };

pdftotext = callPackage ../development/python-modules/pdftotext { };

pdfx = callPackage ../development/python-modules/pdfx { };