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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-17 18:01:53 +00:00 committed by GitHub
commit ef802e744e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
61 changed files with 762 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/languages-frameworks/coq.section.md
View File

@ -33,6 +33,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against.
* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
* `opam-name` (optional, defaults to `coq-` followed by the value of `pname`), name of the Dune package to build.
* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.
* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
* `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`,

10
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -172,6 +172,16 @@
</para>
</listitem>
</itemizedlist>
<itemizedlist spacing="compact">
<listitem>
<para>
<link xlink:href="https://www.navidrome.org/">navidrome</link>,
a personal music streaming server with subsonic-compatible
api. Available as
<link linkend="opt-services.navidrome.enable">navidrome</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-incompatibilities">
<title>Backward Incompatibilities</title>

3
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -53,6 +53,9 @@ pt-services.clipcat.enable).
- [isso](https://posativ.org/isso/), a commenting server similar to Disqus.
Available as [isso](#opt-services.isso.enable)
* [navidrome](https://www.navidrome.org/), a personal music streaming server with
subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable).
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1

1
nixos/modules/module-list.nix
View File

@ -254,6 +254,7 @@
./services/audio/mopidy.nix
./services/audio/networkaudiod.nix
./services/audio/roon-bridge.nix
./services/audio/navidrome.nix
./services/audio/roon-server.nix
./services/audio/slimserver.nix
./services/audio/snapserver.nix

2
nixos/modules/security/pam.nix
View File

@ -828,7 +828,7 @@ in
};
challengeResponsePath = mkOption {
default = null;
type = types.path;
type = types.nullOr types.path;
description = ''
If not null, set the path used by yubico pam module where the challenge expected response is stored.

71
nixos/modules/services/audio/navidrome.nix Normal file
View File

@ -0,0 +1,71 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.navidrome;
settingsFormat = pkgs.formats.json {};
in {
options = {
services.navidrome = {
enable = mkEnableOption pkgs.navidrome.meta.description;
settings = mkOption rec {
type = settingsFormat.type;
apply = recursiveUpdate default;
default = {
Address = "127.0.0.1";
Port = 4533;
};
example = {
MusicFolder = "/mnt/music";
};
description = ''
Configuration for Navidrome, see <link xlink:href="https://www.navidrome.org/docs/usage/configuration-options/"/> for supported values.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.navidrome = {
description = "Navidrome Media Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = ''
${pkgs.navidrome}/bin/navidrome --configfile ${settingsFormat.generate "navidrome.json" cfg.settings}
'';
DynamicUser = true;
StateDirectory = "navidrome";
WorkingDirectory = "/var/lib/navidrome";
RuntimeDirectory = "navidrome";
RootDirectory = "/run/navidrome";
ReadWritePaths = "";
BindReadOnlyPaths = [
builtins.storeDir
] ++ lib.optional (cfg.settings ? MusicFolder) cfg.settings.MusicFolder;
CapabilityBoundingSet = "";
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
RestrictNamespaces = true;
PrivateDevices = true;
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
RestrictRealtime = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
UMask = "0066";
ProtectHostname = true;
};
};
};
}

1
nixos/tests/all-tests.nix
View File

@ -283,6 +283,7 @@ in
nat.firewall = handleTest ./nat.nix { withFirewall = true; };
nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };
nat.standalone = handleTest ./nat.nix { withFirewall = false; };
navidrome = handleTest ./navidrome.nix {};
ncdns = handleTest ./ncdns.nix {};
ndppd = handleTest ./ndppd.nix {};
nebula = handleTest ./nebula.nix {};

12
nixos/tests/navidrome.nix Normal file
View File

@ -0,0 +1,12 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "navidrome";
machine = { ... }: {
services.navidrome.enable = true;
};
testScript = ''
machine.wait_for_unit("navidrome")
machine.wait_for_open_port("4533")
'';
})

