Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-02-04 00:35:42 +00:00 committed by GitHub
commit a93a3ec715
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 154 additions and 76 deletions

View file

@ -46,7 +46,7 @@ depend: standard-library
More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html).
## Compiling Agda
Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee` is made available to the Agda program via the `--with-compiler` flag.
Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag.
This can be overridden by a different version of `ghc` as follows:
```

View file

@ -183,6 +183,7 @@ in
sharedFolders = mkOption {
default = [];
type = types.listOf (types.attrsOf types.anything);
example =
[ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y";
directory = "/home/user/sync_test";

View file

@ -538,6 +538,7 @@ in
extraConfig = mkOption {
default = {};
type = types.attrsOf types.anything;
description = ''
Extra config to pass to oauth2-proxy.
'';

View file

@ -173,6 +173,7 @@ in
};
options.configuration = mkOption {
type = types.attrsOf types.anything;
default = {};
description = "Arbitrary NixOS configuration options.";
};

View file

@ -23,6 +23,13 @@ in
};
testScript = ''
assert (
"${pkgs.agdaPackages.lib.interfaceFile "Everything.agda"}" == "Everything.agdai"
), "wrong interface file for Everything.agda"
assert (
"${pkgs.agdaPackages.lib.interfaceFile "tmp/Everything.agda.md"}" == "tmp/Everything.agdai"
), "wrong interface file for tmp/Everything.agda.md"
# Minimal script that typechecks
machine.succeed("touch TestEmpty.agda")
machine.succeed("agda TestEmpty.agda")
@ -36,6 +43,10 @@ in
"cp ${hello-world} HelloWorld.agda"
)
machine.succeed("agda -l standard-library -i . -c HelloWorld.agda")
# Check execution
assert "Hello World!" in machine.succeed(
"./HelloWorld"
), "HelloWorld does not run properly"
'';
}
)

View file

@ -17,11 +17,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "particl-core";
version = "0.19.1.1";
version = "0.19.2.3";
src = fetchurl {
url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl";
sha256 = "sha256-nAsQvYWUejSu/4MMIwZhlV5Gjza/Da4jcp6/01lppvg=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "ghostwriter";
version = "2.0.0-rc3";
version = "2.0.0-rc4";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = version;
sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg=";
sha256 = "07547503a209hc0fcg902w3x0s1m899c10nj3gqz3hak0cmrasi3";
};
nativeBuildInputs = [ qmake pkg-config qttools ];

