dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-12 18:01:40 +00:00 committed by GitHub
commit 5779c9a1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/services/networking/bind.nix
View File

@ -6,6 +6,8 @@ let
cfg = config.services.bind;
bindPkg = config.services.bind.package;
bindUser = "named";
bindZoneCoerce = list: builtins.listToAttrs (lib.forEach list (zone: { name = zone.name; value = zone; }));
@ -104,6 +106,14 @@ in
enable = mkEnableOption "BIND domain name server";
package = mkOption {
type = types.package;
default = pkgs.bind;
defaultText = "pkgs.bind";
description = "The BIND package to use.";
};
cacheNetworks = mkOption {
default = [ "127.0.0.0/24" ];
type = types.listOf types.str;
@ -225,7 +235,7 @@ in
preStart = ''
mkdir -m 0755 -p /etc/bind
if ! [ -f "/etc/bind/rndc.key" ]; then
${pkgs.bind.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null
${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null
fi
${pkgs.coreutils}/bin/mkdir -p /run/named
@ -233,9 +243,9 @@ in
'';
serviceConfig = {
ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
ExecStart = "${bindPkg.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
ExecReload = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
ExecStop = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
};
unitConfig.Documentation = "man:named(8)";

4
pkgs/applications/misc/logseq/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.2.2";
version = "0.2.3";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "03l5w0fg3laiz85k4g4w98ngaziyfr9s24xshjrfl71q6r9s813m";
sha256 = "LTwgLG/jUVOSR29LkLJ9q5wpPMK78yFvGtglzMG0ZC0=";
name = "${pname}-${version}.AppImage";
};

15
pkgs/applications/science/chemistry/octopus/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps
{ lib, stdenv, fetchFromGitLab, gfortran, perl, procps
, libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook
, python3
}:
@ -7,19 +7,24 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "octopus";
version = "10.3";
version = "10.5";
src = fetchFromGitLab {
owner = "octopus-code";
repo = "octopus";
rev = version;
sha256 = "1axr3j53mi30gm3f645ga5jkhxbc7rbx432w2k2lgg6g9dv3fcs4";
sha256 = "1bgdkmsp6pwq3b6nxxkimrdmz71wqr8qi25gdzwpcv9wmcf1q27v";
};
nativeBuildInputs = [ perl procps autoreconfHook ];
nativeBuildInputs = [
perl
procps
autoreconfHook
gfortran
];
buildInputs = [
libyaml
gfortran
libxc
blas
lapack

4
pkgs/applications/science/math/engauge-digitizer/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "engauge-digitizer";
version = "12.1";
version = "12.2.2";
src = fetchFromGitHub {
owner = "markummitchell";
repo = pname;
rev = "v${version}";
sha256 = "12gflxqaa4w6vifwpaqwl0l3f9qq5pbrh45s1rpc584nmr0897a7";
sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
};
nativeBuildInputs = [ qmake wrapQtAppsHook ];

4
pkgs/data/fonts/andika/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "5.000";
version = "6.000";
in
fetchzip rec {
name = "andika-${version}";
@ -14,7 +14,7 @@ in
unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
'';
sha256 = "1jy9vpcprpd1k48p20wh6jhyn909ibia8lr5i747p41l0s8a7lqy";
sha256 = "sha256-5ymTBFssoEhmc2Z+JyEcMqw2p91i9/R44GRzEzUzK9Q=";
meta = with lib; {
homepage = "https://software.sil.org/andika";

4
pkgs/data/fonts/doulos-sil/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "5.000";
version = "6.001";
in
fetchzip rec {
name = "doulos-sil-${version}";
@ -14,7 +14,7 @@ in
unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
'';
sha256 = "04a9cr7jbw7d8llcj8xsqp9rp8w6gcgbd9sdwvi02kz7jhqa0vad";
sha256 = "sha256-MkeLLT7EAeSuCMxVVxVfajHufxr+xMLIz2hf3wF3U4o=";
meta = with lib; {
homepage = "https://software.sil.org/doulos";

8
pkgs/development/tools/pandoc/default.nix
View File

@ -8,6 +8,14 @@ in
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
patches = (drv.patches or []) ++ [
# Support citerefentry DocBook element.
# https://github.com/jgm/pandoc/pull/7437
(fetchpatch {
url = "https://github.com/jgm/pandoc/commit/06408d08e5ccf06a6a04c9b77470e6a67d98e52c.patch";
sha256 = "gOtrWVylzwgu0YLD4SztqlXxtaXXGOf8nTqLwUBS7qs=";
})
];
})).overrideAttrs (drv: {
# These libraries are still referenced, because they generate

4
pkgs/servers/http/jetty/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "jetty";
version = "9.4.41.v20210516";
version = "9.4.43.v20210629";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
sha256 = "sha256-hFQC1UiqZbbvyMf1FC3eqvVga3QdPWh0fbotatkVHBI=";
sha256 = "sha256-AfrmVLCZMuRGAZqoWeevbgXifbreErVM17rjJJ/HI9k=";
};
dontBuild = true;

4
pkgs/tools/admin/exoscale-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
version = "1.35.1";
version = "1.36.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-RF0ZLcQNBVEExzSaOBM9EbqP1wuY8yIWYV8uabyc40o=";
sha256 = "sha256-2pkSwr/8pmRedcsvl55wHskv0aSAjlIbmHFUoTXCTE0=";
};
goPackagePath = "github.com/exoscale/cli";

4
pkgs/tools/misc/bdf2psf/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
version = "1.203";
version = "1.204";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
sha256 = "sha256-jQJC3b+HsEeKYRKQUfI2w3xYDJHs9ajfN8lb6Upzgd8=";
sha256 = "sha256-oyBkt52mWM2FiaM++s5Uoe7Wd0v1oLM7HjWKDjIonGE=";
};
nativeBuildInputs = [ dpkg ];

4
pkgs/tools/security/saml2aws/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, AppKit }:
buildGoModule rec {
pname = "saml2aws";
@ -14,6 +14,8 @@ buildGoModule rec {
runVend = true;
vendorSha256 = "sha256-TieQVPSWtIteU0wTqX7si6GrPdYd4WD2eK4ZlLz0VJ8=";
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
doCheck = false;
subPackages = [ "." "cmd/saml2aws" ];

4
pkgs/top-level/all-packages.nix
View File

@ -8591,7 +8591,9 @@ in
samim-fonts = callPackage ../data/fonts/samim-fonts {};
saml2aws = callPackage ../tools/security/saml2aws {};
saml2aws = callPackage ../tools/security/saml2aws {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
sammler = callPackage ../tools/security/sammler {};