4
pkgs/applications/audio/mpdevil/default.nix
View File

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "mpdevil";
version = "1.1.1";
version = "1.3.0";
src = fetchFromGitHub {
owner = "SoongNoonien";
repo = pname;
rev = "v${version}";
sha256 = "0l7mqv7ys05al2hds4icb32hf14fqi3n7b0f5v1yx54cbl9cqfap";
sha256 = "1wa5wkkv8kvzlxrhqmmhjmrzcm5v2dij516dk4vlpv9sazc6gzkm";
};
nativeBuildInputs = [

4
pkgs/applications/blockchains/namecoin/default.nix
View File

@ -3,14 +3,14 @@
with lib;
stdenv.mkDerivation rec {
version = "nc0.20.1";
version = "nc0.21.1";
name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
src = fetchFromGitHub {
owner = "namecoin";
repo = "namecoin-core";
rev = version;
sha256 = "1wpfp9y95lmfg2nk1xqzchwck1wk6gwkya1rj07mf5in9jngxk9z";
sha256 = "sha256-dA4BGhxHm0EdvqMq27zzWp2vOPyKbCgV1i1jt17TVxU=";
};
nativeBuildInputs = [

2
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View File

@ -46,7 +46,7 @@
pname = "agda-mode";
version = pkgs.haskellPackages.Agda.version;
phases = [ "buildPhase" "installPhase" ];
dontUnpack = true;
# already byte-compiled by Agda builder
buildPhase = ''

8
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "4.0.2312.38-1";
version = "4.1.2369.18-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "1sdg22snphjsrmxi3fvy41dnjsxpajbhni9bpidk8msa9xgxvzpx";
sha256 = "062zh7a4mr52h9m09dnqrdc48ajnkq887kcbcvzcd20wsnvivi48";
};
unpackPhase = ''
@ -49,10 +49,12 @@ in stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
echo "Patching Vivaldi binaries"
for f in crashpad_handler vivaldi-bin vivaldi-sandbox ; do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \
opt/${vivaldiName}/vivaldi-bin
opt/${vivaldiName}/$f
done
'' + lib.optionalString proprietaryCodecs ''
ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*}
'' + ''

2
pkgs/applications/networking/cluster/helmfile/default.nix
View File

@ -8,7 +8,7 @@ buildGoModule rec {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
sha256 = "sha256-Y1BlvUudxEZ1G893dwYU+R6k2QAYohx4+0yysYaUM0E=";
sha256 = "sha256-D9CyJE6/latz4541NfOtvKy+kui3CVmD483SkdEJzyU=";
};
vendorSha256 = "sha256-QYI5HxEUNrZKSjk0LlbhjvxXlWCbbLup51Ht3HJDNC8=";

4
pkgs/applications/networking/cluster/multus-cni/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "multus-cni";
version = "3.7.1";
version = "3.7.2";
src = fetchFromGitHub {
owner = "k8snetworkplumbingwg";
repo = pname;
rev = "v${version}";
sha256 = "04rn7ypd0cw2c33wqb9wqy1dp6ajvcp7rcv7zybffb1d40mdlds1";
sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs=";
};
buildFlagsArray = let

7
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.7.34",
"version": "1.8.1",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@ -54,6 +54,7 @@
"@types/minimist": "^1.2.1",
"@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"allchange": "^1.0.0",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
"electron": "^13.1.7",
@ -63,7 +64,7 @@
"electron-notarize": "^1.0.0",
"eslint": "7.18.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main",
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945",
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
@ -73,7 +74,7 @@
"node-pre-gyp": "^0.15.0",
"pacote": "^11.3.5",
"rimraf": "^3.0.2",
"tar": "^6.1.0",
"tar": "^6.1.2",
"typescript": "^4.1.3"
},
"hakDependencies": {

360
pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View File

@ -9,6 +9,30 @@
sha1 = "9274ec7460652f9c632c59addf24efb1684ef876";
};
}
{
name = "_actions_core___core_1.4.0.tgz";
path = fetchurl {
name = "_actions_core___core_1.4.0.tgz";
url = "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz";
sha1 = "cf2e6ee317e314b03886adfeb20e448d50d6e524";
};
}
{
name = "_actions_github___github_5.0.0.tgz";
path = fetchurl {
name = "_actions_github___github_5.0.0.tgz";
url = "https://registry.yarnpkg.com/@actions/github/-/github-5.0.0.tgz";
sha1 = "1754127976c50bd88b2e905f10d204d76d1472f8";
};
}
{
name = "_actions_http_client___http_client_1.0.11.tgz";
path = fetchurl {
name = "_actions_http_client___http_client_1.0.11.tgz";
url = "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz";
sha1 = "c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0";
};
}
{
name = "_babel_code_frame___code_frame_7.14.5.tgz";
path = fetchurl {
@ -481,6 +505,134 @@
sha1 = "f250a0c5e1a08a792d775a315d0ff42fc3a51e1d";
};
}
{
name = "_octokit_auth_token___auth_token_2.4.5.tgz";
path = fetchurl {
name = "_octokit_auth_token___auth_token_2.4.5.tgz";
url = "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.5.tgz";
sha1 = "568ccfb8cb46f36441fac094ce34f7a875b197f3";
};
}
{
name = "_octokit_core___core_3.5.1.tgz";
path = fetchurl {
name = "_octokit_core___core_3.5.1.tgz";
url = "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz";
sha1 = "8601ceeb1ec0e1b1b8217b960a413ed8e947809b";
};
}
{
name = "_octokit_endpoint___endpoint_6.0.12.tgz";
path = fetchurl {
name = "_octokit_endpoint___endpoint_6.0.12.tgz";
url = "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz";
sha1 = "3b4d47a4b0e79b1027fb8d75d4221928b2d05658";
};
}
{
name = "_octokit_graphql___graphql_4.6.4.tgz";
path = fetchurl {
name = "_octokit_graphql___graphql_4.6.4.tgz";
url = "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.4.tgz";
sha1 = "0c3f5bed440822182e972317122acb65d311a5ed";
};
}
{
name = "_octokit_openapi_types___openapi_types_9.3.0.tgz";
path = fetchurl {
name = "_octokit_openapi_types___openapi_types_9.3.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.3.0.tgz";
sha1 = "160347858d727527901c6aae7f7d5c2414cc1f2e";
};
}
{
name = "_octokit_openapi_types___openapi_types_9.7.0.tgz";
path = fetchurl {
name = "_octokit_openapi_types___openapi_types_9.7.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.7.0.tgz";
sha1 = "9897cdefd629cd88af67b8dbe2e5fb19c63426b2";
};
}
{
name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.1.tgz";
path = fetchurl {
name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.1.tgz";
url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz";
sha1 = "264189dd3ce881c6c33758824aac05a4002e056a";
};
}
{
name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz";
path = fetchurl {
name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz";
sha1 = "9c956c3710b2bd786eb3814eaf5a2b17392c150d";
};
}
{
name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz";
path = fetchurl {
name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz";
url = "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz";
sha1 = "5e50ed7083a613816b1e4a28aeec5fb7f1462e85";
};
}
{
name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz";
path = fetchurl {
name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.6.0.tgz";
sha1 = "c28833b88d0f07bf94093405d02d43d73c7de99b";
};
}
{
name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz";
path = fetchurl {
name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz";
sha1 = "33b342fe41f2603fdf8b958e6652103bb3ea3f3b";
};
}
{
name = "_octokit_request_error___request_error_2.1.0.tgz";
path = fetchurl {
name = "_octokit_request_error___request_error_2.1.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz";
sha1 = "9e150357831bfc788d13a4fd4b1913d60c74d677";
};
}
{
name = "_octokit_request___request_5.6.0.tgz";
path = fetchurl {
name = "_octokit_request___request_5.6.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz";
sha1 = "6084861b6e4fa21dc40c8e2a739ec5eff597e672";
};
}
{
name = "_octokit_rest___rest_18.8.0.tgz";
path = fetchurl {
name = "_octokit_rest___rest_18.8.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.8.0.tgz";
sha1 = "ba24f7ba554f015a7ae2b7cc2aecef5386ddfea5";
};
}
{
name = "_octokit_types___types_6.23.0.tgz";
path = fetchurl {
name = "_octokit_types___types_6.23.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.23.0.tgz";
sha1 = "b39f242b20036e89fa8f34f7962b4e9b7ff8f65b";
};
}
{
name = "_octokit_types___types_6.25.0.tgz";
path = fetchurl {
name = "_octokit_types___types_6.25.0.tgz";
url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.25.0.tgz";
sha1 = "c8e37e69dbe7ce55ed98ee63f75054e7e808bf1a";
};
}
{
name = "_sindresorhus_is___is_0.14.0.tgz";
path = fetchurl {
@ -745,6 +897,14 @@
sha1 = "2fb45e0e5fcbc0813326c1c3da535d1881bb0571";
};
}
{
name = "allchange___allchange_1.0.0.tgz";
path = fetchurl {
name = "allchange___allchange_1.0.0.tgz";
url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.0.tgz";
sha1 = "f5177b7d97f8e97a2d059a1524db9a72d94dc6d2";
};
}
{
name = "ansi_align___ansi_align_3.0.0.tgz";
path = fetchurl {
@ -1041,6 +1201,14 @@
sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
};
}
{
name = "before_after_hook___before_after_hook_2.2.2.tgz";
path = fetchurl {
name = "before_after_hook___before_after_hook_2.2.2.tgz";
url = "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz";
sha1 = "a6e8ca41028d90ee2c24222f201c90956091613e";
};
}
{
name = "binary_extensions___binary_extensions_2.2.0.tgz";
path = fetchurl {
@ -1297,6 +1465,14 @@
sha1 = "ddd5035d25094fce220e9cab40a45840a440318f";
};
}
{
name = "cli_color___cli_color_2.0.0.tgz";
path = fetchurl {
name = "cli_color___cli_color_2.0.0.tgz";
url = "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.0.tgz";
sha1 = "11ecfb58a79278cf6035a60c54e338f9d837897c";
};
}
{
name = "cli_truncate___cli_truncate_1.1.0.tgz";
path = fetchurl {
@ -1529,6 +1705,14 @@
sha1 = "408086d409550c2631155619e9fa7bcadc3b991b";
};
}
{
name = "d___d_1.0.1.tgz";
path = fetchurl {
name = "d___d_1.0.1.tgz";
url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz";
sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a";
};
}
{
name = "dashdash___dashdash_1.14.1.tgz";
path = fetchurl {
@ -1641,6 +1825,14 @@
sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
};
}
{
name = "deprecation___deprecation_2.3.1.tgz";
path = fetchurl {
name = "deprecation___deprecation_2.3.1.tgz";
url = "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz";
sha1 = "6368cbdb40abf3373b525ac87e4a260c3a700919";
};
}
{
name = "detect_libc___detect_libc_1.0.3.tgz";
path = fetchurl {
@ -1881,6 +2073,14 @@
sha1 = "23c2f3b756ffdfc608d30e27c9a941024807e7f9";
};
}
{
name = "es5_ext___es5_ext_0.10.53.tgz";
path = fetchurl {
name = "es5_ext___es5_ext_0.10.53.tgz";
url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz";
sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1";
};
}
{
name = "es6_error___es6_error_4.1.1.tgz";
path = fetchurl {
@ -1889,6 +2089,30 @@
sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d";
};
}
{
name = "es6_iterator___es6_iterator_2.0.3.tgz";
path = fetchurl {
name = "es6_iterator___es6_iterator_2.0.3.tgz";
url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz";
sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
};
}
{
name = "es6_symbol___es6_symbol_3.1.3.tgz";
path = fetchurl {
name = "es6_symbol___es6_symbol_3.1.3.tgz";
url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz";
sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18";
};
}
{
name = "es6_weak_map___es6_weak_map_2.0.3.tgz";
path = fetchurl {
name = "es6_weak_map___es6_weak_map_2.0.3.tgz";
url = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz";
sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53";
};
}
{
name = "escalade___escalade_3.1.1.tgz";
path = fetchurl {
@ -1930,11 +2154,11 @@
};
}
{
name = "50d6bdf6704dd95016d5f1f824f00cac6eaa64e1";
name = "2306b3d4da4eba908b256014b979f1d3d43d2945";
path = fetchurl {
name = "50d6bdf6704dd95016d5f1f824f00cac6eaa64e1";
url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/50d6bdf6704dd95016d5f1f824f00cac6eaa64e1";
sha1 = "ecd130b39eb8bc2f11acdfb859b3529748a364e1";
name = "2306b3d4da4eba908b256014b979f1d3d43d2945";
url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2306b3d4da4eba908b256014b979f1d3d43d2945";
sha1 = "e82e07e6163d15ee5243d8df073947540bf0efc9";
};
}
{
@ -2041,6 +2265,14 @@
sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64";
};
}
{
name = "event_emitter___event_emitter_0.3.5.tgz";
path = fetchurl {
name = "event_emitter___event_emitter_0.3.5.tgz";
url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz";
sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
};
}
{
name = "except___except_0.1.3.tgz";
path = fetchurl {
@ -2065,6 +2297,14 @@
sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692";
};
}
{
name = "ext___ext_1.4.0.tgz";
path = fetchurl {
name = "ext___ext_1.4.0.tgz";
url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz";
sha1 = "89ae7a07158f79d35517882904324077e4379244";
};
}
{
name = "extend___extend_3.0.2.tgz";
path = fetchurl {
@ -2833,6 +3073,22 @@
sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283";
};
}
{
name = "is_plain_object___is_plain_object_5.0.0.tgz";
path = fetchurl {
name = "is_plain_object___is_plain_object_5.0.0.tgz";
url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz";
sha1 = "4427f50ab3429e9025ea7d52e9043a9ef4159344";
};
}
{
name = "is_promise___is_promise_2.2.2.tgz";
path = fetchurl {
name = "is_promise___is_promise_2.2.2.tgz";
url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz";
sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1";
};
}
{
name = "is_typedarray___is_typedarray_1.0.0.tgz";
path = fetchurl {
@ -3050,11 +3306,11 @@
};
}
{
name = "jszip___jszip_3.6.0.tgz";
name = "jszip___jszip_3.7.1.tgz";
path = fetchurl {
name = "jszip___jszip_3.6.0.tgz";
url = "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz";
sha1 = "839b72812e3f97819cc13ac4134ffced95dd6af9";
name = "jszip___jszip_3.7.1.tgz";
url = "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz";
sha1 = "bd63401221c15625a1228c556ca8a68da6fda3d9";
};
}
{
@ -3185,6 +3441,14 @@
sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c";
};
}
{
name = "loglevel___loglevel_1.7.1.tgz";
path = fetchurl {
name = "loglevel___loglevel_1.7.1.tgz";
url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz";
sha1 = "005fde2f5e6e47068f935ff28573e125ef72f197";
};
}
{
name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
path = fetchurl {
@ -3209,6 +3473,14 @@
sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94";
};
}
{
name = "lru_queue___lru_queue_0.1.0.tgz";
path = fetchurl {
name = "lru_queue___lru_queue_0.1.0.tgz";
url = "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz";
sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
};
}
{
name = "make_dir___make_dir_3.1.0.tgz";
path = fetchurl {
@ -3241,6 +3513,14 @@
sha1 = "efbc392e3523669d20b812a6dae2f6efb49b888d";
};
}
{
name = "memoizee___memoizee_0.4.15.tgz";
path = fetchurl {
name = "memoizee___memoizee_0.4.15.tgz";
url = "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz";
sha1 = "e6f3d2da863f318d02225391829a6c5956555b72";
};
}
{
name = "merge2___merge2_1.4.1.tgz";
path = fetchurl {
@ -3481,6 +3761,22 @@
sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb";
};
}
{
name = "next_tick___next_tick_1.1.0.tgz";
path = fetchurl {
name = "next_tick___next_tick_1.1.0.tgz";
url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz";
sha1 = "1836ee30ad56d67ef281b22bd199f709449b35eb";
};
}
{
name = "next_tick___next_tick_1.0.0.tgz";
path = fetchurl {
name = "next_tick___next_tick_1.0.0.tgz";
url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz";
sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
};
}
{
name = "node_addon_api___node_addon_api_1.7.2.tgz";
path = fetchurl {
@ -3489,6 +3785,14 @@
sha1 = "3df30b95720b53c24e59948b49532b662444f54d";
};
}
{
name = "node_fetch___node_fetch_2.6.1.tgz";
path = fetchurl {
name = "node_fetch___node_fetch_2.6.1.tgz";
url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz";
sha1 = "045bd323631f76ed2e2b55573394416b639a0052";
};
}
{
name = "node_gyp___node_gyp_7.1.2.tgz";
path = fetchurl {
@ -4610,11 +4914,11 @@
};
}
{
name = "tar___tar_6.1.0.tgz";
name = "tar___tar_6.1.2.tgz";
path = fetchurl {
name = "tar___tar_6.1.0.tgz";
url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz";
sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83";
name = "tar___tar_6.1.2.tgz";
url = "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz";
sha1 = "1f045a90a6eb23557a603595f41a16c57d47adc6";
};
}
{
@ -4633,6 +4937,14 @@
sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
};
}
{
name = "timers_ext___timers_ext_0.1.7.tgz";
path = fetchurl {
name = "timers_ext___timers_ext_0.1.7.tgz";
url = "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz";
sha1 = "6f57ad8578e07a3fb9f91d9387d65647555e25c6";
};
}
{
name = "timm___timm_1.7.1.tgz";
path = fetchurl {
@ -4809,6 +5121,22 @@
sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d";
};
}
{
name = "type___type_1.2.0.tgz";
path = fetchurl {
name = "type___type_1.2.0.tgz";
url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz";
sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0";
};
}
{
name = "type___type_2.5.0.tgz";
path = fetchurl {
name = "type___type_2.5.0.tgz";
url = "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz";
sha1 = "0a2e78c2e77907b252abe5f298c1b01c63f0db3d";
};
}
{
name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz";
path = fetchurl {
@ -4857,6 +5185,14 @@
sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d";
};
}
{
name = "universal_user_agent___universal_user_agent_6.0.0.tgz";
path = fetchurl {
name = "universal_user_agent___universal_user_agent_6.0.0.tgz";
url = "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz";
sha1 = "3381f8503b251c0d9cd21bc1de939ec9df5480ee";
};
}
{
name = "universalify___universalify_0.1.2.tgz";
path = fetchurl {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -19,12 +19,12 @@
let
executableName = "element-desktop";
version = "1.7.34";
version = "1.8.1";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY=";
sha256 = "sha256-FIKbyfnRuHBbmtjwxNC//n5UiGTCQNr+PeiZEi3+RGI=";
};
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.34";
version = "1.8.1";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-0M2LuVSHIGRwzq00wgzlzTVWh3WItNN+JDNf+u+9V30=";
sha256 = "sha256-C2oWYpPxMeSgGKyjUe6Ih13ggZliN4bmAX5cakzW1u8=";
};
installPhase = ''