View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config
, qtscript, poppler, hunspell
, withLua ? true, lua
, withPython ? true, python3 }:
@ -14,6 +14,14 @@ mkDerivation rec {
sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z";
};
patches = [
(fetchpatch {
name = "fix-compilation-with-qt-5.15.patch";
url = "https://github.com/TeXworks/texworks/commit/a5352a3a94e3685125650b65e6197de060326cc2.patch";
sha256 = "0pf7h1m11x0s039bxknm7rxdp9b4g8ch86y38jlyy56c74mw97i6";
})
];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qtscript poppler hunspell ]
++ lib.optional withLua lua

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
postInstall = ''
patchShebangs .
buildPythonPath ${python3Packages.httplib2}
buildPythonPath "${python3Packages.httplib2} ${python3Packages.oauth2client}"
patchPythonScript $out/bin/calcurse-caldav
'';

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "osmium-tool";
version = "1.13.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osmium-tool";
rev = "v${version}";
sha256 = "0rn67g4xf01i7pkxrdh87jdj2rzkw5pfkx5wkg9245z5yxjxhqj2";
sha256 = "sha256-IeFbcgwayBl3xxv3onCJr0f1oeveyyNlLxXQlzOoVq0=";
};
nativeBuildInputs = [

View file

@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "taskwarrior-tui";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "kdheepak";
repo = "taskwarrior-tui";
rev = "v${version}";
sha256 = "1348ypjphm5f46civbrcxbbahwwl2j47z1hg8ndq1cg2bh5wb8kg";
sha256 = "1w8x3qfw7p4q8srdbamqlrz5nsilyd0dy87jp7kq2n7yxsrbyh4x";
};
# Because there's a test that requires terminal access
doCheck = false;
cargoSha256 = "11zpy3whzir9mlbvf0jyscqwj9z44a6s5i1bc2cnxyciqy9b57md";
cargoSha256 = "0b69qyb74r9may6n61i5a5nzwhxpaij6y40bq6kh8rzdwy0awwx7";
meta = with lib; {
description = "A terminal user interface for taskwarrior ";

View file

@ -1,8 +1,8 @@
{
"stable": {
"version": "88.0.4324.96",
"sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9",
"sha256bin64": "09210781s9y49l6qkbd1v8w52741rmhxz6cc6qsldnqpm5mwlgsc",
"version": "88.0.4324.146",
"sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q",
"sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id",
"deps": {
"gn": {
"version": "2020-11-05",
@ -12,9 +12,9 @@
}
},
"chromedriver": {
"version": "88.0.4324.27",
"sha256_linux": "1vx1llg0x6903ggqa345iswd63y9c24184zv784q01zqxqwn0g8p",
"sha256_darwin": "0x1s6crfwkcn86w6p8g4vmx5raqlr41pjr4h2dbwppgrc0nx1p14"
"version": "88.0.4324.96",
"sha256_linux": "0hhy3c50hlnic6kz19565s8wv2yn7k45hxnkxbvb46zhcc5s2z41",
"sha256_darwin": "11mzcmp6dr8wzyv7v2jic7l44lr77phi4y3z1ghszhfdz5dil5xp"
}
},
"beta": {
@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
"version": "88.0.4324.104",
"sha256": "0iq1rmfiqmxsj6skbi17g007zqgjsb50b59slfni2n4mz06xmgbx",
"sha256bin64": null,
"version": "88.0.4324.146",
"sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q",
"sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id",
"deps": {
"gn": {
"version": "2020-11-05",
@ -55,8 +55,8 @@
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
},
"ungoogled-patches": {
"rev": "88.0.4324.104-1",
"sha256": "09x6kxd99a274mln3k3ckly6swyp5qdnkkp8p6grs9nr5jrgqqx5"
"rev": "88.0.4324.146-1",
"sha256": "0vp53b3jdsay6a17n27vi6cj10jj6zz94gr9ip4r5zf45qq6jx3w"
}
}
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmfile";
version = "0.138.1";
version = "0.138.2";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-ZViDnV2b9od3yBfROBBZPsuFX8FH/rSO/epZtuCO1ps=";
sha256 = "sha256-hy673acO9/fJL/80VTnQS8t9jXb7y9KVSVa0Zmja4uk=";
};
vendorSha256 = "sha256-BWWmdKrxay0Qy5z+UFFZ3we5C7wI1KUHv6qHF4TPzJE=";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, wrapQtAppsHook, qtbase }:
stdenv.mkDerivation rec {
pname = "rclone-browser";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33";
};
patches = [
# patch for Qt 5.15, https://github.com/kapitainsky/RcloneBrowser/pull/126
(fetchpatch {
url = "https://github.com/kapitainsky/RcloneBrowser/commit/ce9cf52e9c584a2cc85a5fa814b0fd7fa9cf0152.patch";
sha256 = "0nm42flmaq7mva9j4dpp18i1xcv8gr08zfyb9apz1zwn79h1w0c8";
})
];
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [ qtbase ];

View file

@ -7,7 +7,7 @@ with lib.strings;
let
withPackages' = {
pkgs,
ghc ? ghcWithPackages (p: with p; [ ieee ])
ghc ? ghcWithPackages (p: with p; [ ieee754 ])
}: let
pkgs' = if builtins.isList pkgs then pkgs else pkgs self;
library-file = writeText "libraries" ''
@ -70,7 +70,7 @@ let
installPhase = if installPhase != null then installPhase else ''
runHook preInstall
mkdir -p $out
find \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} +
find -not \( -path ${everythingFile} -or -path ${lib.interfaceFile everythingFile} \) -and \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} +
runHook postInstall
'';
};

View file

