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

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-11 18:02:24 +00:00 committed by GitHub
commit af7ef2e741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 83 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/interpreters/clojure/default.nix
View File

@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
echo "Installing clojure and clj into $bin_dir"
substituteInPlace clojure --replace PREFIX $out
substituteInPlace clj --replace BINDIR $bin_dir
install -Dm755 clojure "$bin_dir/clojure"
install -Dm755 clj "$bin_dir/clj"

2
pkgs/development/tools/misc/hydra/common.nix
View File

@ -26,6 +26,7 @@ let
CatalystPluginAccessLog
CatalystPluginAuthorizationRoles
CatalystPluginCaptcha
CatalystPluginPrometheusTiny
CatalystPluginSessionStateCookie
CatalystPluginSessionStoreFastMmap
CatalystPluginSmartURI
@ -59,6 +60,7 @@ let
NetPrometheus
NetStatsd
PadWalker
PrometheusTinyShared
Readonly
SQLSplitStatement
SetScalar

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

@ -2,12 +2,12 @@
{
hydra-unstable = callPackage ./common.nix {
version = "2021-05-03";
version = "2021-08-11";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
rev = "9bce425c3304173548d8e822029644bb51d35263";
sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU=";
};
nix = nixUnstable;

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

@ -228,13 +228,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.4${suffix}";
suffix = "pre20210707_02dd6bb";
suffix = "pre20210802_47e96bb";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2";
sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA=";
rev = "47e96bb533f8cacc171bec9b688b134de31a48a9";
sha256 = "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg=";
};
boehmgc = boehmgc_nixUnstable;

74
pkgs/top-level/perl-packages.nix
View File

@ -2150,6 +2150,21 @@ let
};
};
CatalystPluginPrometheusTiny = buildPerlPackage {
pname = "Catalyst-Plugin-PrometheusTiny";
version = "0.006";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SY/SYSPETE/Catalyst-Plugin-PrometheusTiny-0.006.tar.gz";
sha256 = "1hd2nv21c2mq3yvhsys4a276bdwr5igs4b73m99v7ymzpabvjf9b";
};
buildInputs = [ HTTPMessage Plack SubOverride TestDeep ];
propagatedBuildInputs = [ CatalystRuntime Moose PrometheusTiny PrometheusTinyShared ];
meta = {
description = "Prometheus metrics for Catalyst";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
CatalystPluginSession = buildPerlPackage {
pname = "Catalyst-Plugin-Session";
version = "0.41";
@ -4932,6 +4947,20 @@ let
};
};
DataRandom = buildPerlPackage {
pname = "Data-Random";
version = "0.13";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BA/BAREFOOT/Data-Random-0.13.tar.gz";
sha256 = "eb590184a8db28a7e49eab09e25f8650c33f1f668b6a472829de74a53256bfc0";
};
buildInputs = [ FileShareDirInstall TestMockTime ];
meta = {
description = "Perl module to generate random data";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
DataSection = buildPerlPackage {
pname = "Data-Section";
version = "0.200007";
@ -9402,6 +9431,20 @@ let
};
};
HashSharedMem = buildPerlModule {
pname = "Hash-SharedMem";
version = "0.005";
src = fetchurl {
url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Hash-SharedMem-0.005.tar.gz";
sha256 = "324776808602f7bdc44adaa937895365454029a926fa611f321c9bf6b940bb5e";
};
buildInputs = [ ScalarString ];
meta = {
description = "Efficient shared mutable hash";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
HashUtilFieldHashCompat = buildPerlPackage {
pname = "Hash-Util-FieldHash-Compat";
version = "0.11";
@ -17420,6 +17463,37 @@ let
propagatedBuildInputs = [ IPCSignal ];
};
PrometheusTiny = buildPerlPackage {
pname = "Prometheus-Tiny";
version = "0.008";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-0.008.tar.gz";
sha256 = "17d7b69chkcq8fprww6m15glndyb0lms2l0xjbnbw04q7f8ncskk";
};
buildInputs = [ HTTPMessage Plack TestException ];
meta = {
homepage = "https://github.com/robn/Prometheus-Tiny";
description = "A tiny Prometheus client";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
PrometheusTinyShared = buildPerlPackage {
pname = "Prometheus-Tiny-Shared";
version = "0.024";
src = fetchurl {
url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-Shared-0.024.tar.gz";
sha256 = "02w24r4amk8dqlavg6abxap48hzxrbda48f1pmrqypgx1cz59g4g";
};
buildInputs = [ DataRandom HTTPMessage Plack TestDifferences TestException ];
propagatedBuildInputs = [ HashSharedMem JSONXS PrometheusTiny ];
meta = {
homepage = "https://github.com/robn/Prometheus-Tiny-Shared";
description = "A tiny Prometheus client with a shared database behind it";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
ProtocolRedis = buildPerlPackage {
pname = "Protocol-Redis";
version = "1.0011";