6
pkgs/applications/networking/protonmail-bridge/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protonmail-bridge";
version = "1.6.9";
version = "1.8.7";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-bridge";
rev = "br-${version}";
sha256 = "0p2315smxc5knxzr9413w62z65647znh9j9vyb6w5x4dqfp7vhz9";
sha256 = "sha256-bynPuAdeX4WxYdbjMkR9ANuYWYOINB0OHnKTmIrCB6E=";
};
vendorSha256 = "04aa7syp5hhpqxdpqlsmmbwywnbrh4ia0diym2935jbrqccnvm1k";
vendorSha256 = "sha256-g2vl1Ctxr2U+D/k9u9oXuZ1OWaABIJs0gmfhWh13ZFM=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/science/electronics/openhantek6022/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "openhantek6022";
version = "3.2.3";
version = "3.2.4";
src = fetchFromGitHub {
owner = "OpenHantek";
repo = "OpenHantek6022";
rev = version;
sha256 = "0hnd3rdmv76dwwlmkykzwhp5sbxd1fr5ss8zdfdybxw28cxlpq8r";
sha256 = "sha256-Rb0bd2fnnNWEm1n2EVRB2Leb0Or9vxi5oj+FKNY4GSc=";
};
nativeBuildInputs = [ cmake makeWrapper ];