@ -0,0 +1,10 @@
{ lib }:
{
/* Returns the Agda interface file to a given Agda file.
*
* Examples:
* interfaceFile "Everything.agda" == "Everything.agdai"
* interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai"
*/
interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai";
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20210101";
version = "20210201";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
sha256 = "sha256-RHuT+zJQyhiApeLuh821PMI9dmD20OoRVxezF/uCWoE=";
sha256 = "sha256-TQEpNFmsloq1jIg6QsuY8kllINpmwJCY+Anwker6Z5M=";
};
nativeBuildInputs = [

View file

@ -1,14 +1,14 @@
{ lib, mkDerivation, fetchFromGitHub, standard-library }:
mkDerivation rec {
version = "0.1.4";
version = "0.1.5";
pname = "agda-categories";
src = fetchFromGitHub {
owner = "agda";
repo = "agda-categories";
rev = "v${version}";
sha256 = "1bcvmxcnl1ig38fxqkx8ydidhxq6a0kn2k9waf0lygh4ap928sgk";
sha256 = "1b5gj0r2z5fhh7k8b9s2kx4rjv8gi5y8ijgrbcvsa06n3acap3lm";
};
buildInputs = [ standard-library ];

View file

@ -1,7 +1,7 @@
{ fetchFromGitHub, lib, mkDerivation, standard-library }:
mkDerivation rec {
version = "0.1";
version = "0.2";
pname = "functional-linear-algebra";
buildInputs = [ standard-library ];
@ -10,9 +10,13 @@ mkDerivation rec {
repo = "functional-linear-algebra";
owner = "ryanorendorff";
rev = "v${version}";
sha256 = "09ri3jmgp9jjwi1mzv4c3w6rvcmyx6spa2qxpwlcn0f4bmfva6wm";
sha256 = "1dz7kh92df23scl1pkhn70n1f2v3d0x84liphn9kpsd6wlsxccxc";
};
preConfigure = ''
sh generate-everything.sh
'';
meta = with lib; {
homepage = "https://github.com/ryanorendorff/functional-linear-algebra";
description = ''

View file

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "generic";
version = "0.1.0.1";
version = "0.1.0.2";
src = fetchFromGitHub {
repo = "Generic";
owner = "effectfully";
repo = "Generic";
rev = "v${version}";
sha256 = "07l44yzx1jly20kmkmkjk8q493bn6x7i3xxpz6mhadkqlxyhmc8s";
sha256 = "05igsd2gaj6h9bkqwp8llhvn4qvc5gmi03x4fnz096ba8m6x8s3n";
};
buildInputs = [

View file

@ -2,18 +2,21 @@
mkDerivation rec {
pname = "standard-library";
version = "1.4";
version = "1.5";
src = fetchFromGitHub {
repo = "agda-stdlib";
owner = "agda";
rev = "v${version}";
sha256 = "1asjbisb7pfkgzqy7gf9b23z63bba8l8p1wqfd6ff5ddgqwj3dhp";
sha256 = "16fcb7ssj6kj687a042afaa2gq48rc8abihpm14k684ncihb2k4w";
};
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
preConfigure = ''
runhaskell GenerateEverything.hs
# We will only build/consider Everything.agda, in particular we don't want Everything*.agda
# do be copied to the store.
rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda
'';
meta = with lib; {

View file

@ -2,27 +2,30 @@
, fetchPypi
, isPy27
, lib
, numpy
}:
buildPythonPackage rec {
pname = "javaobj-py3";
version = "0.4.1";
version = "0.4.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "419ff99543469e68149f875abb0db5251cecd350c03d2bfb4c94a5796f1cbc14";
sha256 = "sha256-7Tsf/P058WVynLU1h8ygKrC/pMMyyDepLV/+au9cgBA=";
};
propagatedBuildInputs = [ numpy ];
# Tests assume network connectivity
doCheck = false;
meta = {
pythonImportsCheck = [ "javaobj" ];
meta = with lib; {
description = "Module for serializing and de-serializing Java objects";
homepage = "https://github.com/tcalmant/python-javaobj";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kamadorueda
];
license = licenses.asl20;
maintainers = with maintainers; [ kamadorueda ];
};
}

View file

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "pysyncobj";
version = "0.3.7";
src = fetchFromGitHub {
owner = "bakwc";
repo = "PySyncObj";
rev = version;
sha256 = "0i7gjapaggkfvys4rgd4krpmh6mxwpzv30ngiwb6ddgp8jx0nzxk";
};
# Tests require network features
doCheck = false;
pythonImportsCheck = [ "pysyncobj" ];
meta = with lib; {
description = "Python library for replicating your class";
homepage = "https://github.com/bakwc/PySyncObj";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
{ lib, stdenv, fetchFromGitHub
, autoreconfHook269, util-linux, nukeReferences, coreutils
, perl, buildPackages
, configFile ? "all"
@ -21,12 +21,6 @@ let
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "all" ];
# remove this patch at the next ZFS release (> 2.0.1)
reapplyPathSanitizerPatch = fetchpatch {
url = "https://github.com/openzfs/zfs/commit/03f036cbccdd8699f5fe8540ef317595a35bceb8.patch";
sha256 = "c157bbb6551a4e720c3faba005e1b72e4692d304c6ff5e0e685691bd47197dca";
};
common = { version
, sha256
, extraPatches ? []
@ -192,11 +186,9 @@ in {
# incompatibleKernelVersion = "4.20";
# this package should point to the latest release.
version = "2.0.1";
version = "2.0.2";
sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
extraPatches = [ reapplyPathSanitizerPatch ];
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
};
zfsUnstable = common {
@ -204,10 +196,8 @@ in {
# incompatibleKernelVersion = "4.19";
# this package should point to a version / git revision compatible with the latest kernel release
version = "2.0.1";
version = "2.0.2";
sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
extraPatches = [ reapplyPathSanitizerPatch ];
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bazarr";
version = "0.9.0.7";
version = "0.9.0.8";
src = fetchurl {
url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
sha256 = "1nskhdb1pcgwp39ld8zrnngzsq6g1pn59nb211qhf6rsj0nyahic";
sha256 = "sha256-Ecbx7FHpcEkcWBAKCtZPtQKX5ibvU4tajSJ5pyEboKc=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "nfs-ganesha";
version = "3.4";
version = "3.5";
src = fetchFromGitHub {
owner = "nfs-ganesha";
repo = "nfs-ganesha";
rev = "V${version}";
sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k";
sha256 = "sha256-N0qVlnMshsEcWEpPhtR+zXwFKXlik1XnEuZdFMjpZTE=";
};
patches = [ ./sysstatedir.patch ];

View file

@ -1,14 +1,17 @@
{ lib, pythonPackages, fetchFromGitHub }:
{ lib
, pythonPackages
, fetchFromGitHub
}:
pythonPackages.buildPythonApplication rec {
pname = "patroni";
version = "1.6.5";
version = "2.0.1";
src = fetchFromGitHub {
owner = "zalando";
repo = pname;
rev = "v${version}";
sha256 = "0iw0ra9fya4bf1vkjq3w5kij4x46yinb90v015pi9c6qfpancfdj";
sha256 = "sha256-IlRltJrEMrRiwVVMYQywb0MqwEoL8MX3do2GlHXjuPc=";
};
# cdiff renamed to ydiff; remove when patroni source reflects this.
@ -28,6 +31,7 @@ pythonPackages.buildPythonApplication rec {
prettytable
psutil
psycopg2
pysyncobj
python-dateutil
python-etcd
pyyaml
@ -40,13 +44,15 @@ pythonPackages.buildPythonApplication rec {
flake8
mock
pytestCheckHook
pytestcov
pytest-cov
requests
];
# Fix tests by preventing them from writing to /homeless-shelter.
preCheck = "export HOME=$(mktemp -d)";
pythonImportsCheck = [ "patroni" ];
meta = with lib; {
homepage = "https://patroni.readthedocs.io/en/latest/";
description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul";

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "sfeed";
version = "0.9.20";
version = "0.9.21";
src = fetchgit {
url = "git://git.codemadness.org/sfeed";
rev = version;
sha256 = "17bs31wns71fx7s06rdzqkghkgv86r9d9i3814rznyzi9484c7aq";
sha256 = "010wasp6hcnwbf0d3gaxmjpkvr85zyv2xxz2pnkwxyk2bbr1h6q8";
};
installPhase = ''

View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
version = "0.9.16";
version = "0.9.17";
pname = "smenu";
src = fetchFromGitHub {
owner = "p-gen";
repo = "smenu";
rev = "v${version}";
sha256 = "1vlsrc071fznqnz67jbhrc4pcfwzc737lwd9jxpnidn0i08py5p2";
sha256 = "1p8y1fgrfb7jxmv5ycvvnqaz7ghdi50paisgzk71169fqwp1crfa";
};
buildInputs = [ ncurses ];

View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:
stdenv.mkDerivation {
name = "pinentry-mac-0.9.4";
pname = "pinentry-mac";
version = "0.9.4";
src = fetchFromGitHub {
owner = "matthewbauer";

View file

@ -11,6 +11,8 @@ let
in {
inherit mkDerivation;
lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; });
agda = withPackages [] // { inherit withPackages; };
standard-library = callPackage ../development/libraries/agda/standard-library {

View file

@ -8261,7 +8261,7 @@ in
textadept11 = callPackage ../applications/editors/textadept/11 { };
texworks = libsForQt514.callPackage ../applications/editors/texworks { };
texworks = libsForQt5.callPackage ../applications/editors/texworks { };
thc-hydra = callPackage ../tools/security/thc-hydra { };
@ -24567,7 +24567,7 @@ in
rclone = callPackage ../applications/networking/sync/rclone { };
rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { };
rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
rcs = callPackage ../applications/version-management/rcs { };

View file

@ -5996,6 +5996,8 @@ in {
pysychonaut = callPackage ../development/python-modules/pysychonaut { };
pysyncobj = callPackage ../development/python-modules/pysyncobj { };
pytabix = callPackage ../development/python-modules/pytabix { };
pytado = callPackage ../development/python-modules/pytado { };