Skip to content

Commit

Permalink
Merge staging-next into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Mar 26, 2022
2 parents f97a925 + 3b6f03e commit 77dc421
Show file tree
Hide file tree
Showing 40 changed files with 349 additions and 146 deletions.
11 changes: 11 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7264,6 +7264,17 @@
githubId = 1267527;
name = "Daniel Firth";
};
lockejan = {
email = "[email protected]";
matrix = "@jan:smittie.de";
github = "lockejan";
githubId = 25434434;
name = "Jan Schmitt";
keys = [{
longkeyid = "dsa2048/0xA2BC3C6F14351991";
fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991";
}];
};
lodi = {
email = "[email protected]";
github = "lodi";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ in
};
instance = mkOption {
type = types.nullOr types.str;
default = null;
default = config.services.varnish.stateDir;
defaultText = lib.literalExpression "config.services.varnish.stateDir";
description = ''
varnishstat -n value.
'';
Expand All @@ -66,7 +67,7 @@ in
};
};
serviceOpts = {
path = [ pkgs.varnish ];
path = [ config.services.varnish.package ];
serviceConfig = {
RestartSec = mkDefault 1;
DynamicUser = false;
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/installer.nix
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ in {
"pvcreate /dev/vda1 /dev/vda2",
"vgcreate MyVolGroup /dev/vda1 /dev/vda2",
"lvcreate --size 1G --name swap MyVolGroup",
"lvcreate --size 3G --name nixos MyVolGroup",
"lvcreate --size 6G --name nixos MyVolGroup",
"mkswap -f /dev/MyVolGroup/swap -L swap",
"swapon -L swap",
"mkfs.xfs -L nixos /dev/MyVolGroup/nixos",
Expand Down
5 changes: 3 additions & 2 deletions pkgs/applications/graphics/hydrus/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "477";
version = "478";
format = "other";

src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-/Gehlk+eMBPA+OT7xsTri6PDi2PBmzjckMVbqPGXT64=";
sha256 = "sha256-ZsQzKc2fOFTzI/kBS8ws2+XT9kRAn4L55n1EZgVy4Kk=";
};

nativeBuildInputs = [
Expand All @@ -27,6 +27,7 @@ python3Packages.buildPythonPackage rec {

propagatedBuildInputs = with python3Packages; [
beautifulsoup4
cbor2
chardet
cloudscraper
html5lib
Expand Down
14 changes: 7 additions & 7 deletions pkgs/applications/networking/cluster/kops/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let
homepage = "https://github.com/kubernetes/kops";
changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
license = licenses.asl20;
maintainers = with maintainers; [ offline zimbatm diegolelis ];
maintainers = with maintainers; [ offline zimbatm diegolelis yurrriq ];
platforms = platforms.unix;
};
} // attrs';
Expand All @@ -52,12 +52,6 @@ rec {

mkKops = generic;

kops_1_20 = mkKops rec {
version = "1.20.3";
sha256 = "sha256-Yrh0wFz7MQgTDwENqQouYh3pr1gOq64Rqft5yxIiCAo=";
rev = "v${version}";
};

kops_1_21 = mkKops rec {
version = "1.21.4";
sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs=";
Expand All @@ -69,4 +63,10 @@ rec {
sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE=";
rev = "v${version}";
};

kops_1_23 = mkKops rec {
version = "1.23.0";
sha256 = "sha256-tiVNUaW0an6C8M9bxEX5pvB/W5IjZ/S24RdPikzm3bc=";
rev = "v${version}";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/tektoncd-cli/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

buildGoModule rec {
pname = "tektoncd-cli";
version = "0.23.0";
version = "0.23.1";

src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-rzKEjLjX2bPqgNGJYdyTuu15+9bq9WnsrJtsBzL/oOo=";
sha256 = "sha256-fOq67Cxtb2A9Obh2o5/aFy5bYBnyFKYQDPcpxOXMy1s=";
};

vendorSha256 = null;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{ callPackage }:

{
isabelle-linter = callPackage ./isabelle-linter.nix {};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, lib, fetchFromGitHub, isabelle }:

stdenv.mkDerivation rec {
pname = "isabelle-linter";
version = "Isabelle2021-1-v1.0.0";

src = fetchFromGitHub {
owner = "isabelle-prover";
repo = "isabelle-linter";
rev = version;
sha256 = "0v6scc2rhj6bjv530gzz6i57czzcgpkw7a9iqnfdnm5gvs5qjk7a";
};

installPhase = import ./mkBuild.nix { inherit isabelle; path = "${pname}-${version}"; };

meta = with lib; {
description = "Linter component for Isabelle.";
homepage = "https://github.com/isabelle-prover/isabelle-linter";
maintainers = with maintainers; [ jvanbruegge ];
license = licenses.mit;
};
}
36 changes: 36 additions & 0 deletions pkgs/applications/science/logic/isabelle/components/mkBuild.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ isabelle, path }:

let
dir = "$out/isabelle/${isabelle.dirname}";
iDir = "${isabelle}/${isabelle.dirname}";
in ''
shopt -s extglob
mkdir -p ${dir}/lib/classes
cDir=$out/${isabelle.dirname}/contrib/${path}
mkdir -p $cDir
cp -r !(isabelle) $cDir
cd ${dir}
ln -s ${iDir}/!(lib|bin) ./
ln -s ${iDir}/lib/!(classes) lib/
ln -s ${iDir}/lib/classes/* lib/classes/
mkdir bin/
cp ${iDir}/bin/* bin/
export HOME=$TMP
bin/isabelle components -u $cDir
bin/isabelle scala_build
cd lib/classes
for f in ${iDir}/lib/classes/*; do
rm $(basename $f)
done
lDir=$out/${isabelle.dirname}/lib/classes/
mkdir -p $lDir
cp -r * $lDir
cd $out
rm -rf isabelle
''
27 changes: 26 additions & 1 deletion pkgs/applications/science/logic/isabelle/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem }:
{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin }:
# nettools needed for hostname

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -153,4 +153,29 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ];
platforms = platforms.linux;
};
} // {
withComponents = f:
let
base = "$out/${isabelle.dirname}";
components = f isabelle-components;
in symlinkJoin {
name = "isabelle-with-components-${isabelle.version}";
paths = [ isabelle ] ++ components;

postBuild = ''
rm $out/bin/*
cd ${base}
rm bin/*
cp ${isabelle}/${isabelle.dirname}/bin/* bin/
rm etc/components
cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components
export HOME=$TMP
bin/isabelle install $out/bin
patchShebangs $out/bin
'' + lib.concatMapStringsSep "\n" (c: ''
echo contrib/${c.pname}-${c.version} >> ${base}/etc/components
'') components;
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "git-team";
version = "1.7.0";

src = fetchFromGitHub {
owner = "hekmekk";
repo = "git-team";
rev = "v${version}";
sha256 = "0nl5j64b61jw4bkf29y51svjbndmqqrqx96yaip4vjzj2dx9ywm4";
};

vendorSha256 = "sha256-xJMWPDuqoNtCCUnKuUvwlYztyrej1uZttC0NsDvYnXI=";

nativeBuildInputs = [ installShellFiles ];

postInstall = ''
go run main.go --generate-man-page > ${pname}.1
installManPage ${pname}.1
# Currently only bash completions are provided
installShellCompletion --cmd git-team --bash <($out/bin/git-team completion bash)
'';

meta = with lib; {
description = "Command line interface for managing and enhancing git commit messages with co-authors";
homepage = "https://github.com/hekmekk/git-team";
license = licenses.mit;
maintainers = with maintainers; [ lockejan ];
};
}
6 changes: 3 additions & 3 deletions pkgs/applications/virtualization/docker/compose.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

buildGoModule rec {
pname = "docker-compose";
version = "2.3.3";
version = "2.3.4";

src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
sha256 = "sha256-PFR7EcRkqn/d6gYlMNN36nRIslYEN0JFSbFU9niGc+Y=";
sha256 = "sha256-ZFnrfGM2LUZZC8IPPCh3GS95jz7NGraOlr3wQaw5K0k=";
};

vendorSha256 = "sha256-L6PNKK1ID7ZVX/4sG72wn9ZjWlx0lsNuiBc/EtCN03E=";
vendorSha256 = "sha256-Y2rE5/XLmQLqBA8xiCd9v30gTaO9qbiBFa4jKucKU6M=";

ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

Expand Down
2 changes: 0 additions & 2 deletions pkgs/desktops/gnome/core/nautilus/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
, libnotify
, libexif
, libseccomp
, exempi
, librsvg
, tracker
, tracker-miners
Expand Down Expand Up @@ -68,7 +67,6 @@ stdenv.mkDerivation rec {
];

buildInputs = [
exempi
gexiv2
glib-networking
gnome-desktop
Expand Down
13 changes: 11 additions & 2 deletions pkgs/development/compilers/solc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,30 @@ let
sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh";
};

fmtlibVersion = "8.0.1";
fmtlibUrl = "https://github.com/fmtlib/fmt/archive/${fmtlibVersion}.tar.gz";
fmtlib = fetchzip {
url = fmtlibUrl;
sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw";
};

solc = gccStdenv.mkDerivation rec {
pname = "solc";
version = "0.8.2";
version = "0.8.13";

# upstream suggests avoid using archive generated by github
src = fetchzip {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
sha256 = "11w7sa1y2dirzh84k04fkwbfc6xpjp5jr65w1pmb2pnkjvvf46xq";
hash = "sha256-cFC9M65kSYgYq9rhBXZKEdfvIMbMaDiDwdPmU8v9s7k=";
};

postPatch = ''
substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppUrl}" ${jsoncpp}
substituteInPlace cmake/range-v3.cmake \
--replace "${range3Url}" ${range3}
substituteInPlace cmake/fmtlib.cmake \
--replace "${fmtlibUrl}" ${fmtlib}
'';

cmakeFlags = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/flatpak/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@

stdenv.mkDerivation rec {
pname = "flatpak";
version = "1.12.6";
version = "1.12.7";

# TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];

src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "7wLLUFuRzOUXMJm1SFdo7vGJnrzznt+CfEJUFjqBFic="; # Taken from https://github.com/flatpak/flatpak/releases/
sha256 = "sha256-bbUqUxzieCgqx+v7mfZqC7PsyvROhkhEwslcHuW6kxY="; # Taken from https://github.com/flatpak/flatpak/releases/
};

patches = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libsolv/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:

stdenv.mkDerivation rec {
version = "0.7.20";
version = "0.7.21";
pname = "libsolv";

src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
sha256 = "sha256-NVyLa/fPGnO5jAz9rePFXg/z6RZeFCrkJBCG3gGh+YM=";
sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0=";
};

cmakeFlags = [
Expand Down
37 changes: 0 additions & 37 deletions pkgs/development/ocaml-modules/odn/default.nix

This file was deleted.

Loading

0 comments on commit 77dc421

Please sign in to comment.