5
pkgs/applications/version-management/monotone/default.nix
View File

@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd";
};
patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];
patches = [
./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
./monotone-1.1-adapt-to-botan2.patch
];
postPatch = ''
sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc

15
pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch Normal file
View File

@ -0,0 +1,15 @@
Botan2 has switched the parameter order in encryption descriptions
--- monotone-upstream/src/botan_glue.hh 2021-08-17 19:06:32.736753732 +0200
+++ monotone-patched/src/botan_glue.hh 2021-08-17 19:07:44.437750535 +0200
@@ -45,7 +45,9 @@
// In Botan revision d8021f3e (back when it still used monotone) the name
// of SHA-1 changed to SHA-160.
const static char * PBE_PKCS5_KEY_FORMAT =
-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0)
+#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(2,0,0)
+ "PBE-PKCS5v20(TripleDES/CBC,SHA-160)";
+#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0)
"PBE-PKCS5v20(SHA-160,TripleDES/CBC)";
#else
"PBE-PKCS5v20(SHA-1,TripleDES/CBC)";

10
pkgs/build-support/coq/default.nix
View File

@ -27,6 +27,7 @@ in
dropDerivationAttrs ? [],
useDune2ifVersion ? (x: false),
useDune2 ? false,
opam-name ? "coq-${pname}",
...
}@args:
let
@ -34,7 +35,7 @@ let
"version" "fetcher" "repo" "owner" "domain" "releaseRev"
"displayVersion" "defaultVersion" "useMelquiondRemake"
"release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix"
"meta" "useDune2ifVersion" "useDune2"
"meta" "useDune2ifVersion" "useDune2" "opam-name"
"extraInstallFlags" "setCOQBIN" "mlPlugin"
"dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs;
fetch = import ../coq/meta-fetch/default.nix
@ -90,9 +91,14 @@ stdenv.mkDerivation (removeAttrs ({
extraInstallFlags;
})
// (optionalAttrs useDune2 {
buildPhase = ''
runHook preBuild
dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
runHook postBuild
'';
installPhase = ''
runHook preInstall
dune install --prefix=$out
dune install ${opam-name} --prefix=$out
mv $out/lib/coq $out/lib/TEMPORARY
mkdir $out/lib/coq/
mv $out/lib/TEMPORARY $out/lib/coq/${coq.coq-version}

4
pkgs/data/themes/qogir/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qogir-theme";
version = "2021-06-25";
version = "2021-08-02";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "178lk0zffm4nd8fc872rfpm2aii1nszq0k389gkiyxkqphmknn4n";
sha256 = "sha256-U048qNBfxjx/5iHIXcqAwXfIwmux+sw4hVQkN3TDLzk=";
};
buildInputs = [ gdk-pixbuf librsvg ];

