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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-09 06:01:16 +00:00 committed by GitHub
commit 1bce9aab38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 136 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-apps/dokuwiki.nix
View File

@ -308,6 +308,9 @@ in
inherit user;
group = webserver.group;
# Not yet compatible with php 8 https://www.dokuwiki.org/requirements
# https://github.com/splitbrain/dokuwiki/issues/3545
phpPackage = pkgs.php74;
phpEnv = {
DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}";
DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}";
@ -446,5 +449,6 @@ in
meta.maintainers = with maintainers; [
_1000101
onny
dandellion
];
}

2
nixos/tests/podman-dnsname.nix
View File

@ -21,7 +21,7 @@ import ./make-test-python.nix (
podman.wait_for_unit("sockets.target")
with subtest("DNS works"): # also tests inter-container tcp routing
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
"podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${webroot} scratchimg ${python3}/bin/python -m http.server 8000"
)

2
nixos/tests/podman-tls-ghostunnel.nix
View File

@ -126,7 +126,7 @@ import ./make-test-python.nix (
client.succeed("docker version")
# via socket would be nicer
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
client.succeed(
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"

16
nixos/tests/podman.nix
View File

@ -48,7 +48,7 @@ import ./make-test-python.nix (
start_all()
with subtest("Run container as root with runc"):
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
@ -57,7 +57,7 @@ import ./make-test-python.nix (
podman.succeed("podman rm sleeping")
with subtest("Run container as root with crun"):
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
@ -66,7 +66,7 @@ import ./make-test-python.nix (
podman.succeed("podman rm sleeping")
with subtest("Run container as root with the default backend"):
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
@ -78,7 +78,7 @@ import ./make-test-python.nix (
podman.succeed("loginctl enable-linger alice")
with subtest("Run container rootless with runc"):
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
su_cmd(
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
@ -89,7 +89,7 @@ import ./make-test-python.nix (
podman.succeed(su_cmd("podman rm sleeping"))
with subtest("Run container rootless with crun"):
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
su_cmd(
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
@ -100,7 +100,7 @@ import ./make-test-python.nix (
podman.succeed(su_cmd("podman rm sleeping"))
with subtest("Run container rootless with the default backend"):
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
su_cmd(
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
@ -112,7 +112,7 @@ import ./make-test-python.nix (
with subtest("Run container with init"):
podman.succeed(
"tar cvf busybox.tar -C ${pkgs.pkgsStatic.busybox} . && podman import busybox.tar busybox"
"tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - busybox"
)
pid = podman.succeed("podman run --rm busybox readlink /proc/self").strip()
assert pid == "1"
@ -124,7 +124,7 @@ import ./make-test-python.nix (
with subtest("Run container via docker cli"):
podman.succeed("docker network create default")
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)

9
pkgs/applications/editors/emacs/macport.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "27.2";
emacsName = "emacs-${version}";
macportVersion = "8.2";
macportVersion = "8.3";
name = "emacs-mac-${version}-${macportVersion}";
src = fetchurl {
@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
sha256 = "1bgm2g3ky7rkj1l27wnmyzqsqxzjng7y9bf72ym37wiyhyi2a9za";
sha256 = "0q4lbk3nb8rz1ibmf23plgsh8sx2wvhry5bf5mivgz4m4b6s2yij";
name = "${emacsName}-mac-${macportVersion}.tar.xz"; # It's actually compressed with xz, not gz
};
hiresSrc = fetchurl {
@ -37,11 +38,11 @@ stdenv.mkDerivation rec {
postUnpack = ''
mv $sourceRoot $name
tar xzf $macportSrc -C $name --strip-components=1
tar xf $macportSrc -C $name --strip-components=1
mv $name $sourceRoot
# extract retina image resources
tar xzfv $hiresSrc --strip 1 -C $sourceRoot
tar xfv $hiresSrc --strip 1 -C $sourceRoot
'';
postPatch = ''

11
pkgs/applications/editors/your-editor/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "your-editor";
version = "1206";
version = "1303";
src = fetchFromGitHub {
owner = "kammerdienerb";
owner = "your-editor";
repo = "yed";
rev = "6cdd99fe1359899b26d8967bd376fd5caa5451eb";
sha256 = "0XECSolW/xPXd1v3sv9HbJMWuHGnwCOwmHoPNCUsE+w=";
rev = version;
sha256 = "BWy/icQs8hVtNeM/mCi6LOah1UG0elU/DgCmfaIPD64=";
};
installPhase = ''
@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Your-editor (yed) is a small and simple terminal editor core that is meant to be extended through a powerful plugin architecture";
homepage = "https://your-editor.org/";
changelog = "https://github.com/your-editor/yed/blob/${version}/CHANGELOG.md";
license = with licenses; [ mit ];
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ uniquepointer ];
mainProgram = "yed";
};

6
pkgs/applications/networking/cluster/driftctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "driftctl";
version = "0.15.0";
version = "0.17";
src = fetchFromGitHub {
owner = "cloudskiff";
repo = "driftctl";
rev = "v${version}";
sha256 = "sha256-rWC4jqquVWJmHV/dnH+DsxlNiAY01xnq9z0/owS4Yis=";
sha256 = "sha256-JloeRoW+1tepSJzhcOQu38TDQfY10NtG2EyeVhP26BQ=";
};
vendorSha256 = "sha256-d8vASP8KnUeUkaHRU8kCE7FCt2QLGu5ET5BN3GM2O9c=";
vendorSha256 = "sha256-aaJ5fpS+BiVq1K8OxN+/CBD96wy3flGDhch8O2ACIh8=";
postUnpack = ''
# Without this, tests fail to locate aws/3.19.0.json

4
pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "obs-nvfbc";
version = "0.0.3";
version = "0.0.4";
src = fetchFromGitLab {
owner = "fzwoch";
repo = "obs-nvfbc";
rev = "v${version}";
sha256 = "0zyvks6gc6fr0a1j5b4y20rcx6ah35v6yiz05f6g3x6bhqi92l33";
sha256 = "sha256-U/zma1BrOTRAJAYMOcmaeL0UqF3ihysDwceyeW1r0b8=";
};
nativeBuildInputs = [ meson pkg-config ninja ];

4
pkgs/applications/virtualization/podman/default.nix
View File

@ -17,13 +17,13 @@
buildGoModule rec {
pname = "podman";
version = "3.4.3";
version = "3.4.4";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
sha256 = "sha256-SZHonZdUTJisFMjvUBst1HErvKWEcYZYhK++G+S4sEg=";
sha256 = "sha256-5Y0+xfoMCe3a6kX+OhmxURZXZLAnrS1t8TFyHqjGCeA=";
};
vendorSha256 = null;

4
pkgs/development/embedded/fpga/openfpgaloader/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "openfpgaloader";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "trabucayre";
repo = "openFPGALoader";
rev = "v${version}";
sha256 = "sha256-g1mr7S9Z70A+dXWptZPLHt90JpuclJAEDwUTicpxtic=";
sha256 = "sha256-gPRBHy7WVra4IlGvzrhNqbEbOQtYtUC+zQ+SnJTMvRA=";
};
nativeBuildInputs = [ cmake pkg-config ];

84
pkgs/development/gnuradio-modules/grnet/default.nix Normal file
View File

@ -0,0 +1,84 @@
{ lib
, mkDerivation
, fetchFromGitHub
, gnuradio
, cmake
, pkg-config
, boost
, log4cpp
, python
, swig
, mpir
, gmp
, doxygen
, libpcap
, icu
, thrift
}:
let
# Each GR major version requires us to pull a specific git revision of the repository
version = {
"3.7" = {
# Last git revision from the `maint-3.7` branch:
# https://github.com/ghostop14/gr-grnet/tree/maint-3.7
name = "unstable-2019-08-06";
gitHash = "beb1cd75d006a982c0a9536e923800c5a0575451";
};
"3.8" = {
# Last git revision from the `maint-3.8` branch:
# https://github.com/ghostop14/gr-grnet/tree/maint-3.8
name = "unstable-2020-11-20";
gitHash = "b02016043b67a15f27134a4f0b0d43f5d1b9ed6d";
};
"3.9" = {
# This revision is taken from the `master` branch.
name = "unstable-2020-12-30";
gitHash = "e6dfd140cfda715de9bcef4c1116fcacfeb0c606";
};
}.${gnuradio.versionAttr.major};
src = fetchFromGitHub {
owner = "ghostop14";
repo = "gr-grnet";
rev = "${version.gitHash}";
sha256 = {
"3.7" = "LLQ0Jf0Oapecu9gj4IgxOdK7O/OSbHnwNk000GlODxk=";
"3.8" = "vO8l8nV1/yEQf7pKqBbzIg4KkyCyWu+OkKgISyI3PaQ=";
"3.9" = "NsL7HCOQmGyexzpH2qbzv8Bq4bsfiDTNEUi96QDOA/g=";
}.${gnuradio.versionAttr.major};
};
in
mkDerivation {
pname = "gr-grnet";
version = version.name;
inherit src;
buildInputs = [
boost
log4cpp
doxygen
mpir
gmp
libpcap
icu
] ++ (if lib.versionAtLeast gnuradio.versionAttr.major "3.9" then with python.pkgs; [
pybind11
numpy
] else [
swig
thrift
python.pkgs.thrift
]);
nativeBuildInputs = [
cmake
pkg-config
];
meta = with lib; {
description = "GNURadio TCP/UDP source and sink blocks rewritten in C++/Boost";
homepage = "https://github.com/ghostop14/gr-grnet";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.unix;
};
}

6
pkgs/development/python-modules/cpyparsing/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "cpyparsing";
version = "2.4.7.1.0.0";
version = "2.4.7.1.1.0";
src = fetchFromGitHub {
owner = "evhub";
repo = pname;
rev = "09073751d92cb40fb71c927c006baddc082df1db"; # No tags on repo
sha256 = "O9IdHipAxxbFcDFYNvmczue/wT4AF9Xb5uc3ZTAlTlo=";
rev = "v${version}";
sha256 = "1rqj89mb4dz0xk8djh506nrlqfqqdva9qgb5llrvvwjqv3vqnrj4";
};
nativeBuildInputs = [ cython ];

4
pkgs/development/python-modules/jc/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.17.1";
version = "1.17.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ISggj6oOF0B7TKIQAlZtauRrDAWP88OOFezLJK6edjI=";
sha256 = "sha256-LoefoKrYZF0REF3EEd9/rxd5VQfpU+lYX/siRlQw00o=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

4
pkgs/development/python-modules/keyring/default.nix
View File

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "keyring";
version = "23.3.0";
version = "23.4.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Ct7Khr6zoveTYtksf7cZSb51HnJGPywTUOKrXA+9NwE=";
sha256 = "sha256-iPIGAkKV48b7FrsKYPtLt+wRhWKdxacp8SqnwjbQE4c=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/plaid-python/default.nix
View File

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "8.6.0";
version = "8.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "da3570fedbc096aa058affa72fc71905401b373a5b0d28b7c27e7af7998859d9";
sha256 = "16b23f61deab24d406536a1fd172da77bcbb28b3ca322245b8ee9203350fb57d";
};
propagatedBuildInputs = [

6
pkgs/development/tools/misc/spruce/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "spruce";
version = "1.28.0";
version = "1.29.0";
src = fetchFromGitHub {
owner = "geofffranks";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cNO+6rMQPO1e4Hen8vcFU1FRnnCv2+fDYtXXbuR2UCU=";
sha256 = "sha256-HjJWiBYd1YFDZ+XOFcU2Df6bmKFBwVQ6YbiZv1IVN3A=";
};
deleteVendor = true;
vendorSha256 = "sha256-5EM4Z9AN1Mjy7DayII0Iu+XrjM9lyUqrScMT/fe43dw=";
vendorSha256 = "sha256-67PGSW3wV8i3mAt3rCuWbFmeOe+QhHXn2rTUmeN6YMA=";
meta = with lib; {
description = "A BOSH template merge tool";

6
pkgs/development/web/flyctl/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.250";
version = "0.0.260";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-QhEstfzx0zqC+dDgqfgmi1zOdc491YbzVAgXVaoTVUU=";
sha256 = "sha256-xjvZp6LAKVYgZpiSHlfZzZ/OBp/UutjvndM46okC0b4=";
};
preBuild = ''
@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "." ];
vendorSha256 = "sha256-JxEl23bwfvd8jNBYqIXBIu1pNu2rt+jvdEl0RdXCidE=";
vendorSha256 = "sha256-lwayHq4uByCkiwzRd3lPaSAW4XvKNMVNcN4Cfct74e8=";
doCheck = false;

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

@ -29588,7 +29588,7 @@ with pkgs;
yoshimi = callPackage ../applications/audio/yoshimi { };
your-editor = callPackage ../applications/editors/your-editor { };
your-editor = callPackage ../applications/editors/your-editor { stdenv = gccStdenv; };
youtube-dl = with python3Packages; toPythonApplication youtube-dl;

2
pkgs/top-level/gnuradio-packages.nix
View File

@ -37,6 +37,8 @@ in {
ais = callPackage ../development/gnuradio-modules/ais/default.nix { };
grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { };
gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { };
nacl = callPackage ../development/gnuradio-modules/nacl/default.nix { };