Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-01 12:01:05 +00:00 committed by GitHub
commit 26416f52eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 61 additions and 31 deletions

View file

@ -105,7 +105,7 @@ in {
wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs");
in lib.mkIf config.confinement.enable {
serviceConfig = {
RootDirectory = pkgs.runCommand rootName {} "mkdir \"$out\"";
RootDirectory = "/var/empty";
TemporaryFileSystem = "/";
PrivateMounts = lib.mkDefault true;

View file

@ -61,7 +61,7 @@ def write_loader_conf(profile: Optional[str], generation: int) -> None:
def profile_path(profile: Optional[str], generation: int, name: str) -> str:
return os.readlink("%s/%s" % (system_dir(profile, generation), name))
return os.path.realpath("%s/%s" % (system_dir(profile, generation), name))
def copy_from_profile(profile: Optional[str], generation: int, name: str, dry_run: bool = False) -> str:

View file

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "92.0.4515.70",
"sha256": "06yhpxr5bg0gx7hmrhc6zg4gr1d9s34y2rb98rpl4dilmc548i6q",
"sha256bin64": "1fkakh1r87pg5nr101m6v86y8iyyfba8vnzrg0229kcar7v8wzf7",
"version": "92.0.4515.80",
"sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i",
"sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp",
"deps": {
"gn": {
"version": "2021-05-07",

View file

@ -28,7 +28,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.7.0"; # Please backport all updates to the stable channel.
version = "5.7.1"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "170x2zsp3z95b123ybs8zqr8sasd5jgd4gl1q32wvhk7m41fvkmd";
sha256 = "1hjykjqf3n20aab9g3bwk5w8x8v61320xv6z4iqrwwdzfkb3ly20";
};
nativeBuildInputs = [

View file

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, authlib
, httpx
}:
buildPythonPackage rec {
pname = "pypoint";
version = "2.1.0";
src = fetchFromGitHub {
owner = "fredrike";
repo = "pypoint";
rev = "v${version}";
sha256 = "13p68d2qxfj31lfjv94wzpigjfgjw03yjpl2h16zgxbka2k8zf3x";
};
propagatedBuildInputs = [
authlib
httpx
];
# upstream has no tests
doCheck = false;
pythonImportsCheck = [ "pypoint" ];
meta = with lib; {
description = "API for Minut Point";
homepage = "https://github.com/fredrike/pypoint";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -1,10 +1,10 @@
{ stdenv, lib, fetchurl, writeText, php, makeWrapper }:
let
version = "2.4.0";
version = "2.5.0";
completion = fetchurl {
url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24";
sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U=";
};
ini = writeText "php.ini" ''
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar";
sha256 = "0h5mjxrw4z3648v4wb4pvapz2a1mlmbszgggg4b7bvrrxn3cr78k";
sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
version = "0.8.0";
version = "0.8.1";
pname = "extremetuxracer";
src = fetchurl {
url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
sha256 = "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b";
sha256 = "sha256-ktqWPtMqub/xJjRu37lUnocdfDzsdT9KxQmODVPDg0E=";
};
buildInputs = [

View file

@ -646,7 +646,7 @@
"plugwise" = ps: with ps; [ plugwise ];
"plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
"pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts
"point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
"point" = ps: with ps; [ aiohttp-cors pypoint ];
"poolsense" = ps: with ps; [ poolsense ];
"powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
"profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ];

View file

@ -606,6 +606,7 @@ in with py.pkgs; buildPythonApplication rec {
"plant"
"plex"
"plugwise"
"point"
"poolsense"
"profiler"
"prometheus"

View file

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "groonga";
version = "11.0.3";
version = "11.0.4";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "sha256-oYlc6PSBLovNsEWDc6eGpDI85T6bTHgBvxA/PZP3aQU=";
sha256 = "sha256-a/IMroZ1zAgIv7Cx4kkj5byIMoC0o+seHhqVLaUUSqc=";
};
buildInputs = with lib;

View file

@ -6,8 +6,6 @@
, withSqlite ? false, sqlite
, withPam ? false, pam
, withZlib ? true, zlib
, withRiak ? false
, withElixir ? false, elixir
, withIconv ? true
, withTools ? false
, withRedis ? false
@ -24,12 +22,12 @@ let
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ];
in stdenv.mkDerivation rec {
version = "20.12";
version = "21.04";
pname = "ejabberd";
src = fetchurl {
url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz";
sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ=";
sha256 = "09s8mj0dkvp9mxazsqxqqmnl5n2xyi8avx0rzgvqrbl3byanzfzr";
};
nativeBuildInputs = [ fakegit makeWrapper ];
@ -38,11 +36,7 @@ in stdenv.mkDerivation rec {
++ lib.optional withSqlite sqlite
++ lib.optional withPam pam
++ lib.optional withZlib zlib
++ lib.optional withElixir elixir
;
# Apparently needed for Elixir
LANG = "en_US.UTF-8";
;
deps = stdenv.mkDerivation {
pname = "ejabberd-deps";
@ -52,7 +46,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];
nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib ];
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
@ -76,7 +70,7 @@ in stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-0/hBgA+9rsDOBcvbROSpc5Xnw4JkYpuLCl2V+lJnieY=";
outputHash = "1mvixgb46ss35abjwz3lw38c69bii1xyj557a92bvrxc1gc6gx31";
};
configureFlags =
@ -85,8 +79,6 @@ in stdenv.mkDerivation rec {
(lib.enableFeature withSqlite "sqlite")
(lib.enableFeature withPam "pam")
(lib.enableFeature withZlib "zlib")
(lib.enableFeature withRiak "riak")
(lib.enableFeature withElixir "elixir")
(lib.enableFeature withIconv "iconv")
(lib.enableFeature withTools "tools")
(lib.enableFeature withRedis "redis")
@ -97,7 +89,7 @@ in stdenv.mkDerivation rec {
preBuild = ''
cp -r $deps deps
chmod -R +w deps
patchShebangs deps
patchShebangs .
'';
postInstall = ''
@ -108,6 +100,7 @@ in stdenv.mkDerivation rec {
-e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
$out/sbin/ejabberdctl
wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}"
rm $out/bin/{mix,iex,elixir}
'';
meta = with lib; {
@ -116,6 +109,5 @@ in stdenv.mkDerivation rec {
homepage = "https://www.ejabberd.im";
platforms = platforms.linux;
maintainers = with maintainers; [ sander abbradar ];
broken = withElixir;
};
}

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.flashrom.org";
description = "Utility for reading, writing, erasing and verifying flash ROM chips";
license = licenses.gpl2;
maintainers = with maintainers; [ funfunctor fpletz ];
maintainers = with maintainers; [ funfunctor fpletz felixsinger ];
platforms = platforms.all;
broken = stdenv.isDarwin; # requires DirectHW
};

View file

@ -5349,6 +5349,8 @@ in {
pynx584 = callPackage ../development/python-modules/pynx584 { };
pypoint = callPackage ../development/python-modules/pypoint { };
pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { };
pyrogram = callPackage ../development/python-modules/pyrogram { };