33
pkgs/development/coq-modules/addition-chains/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, paramcoq
, version ? null }:
with lib;
mkCoqDerivation {
pname = "addition-chains";
repo = "hydra-battles";
release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "0.4"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra paramcoq ];
useDune2 = true;
meta = {
description = "Exponentiation algorithms following addition chains";
longDescription = ''
Addition chains are algorithms for computations of the p-th
power of some x, with the least number of multiplication as
possible. We present a few implementations of addition chains,
with proofs of their correctness.
'';
maintainers = with maintainers; [ Zimmi48 ];
license = licenses.mit;
platforms = platforms.unix;
};
}

24
pkgs/development/coq-modules/gaia/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, mkCoqDerivation, coq, mathcomp, version ? null }:
with lib; mkCoqDerivation {
pname = "gaia";
release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5";
release."1.12".sha256 = "sha256:0c6cim4x6f9944g8v0cp0lxs244lrhb04ms4y2s6y1wh321zj5mi";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.12"; }
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; }
] null;
propagatedBuildInputs =
[ mathcomp.ssreflect mathcomp.algebra ];
meta = {
description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq";
maintainers = with maintainers; [ Zimmi48 ];
license = licenses.mit;
};
}

24
pkgs/development/coq-modules/hydra-battles/default.nix
View File

@ -1,28 +1,32 @@
{ lib, mkCoqDerivation, coq, mathcomp, equations, paramcoq, version ? null }:
{ lib, mkCoqDerivation, coq, equations, version ? null }:
with lib;
mkCoqDerivation {
pname = "hydra-battles";
owner = "coq-community";
release."0.3".rev = "v0.3";
release."0.3".sha256 = "sha256-rXP/vJqVEg2tN/I9LWV13YQ1+C7M6lzGu3oI+7pSZzg=";
release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp";
releaseRev = (v: "v${v}");
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.11"; out = "0.3"; }
{ case = isGe "8.11"; out = "0.4"; }
] null;
propagatedBuildInputs = [ mathcomp equations paramcoq ];
propagatedBuildInputs = [ equations ];
useDune2 = true;
meta = {
description = "Variations on Kirby & Paris' hydra battles and other entertaining math in Coq";
description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq";
longDescription = ''
Variations on Kirby & Paris' hydra battles and other
entertaining math in Coq (collaborative, documented, includes
exercises)
An exploration of some properties of Kirby and Paris' hydra
battles, with the help of the Coq Proof assistant. This
development includes the study of several representations of
ordinal numbers, and a part of the so-called Ketonen and Solovay
machinery (combinatorial properties of epsilon0).
'';
maintainers = with maintainers; [ siraben ];
maintainers = with maintainers; [ siraben Zimmi48 ];
license = licenses.mit;
platforms = platforms.unix;
};

2
pkgs/development/coq-modules/mathcomp/default.nix
View File

@ -19,7 +19,7 @@ let
owner = "math-comp";
withDoc = single && (args.withDoc or false);
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.13"; out = "1.12.0"; } # lower version of coq to 8.10 when all mathcomp packages are ported
{ case = isGe "8.10"; out = "1.12.0"; }
{ case = range "8.7" "8.12"; out = "1.11.0"; }
{ case = range "8.7" "8.11"; out = "1.10.0"; }
{ case = range "8.7" "8.11"; out = "1.9.0"; }

3
pkgs/development/coq-modules/multinomials/default.nix
View File

@ -4,7 +4,10 @@ with lib; mkCoqDerivation {
namePrefix = [ "coq" "mathcomp" ];
pname = "multinomials";
opam-name = "coq-mathcomp-multinomials";
owner = "math-comp";
inherit version;
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.5.4"; }

72
pkgs/development/coq-modules/serapi/default.nix Normal file
View File

@ -0,0 +1,72 @@
{ lib, fetchzip, mkCoqDerivation, coq, version ? null }:
let
ocamlPackages =
coq.ocamlPackages.overrideScope'
(self: super: {
ppxlib = super.ppxlib.override { version = "0.15.0"; };
# the following does not work
ppx_sexp_conv = super.ppx_sexp_conv.overrideAttrs (_: {
src = fetchzip {
url = "https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz";
sha256 = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2";
};
});
});
release = {
"8.13.0+0.13.0".sha256 = "sha256:0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy";
"8.12.0+0.12.1".sha256 = "sha256:048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn";
"8.11.0+0.11.1".sha256 = "sha256:1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c";
"8.10.0+0.7.2".sha256 = "sha256:1ljzm63hpd0ksvkyxcbh8rdf7p90vg91gb4h0zz0941v1zh40k8c";
};
in
(with lib; mkCoqDerivation rec {
pname = "serapi";
inherit version release;
defaultVersion = with versions; switch coq.version [
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
{ case = isEq "8.12"; out = "8.12.0+0.12.1"; }
{ case = isEq "8.11"; out = "8.11.0+0.11.1"; }
{ case = isEq "8.10"; out = "8.10.0+0.7.2"; }
] null;
useDune2 = true;
propagatedBuildInputs =
with ocamlPackages; [
cmdliner
findlib # run time dependency of SerAPI
ppx_deriving
ppx_deriving_yojson
ppx_import
ppx_sexp_conv
sexplib
yojson
zarith # needed because of Coq
];
installPhase = ''
runHook preInstall
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR coq-serapi
runHook postInstall
'';
meta = with lib; {
homepage = https://github.com/ejgallego/coq-serapi;
description = "SerAPI is a library for machine-to-machine interaction with the Coq proof assistant";
license = licenses.lgpl21Plus;
maintainers = [ maintainers.Zimmi48 ];
};
}).overrideAttrs(o:
let inherit (o) version; in {
src = fetchzip {
url = "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${
if version == "8.11.0+0.11.1" then version
else builtins.replaceStrings [ "+" ] [ "." ] version
}.tbz";
sha256 = release."${version}".sha256;
};
})

4
pkgs/development/libraries/nuraft/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nuraft";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "eBay";
repo = "NuRaft";
rev = "v${version}";
sha256 = "sha256-1k+AWmpAiHcQVEB5kUaMtNWhOnTBnmJiNU8zL1J/PEk=";
sha256 = "sha256-Fyy9B5CXyMcDSOdqaeJ4ejo1svM90ESXuNL0rzsTZpE=";
};
nativeBuildInputs = [ cmake ];

10
pkgs/development/libraries/opendht/default.nix
View File

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, darwin
, cmake, pkg-config
, asio, nettle, gnutls, msgpack, readline, libargon2
}:
stdenv.mkDerivation rec {
pname = "opendht";
version = "2.1.6";
version = "2.2.0";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = version;
sha256 = "0sjb2a3yqnabwgmmn8gapc1dq9m8vp9z8w85zhsj654i5h3gp6zv";
sha256 = "sha256-u4MWMUbnq2q4FH0TMpbrbhS5erAfT4/3HYGLXaLTz+I=";
};
nativeBuildInputs =
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
msgpack
readline
libargon2
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
outputs = [ "out" "lib" "dev" "man" ];
@ -35,6 +37,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/savoirfairelinux/opendht";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ taeer olynch thoughtpolice ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/openimagedenoise/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "openimagedenoise";
version = "1.4.0";
version = "1.4.1";
# The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs
src = fetchzip {
url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz";
sha256 = "sha256-UsiZT3ufRVo1BQ/md/A3CXpUfMPrJR1DhZg9hrjOG2A=";
sha256 = "sha256-TQ7cL0/6pnSTuW21DESA5I3S/C1BHStrWK9yaPoim6E=";
};
nativeBuildInputs = [ cmake python3 ispc ];

4
pkgs/development/libraries/orcania/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, check, subunit }:
stdenv.mkDerivation rec {
pname = "orcania";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "babelouest";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tArXiXmoWHd42IGBZKtc4QJIBy3USPlSeW+Dv5xl1EU=";
sha256 = "sha256-6Libn+S5c7sCmKGq8KojiUhI18zO37rgiiVwQxP3p4o=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/precice/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "precice";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "precice";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AQc+p/twsfkzwpWeznGpLLSqINKSrWCwH+PdNIrdYA8=";
sha256 = "sha256-XEdrKhxG0dhsfJH6glrzc+JZeCgPEVIswj0ofP838lg=";
};
cmakeFlags = [

29
pkgs/development/python-modules/alectryon/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchPypi, pygments, dominate, beautifulsoup4, docutils, sphinx }:
buildPythonPackage rec {
pname = "alectryon";
owner = "cpitclaudel";
version = "1.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256:0mca25jv917myb4n91ccpl5fz058aiqsn8cniflwfw5pp6lqnfg7";
};
propagatedBuildInputs = [
pygments
dominate
beautifulsoup4
docutils
sphinx
];
doCheck = false;
meta = with lib; {
homepage = "https://github.com/cpitclaudel/alectryon";
description = "A collection of tools for writing technical documents that mix Coq code and prose";
license = licenses.mit;
maintainers = with maintainers; [ Zimmi48 ];
};
}

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "hvac";
version = "0.10.14";
version = "0.11.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-DGFvKdZkKtqrzUCKBEaTdO2DvhKyRQG7M36PN7rf7yI=";
sha256 = "9d5504e35388e665db5086edf75d2425831573c6569bb0bf3c2c6eaff30e034e";
};
propagatedBuildInputs = [

4
pkgs/development/tools/misc/pwndbg/default.nix
View File

@ -21,14 +21,14 @@ let
in stdenv.mkDerivation rec {
pname = "pwndbg";
version = "2020.07.23";
version = "2021.06.22";
format = "other";
src = fetchFromGitHub {
owner = "pwndbg";
repo = "pwndbg";
rev = version;
sha256 = "0w1dmjy8ii12367wza8c35a9q9x204fppf6x328q75bhb3gd845c";
sha256 = "sha256-8jaWhpn7Q3X7FBHURX6nyOAhu+C113DnC4KBSE3FBuE=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/operator-sdk/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "operator-sdk";
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "operator-framework";
repo = pname;
rev = "v${version}";
sha256 = "1qvwk2gyawa3ihi5zqynrimxf426x22kplr3gdb91m9bx9dwqs3v";
sha256 = "sha256-5eW2yrlUI0B5YNi9BtDjPsTC2vwavEXAMppa5rv5xhE=";
};
vendorSha256 = "1chfiqxljpq6rad4fnqf3dcri63qr9vb765kphw98ly4s0mwm1aj";
vendorSha256 = "sha256-gATpYjGKxOfXUnfSZ5uXrVbIydiEbijYR2axPluE5YU=";
doCheck = false;

14
pkgs/development/tools/osslsigncode/default.nix
View File

@ -1,24 +1,26 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, libgsf
, pkg-config
, openssl
, curl
, openssl
}:
stdenv.mkDerivation rec {
pname = "osslsigncode";
version = "2.1";
version = "2.2";
src = fetchFromGitHub {
owner = "mtrojnar";
repo = pname;
rev = version;
sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3";
sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ=";
};
nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ curl openssl ];
meta = with lib; {
homepage = "https://github.com/mtrojnar/osslsigncode";

4
pkgs/misc/mxt-app/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }:
stdenv.mkDerivation rec {
version="1.32";
version="1.33";
pname = "mxt-app";
src = fetchFromGitHub {
owner = "atmel-maxtouch";
repo = "mxt-app";
rev = "v${version}";
sha256 = "1z1g5h14j3yw3r9phgir33s9j07ns9c0r5lkl49940pzqycnrwbj";
sha256 = "sha256-PgIIxoyR7UA5y4UZ6meJERrbi1Bov03pJkN5St4BWss=";
};
nativeBuildInputs = [ autoreconfHook ];

6
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@ -27,12 +27,12 @@
stdenv.mkDerivation rec {
pname = "rabbitmq-server";
version = "3.9.1";
version = "3.9.3";
# when updating, consider bumping elixir version in all-packages.nix
src = fetchurl {
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc";
sha256 = "sha256-33nrS29t/a8D8Rl+d/ipRU2923QKr+EAN3rgxisCR0U=";
};
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
description = "An implementation of the AMQP messaging protocol";
license = licenses.mpl20;
platforms = platforms.unix;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ turion ];
};
}

6
pkgs/servers/caddy/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "caddy";
version = "2.4.1";
version = "2.4.3";
subPackages = [ "cmd/caddy" ];
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "caddyserver";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Wc7eNw5FZWoUT6IP84NhROC59bf4/RCw/gOWLuYI2dc=";
sha256 = "sha256-Z3BVx7gCkls5Hy+H6lA3DOBequRutwa2F34FDt9n+8I=";
};
vendorSha256 = "sha256-ZOrhR03m+cs+mTQio3qEIf+1B0IP0i2+x+vcml5AMco=";
vendorSha256 = "sha256-Zwpakw/vyDVngc1Bn+RdRPECNweruwGxsT4dfvMELkQ=";
passthru.tests = { inherit (nixosTests) caddy; };

4
pkgs/servers/misc/navidrome/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }:
{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }:
with lib;
@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
--prefix PATH : ${makeBinPath (optional ffmpegSupport ffmpeg)}
'';
passthru.tests.navidrome = nixosTests.navidrome;
meta = {
description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic";
homepage = "https://www.navidrome.org/";

6
pkgs/servers/monitoring/prometheus/promscale.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "promscale";
version = "0.4.1";
version = "0.5.1";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
sha256 = "sha256-RdhsQtrD+I8eAgFNr1hvW83Ho22aNhWBX8crCM0b8jU=";
sha256 = "sha256-u9qlABTuQ4EWEfyei6nN/AZ7j9QJXQ61GvyhP8wEmK0=";
};
vendorSha256 = "sha256-82E82O0yaLbu+oSTX7AQoYXFYy3wYVdBCevV7pHZVOA=";
vendorSha256 = "sha256-DFDTYT7UK1cYwGeCgeQcJmrCoqGPDzicusRPPUbH0Gs=";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ];

4
pkgs/servers/nats-server/default.nix
View File

@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
pname = "nats-server";
version = "2.2.1";
version = "2.3.4";
goPackagePath = "github.com/nats-io/${pname}";
@ -12,7 +12,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "nats-io";
repo = pname;
sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao=";
sha256 = "sha256-VNnL1v7R8cko9C/494XJh4aMRZv459tAHys9nmrA9QE=";
};
meta = {

4
pkgs/servers/nats-streaming-server/default.nix
View File

@ -4,14 +4,14 @@ with lib;
buildGoPackage rec {
pname = "nats-streaming-server";
version = "0.21.1";
version = "0.22.1";
goPackagePath = "github.com/nats-io/${pname}";
src = fetchFromGitHub {
rev = "v${version}";
owner = "nats-io";
repo = pname;
sha256 = "sha256-GqnIGnXcOcfbAgUruVxsTSvi6pH1E3QugEmZr3tPiIY=";
sha256 = "sha256-VdYyui0fyoNf1q3M1xTg/UMlxIFABqAbqQaD0bLpKCY=";
};
meta = {

4
pkgs/shells/zsh/pure-prompt/default.nix
View File

@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "pure-prompt";
version = "1.17.0";
version = "1.17.1";
src = fetchFromGitHub {
owner = "sindresorhus";
repo = "pure";
rev = "v${version}";
sha256 = "sha256-6j6QZtsA5ZgfXthYjXRrND2zAJwZx0/6WRI1f3c+2mE=";
sha256 = "sha256-bWp04xT+/Xhgxj1Rm0FgTkRtLH9nuSFtqBsO3B7Exvo=";
};
installPhase = ''

6
pkgs/tools/misc/lokalise2-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lokalise2-cli";
version = "2.6.4";
version = "2.6.7";
src = fetchFromGitHub {
owner = "lokalise";
repo = "lokalise-cli-2-go";
rev = "v${version}";
sha256 = "sha256-D/I1I7r3IuDz1MZZrzKVMhdLIZxbN2bYeGmqJVlUU6g=";
sha256 = "sha256-p3JvaDDebbIgOvTh0e7yYe3qOXvj1pLSG95hpK62M7s=";
};
vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8=";
vendorSha256 = "sha256-KJ8haktP9qoG5QsKnTOkvE8L+SQ9Z6hrsjUeS0wrdLs=";
doCheck = false;

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "microplane";
version = "0.0.33";
version = "0.0.34";
src = fetchFromGitHub {
owner = "Clever";
repo = "microplane";
rev = "v${version}";
sha256 = "sha256-Z0/on7u8QemACuHUDfffZm1Bmmo38vAxlSqzsgUQRmg=";
sha256 = "sha256-ZrBkVXRGZp8yGFIBo7sLGvJ8pMQq7Cq0xJiko57z164=";
};
vendorSha256 = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14=";

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

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "pcb2gcode";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "pcb2gcode";
repo = "pcb2gcode";
rev = "v${version}";
sha256 = "sha256-blbfpMBe7X3OrNbBiz8fNzKcS/bbViQUTXtdxZpXPBk=";
sha256 = "sha256-3VQlYtSi6yWWNuxTlBzvBtkM5hAss47xat+sEW+P79E=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

6
pkgs/tools/networking/mubeng/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "mubeng";
version = "0.4.5";
version = "0.5.2";
src = fetchFromGitHub {
owner = "kitabisa";
repo = pname;
rev = "v${version}";
sha256 = "03hm4wqlvsbi06g0ijrhvbk9i2ahmd1m8l80wbcijznhbdl5msl8";
sha256 = "sha256-jwBDa/TfXrD+f0q4nyQkpi52Jwl1XWZrMd3fPowNzgA=";
};
vendorSha256 = "1qcxix6724ly0klsr8bw3nv6pxn0wixqiqcgqkcp6sia4dxbbg14";
vendorSha256 = "sha256-/K1kBuxGEDUCBC7PiSpQRv1NEvTKwN+vNg2rz7pg838=";
meta = with lib; {
description = "Proxy checker and IP rotator";

4
pkgs/tools/networking/nfdump/default.nix
View File

@ -2,7 +2,7 @@
, autoconf, automake, libtool, pkg-config
, bzip2, libpcap, flex, bison }:
let version = "1.6.22"; in
let version = "1.6.23"; in
stdenv.mkDerivation {
pname = "nfdump";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "phaag";
repo = "nfdump";
rev = "v${version}";
sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj";
sha256 = "sha256-aM7U+JD8EtxEusvObsRgqS0aqfTfF3vYxCqvw0bgX20=";
};
nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ];

4
pkgs/tools/networking/openapi-generator-cli/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
let this = stdenv.mkDerivation rec {
version = "5.1.0";
version = "5.2.0";
pname = "openapi-generator-cli";
jarfilename = "${pname}-${version}.jar";
@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2";
sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk=";
};
dontUnpack = true;

4
pkgs/tools/networking/opensm/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "opensm";
version = "3.3.23";
version = "3.3.24";
src = fetchFromGitHub {
owner = "linux-rdma";
repo = "opensm";
rev = version;
sha256 = "0r0nw7b2711ca6mrj19ymg97x862hdxv54fhhm4kiqvdh6n75y0s";
sha256 = "sha256-/bqo5r9pVt7vg29xaRRO/9k21AMlmoe2327Ot5gVIwc=";
};
nativeBuildInputs = [ autoconf automake libtool bison flex ];

6
pkgs/tools/package-management/nfpm/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nfpm";
version = "2.3.1";
version = "2.6.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-zS8HXzu0oX66oVmupMU9YZKXGF+IQ/tCrO32PXfHPGY=";
sha256 = "sha256-GKdfi4hdvpB9VY8VqGYNjTezmPxotrzL/XSm1H5VLQs=";
};
vendorSha256 = "sha256-1zPrCmC+J9LbD3tRKzdJbyWbyTtD6SiPZ6efc9CSjsg=";
vendorSha256 = "sha256-APF6WHuH+YzgX3GbkSzZArGdiE7xPsLljEzCu96BvO4=";
doCheck = false;

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-08-14";
version = "2021-08-17";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-7nXcegB0ZuNXIExf6LWqSrjrdD+5ahGJb00O/G6lXmk=";
sha256 = "sha256-rtnlPt5fsiN44AlaAZ6v7Z2u6by+OFvtMtwtWVYQvdg=";
};
installPhase = ''

4
pkgs/tools/system/nvtop/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nvtop";
version = "1.1.0";
version = "1.2.2";
src = fetchFromGitHub {
owner = "Syllo";
repo = "nvtop";
rev = version;
sha256 = "1h24ppdz7l6l0znwbgir49f7r1fshzjavc6i5j33c6bvr318dpqb";
sha256 = "sha256-B/SRTOMp3VYShjSGxnF1ll58ijddJG7w/7nPK1fMltk=";
};
cmakeFlags = [

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

@ -2174,7 +2174,9 @@ with pkgs;
'';
});
caddy = callPackage ../servers/caddy { };
caddy = callPackage ../servers/caddy {
buildGoModule = buildGo115Module;
};
traefik = callPackage ../servers/traefik { };

3
pkgs/top-level/coq-packages.nix
View File

@ -14,6 +14,7 @@ let
(callPackage ../development/coq-modules/contribs {});
aac-tactics = callPackage ../development/coq-modules/aac-tactics {};
addition-chains = callPackage ../development/coq-modules/addition-chains {};
autosubst = callPackage ../development/coq-modules/autosubst {};
bignums = if lib.versionAtLeast coq.coq-version "8.6"
then callPackage ../development/coq-modules/bignums {}
@ -40,6 +41,7 @@ let
fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
flocq = callPackage ../development/coq-modules/flocq {};
fourcolor = callPackage ../development/coq-modules/fourcolor {};
gaia = callPackage ../development/coq-modules/gaia {};
gappalib = callPackage ../development/coq-modules/gappalib {};
goedel = callPackage ../development/coq-modules/goedel {};
graph-theory = callPackage ../development/coq-modules/graph-theory {};
@ -78,6 +80,7 @@ let
reglang = callPackage ../development/coq-modules/reglang {};
relation-algebra = callPackage ../development/coq-modules/relation-algebra {};
semantics = callPackage ../development/coq-modules/semantics {};
serapi = callPackage ../development/coq-modules/serapi {};
simple-io = callPackage ../development/coq-modules/simple-io { };
stdpp = callPackage ../development/coq-modules/stdpp { };
StructTact = callPackage ../development/coq-modules/StructTact {};

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

@ -397,6 +397,8 @@ in {
alarmdecoder = callPackage ../development/python-modules/alarmdecoder { };
alectryon = callPackage ../development/python-modules/alectryon { };
alembic = callPackage ../development/python-modules/alembic { };
algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };