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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-07-28 12:02:23 +00:00 committed by GitHub
commit 437247fc43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 601 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,7 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila
* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. This gets done in the `preFixup` phase.
* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies.
* `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`.
* `selfContainedBuild` allows to enable the [self-contained](https://docs.microsoft.com/en-us/dotnet/core/deploying/#publish-self-contained) build flag. By default, it is set to false and generated applications have a dependency on the selected dotnet runtime. If enabled, the dotnet runtime is bundled into the executable and the built app has no dependency on Dotnet.
* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used.
* `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore.
* `dotnet-test-sdk` is useful in cases where unit tests expect a different dotnet SDK. By default, this is set to the `dotnet-sdk` attribute.

2
nixos/modules/services/audio/hqplayerd.nix
View File

@ -133,7 +133,7 @@ in
users.users = {
hqplayer = {
description = "hqplayer daemon user";
extraGroups = [ "audio" ];
extraGroups = [ "audio" "video" ];
group = "hqplayer";
uid = config.ids.uids.hqplayer;
};

4
nixos/modules/services/audio/roon-server.nix
View File

@ -53,10 +53,12 @@ in {
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPortRanges = [
{ from = 9100; to = 9200; }
{ from = 9330; to = 9332; }
{ from = 9330; to = 9339; }
{ from = 30000; to = 30010; }
];
allowedUDPPorts = [ 9003 ];
extraCommands = ''
## IGMP / Broadcast ##
iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT
iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT
iptables -A INPUT -s 240.0.0.0/5 -j ACCEPT

10
nixos/modules/services/misc/gitea.nix
View File

@ -506,24 +506,24 @@ in
function gitea_setup {
cp -f ${configFile} ${runConfig}
if [ ! -e ${secretKey} ]; then
if [ ! -s ${secretKey} ]; then
${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey}
fi
# Migrate LFS_JWT_SECRET filename
if [[ -e ${oldLfsJwtSecret} && ! -e ${lfsJwtSecret} ]]; then
if [[ -s ${oldLfsJwtSecret} && ! -s ${lfsJwtSecret} ]]; then
mv ${oldLfsJwtSecret} ${lfsJwtSecret}
fi
if [ ! -e ${oauth2JwtSecret} ]; then
if [ ! -s ${oauth2JwtSecret} ]; then
${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret}
fi
if [ ! -e ${lfsJwtSecret} ]; then
if [ ! -s ${lfsJwtSecret} ]; then
${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret}
fi
if [ ! -e ${internalToken} ]; then
if [ ! -s ${internalToken} ]; then
${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken}
fi

2
nixos/tests/kea.nix
View File

@ -1,6 +1,8 @@
import ./make-test-python.nix ({ pkgs, lib, ...}: {
meta.maintainers = with lib.maintainers; [ hexa ];
name = "kea";
nodes = {
router = { config, pkgs, ... }: {
virtualisation.vlans = [ 1 ];

6
pkgs/applications/blockchains/go-ethereum/default.nix
View File

@ -9,16 +9,16 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.20";
version = "1.10.21";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256-PIQP08QxGJmla7LKEtnEXmwJxDYh02q4fmRHZsYtthU=";
sha256 = "sha256-qaM1I3ytMZN+5v/Oj47n3Oc21Jk7DtjfWA/xDprbn/M=";
};
vendorSha256 = "sha256-AlXfKytDrQrp0gvnC5/gTlJAVJBAQNHm4MoBu9O9jM4=";
vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0=";
doCheck = false;

11
pkgs/applications/misc/eureka-ideas/default.nix
View File

@ -9,21 +9,26 @@
rustPlatform.buildRustPackage rec {
pname = "eureka-ideas";
version = "1.8.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "simeg";
repo = "eureka";
rev = "v${version}";
sha256 = "1qjf8nr7m9igy6h228gm9gnav6pi2rfarbd9bc5fchx4rqy59sp7";
sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
};
cargoSha256 = "sha256-QujrFgliH8Mx1ES9KVl+O9UJP+7GDanQ7+z4QJuSOd0=";
cargoSha256 = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
checkFlags = lib.optionals stdenv.isLinux [
# failing on linux for unknown reasons
"--skip=config_manager::tests"
];
meta = with lib; {
description = "CLI tool to input and store your ideas without leaving the terminal";
homepage = "https://github.com/simeg/eureka";

4
pkgs/applications/misc/gremlin-console/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "gremlin-console";
version = "3.6.0";
version = "3.6.1";
src = fetchzip {
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
sha256 = "sha256-gYlHZuRKpBpC0will4EoJGyHW41vSjAT8Yg8yK6PCms=";
sha256 = "sha256-lr3ffyAL8LBj7mt4EmN2Kq2pxvW4P7zd66gU9X4qzJw=";
};
nativeBuildInputs = [ makeWrapper ];

74
pkgs/applications/networking/cluster/crc/default.nix Normal file
View File

@ -0,0 +1,74 @@
{ lib
, buildGoModule
, fetchFromGitHub
, git
, stdenv
, testers
, crc
, runtimeShell
, coreutils
}:
let
openShiftVersion = "4.10.22";
podmanVersion = "4.1.0";
writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
in
buildGoModule rec {
version = "2.4.1";
pname = "crc";
gitCommit = "6b954d40ec3280ca63e825805503d4414a3ff55b";
src = fetchFromGitHub {
owner = "code-ready";
repo = "crc";
rev = "v${version}";
sha256 = "sha256-wjwTf+d19F1NLYmUORMU0PGJeQZd+IrlScm5DiFvAk0=";
};
vendorSha256 = null;
nativeBuildInputs = [ git ];
postPatch = ''
substituteInPlace pkg/crc/oc/oc_linux_test.go \
--replace "/bin/echo" "${coreutils}/bin/echo"
substituteInPlace Makefile \
--replace "/bin/bash" "${runtimeShell}"
'';
tags = [ "containers_image_openpgp" ];
ldflags = [
"-X github.com/code-ready/crc/pkg/crc/version.crcVersion=${version}"
"-X github.com/code-ready/crc/pkg/crc/version.bundleVersion=${openShiftVersion}"
"-X github.com/code-ready/crc/pkg/crc/version.podmanVersion=${podmanVersion}"
"-X github.com/code-ready/crc/pkg/crc/version.commitSha=${gitCommit}"
"-X github.com/code-ready/crc/pkg/crc/segment.WriteKey=${writeKey}"
];
preBuild = ''
export HOME=$(mktemp -d)
'';
# tests are currently broken on aarch64-darwin
# https://github.com/code-ready/crc/issues/3237
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
checkFlags = [ "-args --crc-binary=$out/bin/crc" ];
passthru.tests.version = testers.testVersion {
package = crc;
command = ''
export HOME=$(mktemp -d)
crc version
'';
};
meta = with lib; {
description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes";
homepage = "https://crc.dev";
license = licenses.asl20;
maintainers = with maintainers; [ shikanime tricktron ];
};
}

53
pkgs/applications/networking/cluster/crc/update.sh Executable file
View File

@ -0,0 +1,53 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnugrep gnused jq
set -x -eu -o pipefail
WORKDIR=$(mktemp -d)
trap "rm -rf ${WORKDIR}" EXIT
NIXPKGS_CRC_FOLDER=$(
cd $(dirname ${BASH_SOURCE[0]})
pwd -P
)
cd ${NIXPKGS_CRC_FOLDER}
LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
https://api.github.com/repos/code-ready/crc/releases >${LATEST_TAG_RAWFILE}
LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} |
grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1)
CRC_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//')
CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
https://api.github.com/repos/code-ready/crc/tags |
jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha")
FILE_MAKEFILE=${WORKDIR}/Makefile
curl --silent https://raw.githubusercontent.com/code-ready/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE
OPENSHIFT_VERSION=$(grep 'OPENSHIFT_VERSION' ${FILE_MAKEFILE} |
head -n1 | awk '{print $3}')
PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} |
head -n1 | awk '{print $3}')
WRITE_KEY=$(grep '$(REPOPATH)/pkg/crc/segment.WriteKey' ${FILE_MAKEFILE} |
head -n1 | awk '{print $4}' | sed -e 's/$(REPOPATH)\/pkg\/crc\/segment.WriteKey=//g')
sed -i "s|version = \".*\"|version = \"${CRC_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
sed -i "s|writeKey = \".*\"|writeKey = \"${WRITE_KEY:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix

2
pkgs/build-support/dotnet/build-dotnet-module/default.nix
View File

@ -55,6 +55,8 @@
# The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc.
, buildType ? "Release"
# If set to true, builds the application as a self-contained - removing the runtime dependency on dotnet
, selfContainedBuild ? false
# The dotnet SDK to use.
, dotnet-sdk ? dotnetCorePackages.sdk_6_0
# The dotnet runtime to use.

6
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh
View File

@ -14,6 +14,12 @@ dotnetBuildHook() {
parallelBuildFlag="false"
fi
if [ "${selfContainedBuild-}" ]; then
dotnetBuildFlags+=("--self-contained")
else
dotnetBuildFlags+=("--no-self-contained")
fi
if [ "${version-}" ]; then
versionFlag="-p:Version=${version-}"
fi

6
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh
View File

@ -4,8 +4,12 @@ makeWrapperArgs=( ${makeWrapperArgs-} )
# First argument is the executable you want to wrap,
# the second is the destination for the wrapper.
wrapDotnetProgram() {
if [ ! "${selfContainedBuild-}" ]; then
dotnetRootFlag=("--set" "DOTNET_ROOT" "@dotnetRuntime@")
fi
makeWrapper "$1" "$2" \
--set "DOTNET_ROOT" "@dotnetRuntime@" \
"${dotnetRootFlag[@]}" \
--suffix "LD_LIBRARY_PATH" : "@runtimeDeps@" \
"${gappsWrapperArgs[@]}" \
"${makeWrapperArgs[@]}"

7
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh
View File

@ -6,6 +6,12 @@ dotnetInstallHook() {
runHook preInstall
if [ "${selfContainedBuild-}" ]; then
dotnetInstallFlags+=("--self-contained")
else
dotnetInstallFlags+=("--no-self-contained")
fi
for project in ${projectFile[@]}; do
env \
dotnet publish "$project" \
@ -15,7 +21,6 @@ dotnetInstallHook() {
--output "$out/lib/${pname}" \
--configuration "@buildType@" \
--no-build \
--no-self-contained \
${dotnetInstallFlags[@]} \
${dotnetFlags[@]}
done

2
pkgs/build-support/fetchnextcloudapp/default.nix
View File

@ -6,7 +6,7 @@
, patches ? [ ]
}:
stdenv.mkDerivation {
name = "nc-app-${name}";
pname = "nc-app-${name}";
inherit version patches;
src = fetchurl {

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

@ -9,6 +9,7 @@ mkCoqDerivation {
repo = "coq-dpdgraph";
inherit version;
defaultVersion = switch coq.coq-version [
{ case = "8.16"; out = "1.0+8.16"; }
{ case = "8.15"; out = "1.0+8.15"; }
{ case = "8.14"; out = "1.0+8.14"; }
{ case = "8.13"; out = "1.0+8.13"; }
@ -22,6 +23,7 @@ mkCoqDerivation {
{ case = "8.5"; out = "0.6"; }
] null;
release."1.0+8.16".sha256 = "sha256-xy4xcVHaD1OHBdGUzUy3SeZnHtOf1+UIh6YjUYFINm0=";
release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7";
release."1.0+8.14".sha256 = "sha256:01pmi7jcc77431jii6x6nd4m8jg4vycachiyi1h6dx9rp3a2508s";
release."1.0+8.13".sha256 = "sha256:0f8lj8b99n8nsq2jf5m0snblfs8yz50hmlqqq9nlw4qklq7j4z5z";

14
pkgs/development/ocaml-modules/janestreet/0.15.nix
View File

@ -2,7 +2,6 @@
, fetchpatch
, lib
, openssl
, patdiff
, zstd
}:
@ -132,6 +131,7 @@ with self;
async_smtp = janePackage {
pname = "async_smtp";
hash = "1m00j7wcb0blipnc1m6by70gd96a1k621b4dgvgffp8as04a461r";
minimumOCamlVersion = "4.12";
meta.description = "SMTP client and server";
propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ];
};
@ -437,7 +437,8 @@ with self;
ocaml_intrinsics = janePackage {
pname = "ocaml_intrinsics";
minimumOCamlVersion = "4.08";
hash = "1fdfl78b8br0j9w4046i0fmmaqn4cgl06q94rsniyagx9747pnsr";
version = "0.15.2";
hash = "sha256-f5zqrKaokj1aEvbu7lOuK0RoWSklFr6QFpV+oWbIX9U=";
meta.description = "Intrinsics";
buildInputs = [ dune-configurator ];
doCheck = false; # test rules broken
@ -451,6 +452,15 @@ with self;
propagatedBuildInputs = [ base sexplib0 ];
};
patdiff = janePackage {
pname = "patdiff";
hash = "0623a7n5r659rkxbp96g361mvxkcgc6x9lcbkm3glnppplk5kxr9";
propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ];
meta = {
description = "File Diff using the Patience Diff algorithm";
};
};
patience_diff = janePackage {
pname = "patience_diff";
hash = "17yrhn4qfi31m8g1ygb3m6i9z4fqd8f60fn6viazgx06s3x4xp3v";

38
pkgs/development/python-modules/mdutils/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python
}:
buildPythonPackage rec {
pname = "mdutils";
version = "1.4.0";
src = fetchFromGitHub {
owner = "didix21";
repo = pname;
rev = "v${version}";
sha256 = "sha256-regIrMWbGmW574dfojxZFJoivpaqOpN1I6YsqLEp8BM=";
};
checkPhase = ''
runHook preCheck
${python.interpreter} -m unittest discover
runHook postCheck
'';
meta = with lib; {
description = "Set of basic tools that can help to create Markdown files";
longDescription = ''
This Python package contains a set of basic tools that can help to create
a Markdown file while running a Python code. Thus, if you are executing a
Python code and you save the result in a text file, Why not format it? So
using files such as Markdown can give a great look to those results. In
this way, mdutils will make things easy for creating Markdown files.
'';
homepage = "https://github.com/didix21/mdutils";
changelog = "https://github.com/didix21/mdutils/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ azahi ];
};
}

4
pkgs/development/tools/build-managers/gradle/default.nix
View File

@ -100,9 +100,9 @@ rec {
# https://docs.gradle.org/current/userguide/compatibility.html
gradle_7 = gen {
version = "7.4.2";
version = "7.5";
nativeVersion = "0.22-milestone-23";
sha256 = "1nkz9gn1vb5l94dkf9yzb1j3hkll5x2vrl5p320msn2fk089pr19";
sha256 = "1hjifd98dif0qy6vkqp56v9z7id5cf2bfkdd71ld8nsqqlig51yb";
defaultJava = jdk17;
# Gradle 7 ships some binaries that are only available for some platforms
# See https://github.com/gradle/native-platform#supported-platforms

4
pkgs/development/tools/cloud-nuke/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.16.1";
version = "0.16.2";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-11oi67826JALCebxwbbX0pJ2XyK7+2hUpsNfYKZ2Bng=";
sha256 = "sha256-dikjYEY6jrK9dUXM+z378SIWgI4jYd9vLsf1nQ5rUwg=";
};
vendorSha256 = "sha256-DhFwTh7Bm2mPwXFBiYFylYKqWWcSm5/Cv2tXOJsPqm4=";

4
pkgs/misc/fastly/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fastly";
version = "3.1.1";
version = "3.2.1";
src = fetchFromGitHub {
owner = "fastly";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-mUWGvFyei5Ep3xRDVVZoa6tMiqfV89hn82/Uai+Gh8Y=";
sha256 = "sha256-OK1xhsn30JE/IeKnOLE+0AmulEAeFM0Z7TyRqd6hTGY=";
# The git commit is part of the `fastly version` original output;
# leave that output the same in nixpkgs. Use the `.git` directory
# to retrieve the commit SHA, and remove the directory afterwards,

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

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gotty";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "sorenisanerd";
repo = "gotty";
rev = "v${version}";
sha256 = "sha256-KkFnZ0j6rrzX2M+C0nVdSdta34B9rvL7cC0TOL38lGQ=";
sha256 = "sha256-Pi+opqNEKaw/2qWRqZkVAysMT4moLyEG5g9J/Z9pUDQ=";
};
vendorSha256 = "sha256-6SgF61LW5F/61cB2Yd4cyu3fmFhDooSTw9+NnIAo7lc=";
vendorSha256 = "sha256-XtqIiREtKg0LRnwOg8UyYrWUWJNQbCJUw+nVvaiN3GQ=";
# upstream did not update the tests, so they are broken now
# https://github.com/sorenisanerd/gotty/issues/13

4
pkgs/servers/web-apps/mediawiki/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediawiki";
version = "1.38.1";
version = "1.38.2";
src = fetchurl {
url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
sha256 = "sha256-EXNlUloN7xsgnKUIV9ZXNrYlRbh3p1NIpXqF0SZDezE=";
sha256 = "sha256-aX6zvb8x0JgQBmEzzHtcotlinHfuphzhagW8mXA9U6Y=";
};
postPatch = ''

40
pkgs/tools/admin/hedgedoc-cli/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib, stdenv, fetchFromGitHub, wget, jq, curl }:
let
version = "1.0";
in
stdenv.mkDerivation {
pname = "hedgedoc-cli";
inherit version;
src = fetchFromGitHub {
owner = "hedgedoc";
repo = "cli";
rev = "v${version}";
sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4=";
};
buildInputs = [
wget
jq
curl
];
installPhase = ''
runHook preInstall
install -Dm0755 -t $out/bin $src/bin/codimd
ln -s $out/bin/codimd $out/bin/hedgedoc-cli
runHook postInstall
'';
checkPhase = ''
hedgedoc-cli help
'';
meta = with lib; {
description = "Hedgedoc CLI";
homepage = "https://github.com/hedgedoc/cli";
license = licenses.agpl3;
maintainers = with maintainers; [ drupol ];
};
}

124
pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock
View File

@ -5,19 +5,19 @@ GEM
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
aws-eventstream (1.2.0)
aws-partitions (1.516.0)
aws-sdk-core (3.121.2)
aws-partitions (1.607.0)
aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.271.0)
aws-sdk-core (~> 3, >= 3.121.2)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.322.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.4.0)
aws-sigv4 (1.5.0)
aws-eventstream (~> 1, >= 1.0.2)
bindata (2.4.10)
bolt (3.19.0)
bolt (3.24.0)
CFPropertyList (~> 2.2)
addressable (~> 2.5)
aws-sdk-ec2 (~> 1)
@ -28,7 +28,7 @@ GEM
logging (~> 2.2)
minitar (~> 0.6)
net-scp (~> 1.2)
net-ssh (>= 4.0)
net-ssh (>= 4.0, < 7.0)
net-ssh-krb (~> 0.5)
orchestrator_client (~> 0.5)
puppet (>= 6.18.0)
@ -37,25 +37,46 @@ GEM
puppetfile-resolver (~> 0.5)
r10k (~> 3.10)
ruby_smb (~> 1.0)
terminal-table (~> 1.8)
terminal-table (~> 3.0)
winrm (~> 2.0)
winrm-fs (~> 1.3)
builder (3.2.4)
colored2 (3.1.2)
concurrent-ruby (1.1.9)
concurrent-ruby (1.1.10)
connection_pool (2.2.5)
cri (2.15.10)
deep_merge (1.2.1)
cri (2.15.11)
deep_merge (1.2.2)
erubi (1.10.0)
facter (4.2.5)
facter (4.2.10)
hocon (~> 1.3)
thor (>= 1.0.1, < 2.0)
faraday (0.17.4)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
faraday (1.10.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fast_gettext (1.1.2)
ffi (1.15.4)
ffi (1.15.5)
gettext (3.2.9)
locale (>= 2.0.5)
text (>= 1.3.0)
@ -65,27 +86,28 @@ GEM
locale
gssapi (1.3.1)
ffi (>= 1.0.1)
gyoku (1.3.1)
gyoku (1.4.0)
builder (>= 2.1.2)
hiera (3.7.0)
hiera-eyaml (3.2.2)
rexml (~> 3.0)
hiera (3.9.0)
hiera-eyaml (3.3.0)
highline
optimist
highline (2.0.3)
hocon (1.3.1)
httpclient (2.8.3)
jmespath (1.4.0)
jmespath (1.6.1)
jwt (2.2.3)
little-plugger (1.1.4)
locale (2.1.3)
log4r (1.1.10)
logging (2.3.0)
logging (2.3.1)
little-plugger (~> 1.1)
multi_json (~> 1.14)
minitar (0.9)
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.1.1)
multipart-post (2.2.3)
net-http-persistent (4.0.1)
connection_pool (~> 2.2)
net-scp (1.2.1)
@ -96,15 +118,15 @@ GEM
net-ssh (>= 2.0)
nori (2.6.0)
optimist (3.0.1)
orchestrator_client (0.5.2)
faraday
net-http-persistent
public_suffix (4.0.6)
puppet (7.12.0)
orchestrator_client (0.6.1)
faraday (~> 1.4)
net-http-persistent (~> 4.0)
public_suffix (4.0.7)
puppet (7.17.0)
concurrent-ruby (~> 1.0)
deep_merge (~> 1.0)
facter (> 2.0.1, < 5)
fast_gettext (~> 1.1)
fast_gettext (>= 1.1, < 3)
hiera (>= 3.2.1, < 4)
locale (~> 2.1)
multi_json (~> 1.10)
@ -113,29 +135,31 @@ GEM
semantic_puppet (~> 1.0)
puppet-resource_api (1.8.14)
hocon (>= 1.0)
puppet-strings (2.8.0)
puppet-strings (2.9.0)
rgen
yard (~> 0.9.5)
puppet_forge (2.3.4)
faraday (>= 0.9.0, < 0.18.0, != 0.13.1)
faraday_middleware (>= 0.9.0, < 0.15.0)
gettext-setup (~> 0.11)
puppet_forge (3.2.0)
faraday (~> 1.3)
faraday_middleware (~> 1.0)
minitar
semantic_puppet (~> 1.0)
puppetfile-resolver (0.5.0)
puppetfile-resolver (0.6.1)
molinillo (~> 0.6)
semantic_puppet (~> 1.0)
r10k (3.12.1)
r10k (3.15.0)
colored2 (= 3.1.2)
cri (= 2.15.10)
fast_gettext (~> 1.1.0)
gettext (>= 3.0.2, < 3.3.0)
cri (>= 2.15.10)
fast_gettext (>= 1.1.0, < 3.0.0)
gettext (>= 3.0.2, < 4.0.0)
gettext-setup (~> 0.24)
jwt (~> 2.2.3)
log4r (= 1.1.10)
minitar (~> 0.9)
multi_json (~> 1.10)
puppet_forge (~> 2.3.0)
puppet_forge (>= 2.3.0)
rexml (3.2.5)
rgen (0.9.0)
ruby2_keywords (0.0.5)
ruby_smb (1.1.0)
bindata
rubyntlm
@ -144,12 +168,13 @@ GEM
rubyzip (2.3.2)
scanf (1.0.0)
semantic_puppet (1.0.4)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
text (1.3.1)
thor (1.1.0)
unicode-display_width (1.8.0)
windows_error (0.1.2)
thor (1.2.1)
unicode-display_width (2.2.0)
webrick (1.7.0)
windows_error (0.1.4)
winrm (2.3.6)
builder (>= 2.1.2)
erubi (~> 1.8)
@ -164,7 +189,8 @@ GEM
logging (>= 1.6.1, < 3.0)
rubyzip (~> 2.0)
winrm (~> 2.0)
yard (0.9.26)
yard (0.9.28)
webrick (~> 1.7.0)
PLATFORMS
ruby
@ -173,4 +199,4 @@ DEPENDENCIES
bolt
BUNDLED WITH
2.1.4
2.3.9

25
pkgs/tools/admin/puppet/puppet-bolt/default.nix
View File

@ -1,13 +1,36 @@
{ bundlerApp, makeWrapper }:
{ lib, bundlerApp, makeWrapper, bundlerUpdateScript, puppet-bolt, testers }:
bundlerApp {
pname = "bolt";
gemdir = ./.;
exes = [ "bolt" ];
buildInputs = [ makeWrapper ];
gemConfig.bolt = attrs: {
# scripts in libexec will be executed by remote host,
# so shebangs should remain unchanged
dontPatchShebangs = true;
};
postBuild = ''
# Set BOLT_GEM=1 to remove warning
wrapProgram $out/bin/bolt --set BOLT_GEM 1
'';
passthru = {
tests.version = testers.testVersion {
package = puppet-bolt;
version = (import ./gemset.nix).bolt.version;
};
updateScript = bundlerUpdateScript "puppet-bolt";
};
meta = with lib; {
description = "Execute commands remotely over SSH and WinRM";
homepage = "https://github.com/puppetlabs/bolt";
license = licenses.asl20;
maintainers = with maintainers; [ uvnikita ];
platforms = platforms.unix;
};
}

258
pkgs/tools/admin/puppet/puppet-bolt/gemset.nix
View File

@ -25,10 +25,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0";
sha256 = "0af0fv57wgnzn4sjbhwd504dina62i60by3npl14ad4bc2aw7pnc";
type = "gem";
};
version = "1.516.0";
version = "1.607.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d44wgbzlwc6gb2ql9cayljdwhlvz9byp2grk0n9favb7rq42fwc";
sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s";
type = "gem";
};
version = "3.121.2";
version = "3.131.2";
};
aws-sdk-ec2 = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k85khm2c53y2sq29c9rg5kmjm1fnw2glgpjsl6hbh8cq3ciaain";
sha256 = "1c56an4cmvr1ync8pif588b4alvv8zfchna092xjbdzx4ip1yrfg";
type = "gem";
};
version = "1.271.0";
version = "1.322.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -58,10 +58,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
type = "gem";
};
version = "1.4.0";
version = "1.5.0";
};
bindata = {
groups = ["default"];
@ -79,10 +79,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jmknsa10zazwba1mi19awywk14vj0danppx1hqzmmrpp0af98if";
sha256 = "0jshg2b2j24zgkh2nldwjqxm43dz9val6scxsjvq5kg3bwkdrby8";
type = "gem";
};
version = "3.19.0";
version = "3.24.0";
};
builder = {
groups = ["default"];
@ -119,10 +119,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
type = "gem";
};
version = "1.1.9";
version = "1.1.10";
};
connection_pool = {
groups = ["default"];
@ -139,20 +139,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h45kw2s4bjwgbfsrncs30av0j4zjync3wmcc6lpdnzbcxs7yms2";
sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5";
type = "gem";
};
version = "2.15.10";
version = "2.15.11";
};
deep_merge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q3picw7zx1xdkybmrnhmk2hycxzaa0jv4gqrby1s90dy5n7fmsb";
sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3";
type = "gem";
};
version = "1.2.1";
version = "1.2.2";
};
erubi = {
groups = ["default"];
@ -170,21 +170,122 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mhq4rmyc60ijzw6f6sbphyb76vlwcgbaqyqw6y7wb8qdisn19wc";
sha256 = "16xwli99vqj5329wzmf0ifzikllrym46scm9xp28syfygsrz39j0";
type = "gem";
};
version = "4.2.5";
version = "4.2.10";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
type = "gem";
};
version = "1.10.0";
};
faraday-em_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
type = "gem";
};
version = "1.0.0";
};
faraday-em_synchrony = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
type = "gem";
};
version = "1.0.0";
};
faraday-excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
type = "gem";
};
version = "1.1.0";
};
faraday-httpclient = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
type = "gem";
};
version = "1.0.1";
};
faraday-multipart = {
dependencies = ["multipart-post"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "172dirvq89zk57rv42n00rhbc2qwv1w20w4zjm6zvfqz4rdpnrqi";
sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
type = "gem";
};
version = "0.17.4";
version = "1.0.4";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
type = "gem";
};
version = "1.0.1";
};
faraday-net_http_persistent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
type = "gem";
};
version = "1.2.0";
};
faraday-patron = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
type = "gem";
};
version = "1.0.0";
};
faraday-rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
type = "gem";
};
version = "1.0.0";
};
faraday-retry = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
type = "gem";
};
version = "1.0.3";
};
faraday_middleware = {
dependencies = ["faraday"];
@ -192,10 +293,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc";
sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
type = "gem";
};
version = "0.14.0";
version = "1.2.0";
};
fast_gettext = {
groups = ["default"];
@ -212,10 +313,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
version = "1.15.4";
version = "1.15.5";
};
gettext = {
dependencies = ["locale" "text"];
@ -251,25 +352,25 @@
version = "1.3.1";
};
gyoku = {
dependencies = ["builder"];
dependencies = ["builder" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q";
type = "gem";
};
version = "1.3.1";
version = "1.4.0";
};
hiera = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g1bagbb4lvs334gpqyylvcrs7h6q2kn1h162dnvhzqa4rzxap8a";
sha256 = "01kh882rp9xdy2cx2avax79ywpfxqhnwsn05cxwyiqrhfkk36p4x";
type = "gem";
};
version = "3.7.0";
version = "3.9.0";
};
hiera-eyaml = {
dependencies = ["highline" "optimist"];
@ -277,10 +378,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fqn73wdh0ar63f863bda3wj1ii5p8gc3vqzv39l2cwkax6vcqgj";
sha256 = "1iydhxavcniprqly7ad8c2413jwvrdf7zjmzl3xxlnkmq9900zf9";
type = "gem";
};
version = "3.2.2";
version = "3.3.0";
};
highline = {
groups = ["default"];
@ -317,10 +418,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
type = "gem";
};
version = "1.4.0";
version = "1.6.1";
};
jwt = {
groups = ["default"];
@ -368,10 +469,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9";
sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02";
type = "gem";
};
version = "2.3.0";
version = "2.3.1";
};
minitar = {
groups = ["default"];
@ -408,10 +509,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6";
type = "gem";
};
version = "2.1.1";
version = "2.2.3";
};
net-http-persistent = {
dependencies = ["connection_pool"];
@ -482,20 +583,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a0yd89bflsgn7apai7ar76h39jbk56pbhd86x68wnwfbib32nmc";
sha256 = "1lfispcl4sr1c7am22j55sj5xvsky422b3bh7645j3n12zqg7pp2";
type = "gem";
};
version = "0.5.2";
version = "0.6.1";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
version = "4.0.6";
version = "4.0.7";
};
puppet = {
dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "hiera" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"];
@ -503,10 +604,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02d9rqbqlmdbw6zh89zwh27ra6pqspcv5afqbpj1yrvg1k6cliri";
sha256 = "1lfpmfjc95a7s19h1q0hwjcm6gzgiaxklpayxy32p8c2hzwzjk00";
type = "gem";
};
version = "7.12.0";
version = "7.17.0";
};
puppet-resource_api = {
dependencies = ["hocon"];
@ -525,21 +626,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfxccfyl7i565x95kbaz574scrd5vrrlhx3x5kbcpalps9b06b1";
sha256 = "0w3rc5swdin44an1l5jgnljv46yflcd2d2zvakd54nvdh0r30ypx";
type = "gem";
};
version = "2.8.0";
version = "2.9.0";
};
puppet_forge = {
dependencies = ["faraday" "faraday_middleware" "gettext-setup" "minitar" "semantic_puppet"];
dependencies = ["faraday" "faraday_middleware" "minitar" "semantic_puppet"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jp9jczc11vxr6y57lxhxxd59vqa763h4qbsbjh1j0yhfagcv877";
sha256 = "03aaznd1gyf3wpqg34y32zfj2yxf67r85m6zfz05pv9ijizrmdnj";
type = "gem";
};
version = "2.3.4";
version = "3.2.0";
};
puppetfile-resolver = {
dependencies = ["molinillo" "semantic_puppet"];
@ -547,21 +648,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1npaafsafvi2mhcz76gycnshxwrrqq33fl2493v7grq6jw0bsann";
sha256 = "0d36nzdlb7gvsikbvkm840qd5xglyph6ry395ynch6g75vlkr5xi";
type = "gem";
};
version = "0.5.0";
version = "0.6.1";
};
r10k = {
dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "jwt" "log4r" "multi_json" "puppet_forge"];
dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "jwt" "log4r" "minitar" "multi_json" "puppet_forge"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05qwvwgh08g5pw1cxikb7hpg0ia6nisva1gwpj0d9gb9wacml2qh";
sha256 = "0hdlq01186w9bx270iyyk10w6jccxc4f0dx7kxgg6lnl1rsnkd4i";
type = "gem";
};
version = "3.12.1";
version = "3.15.0";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
rgen = {
groups = ["default"];
@ -573,6 +684,16 @@
};
version = "0.9.0";
};
ruby2_keywords = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
version = "0.0.5";
};
ruby_smb = {
dependencies = ["bindata" "rubyntlm" "windows_error"];
groups = ["default"];
@ -630,10 +751,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr";
type = "gem";
};
version = "1.8.0";
version = "3.0.2";
};
text = {
groups = ["default"];
@ -650,30 +771,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
type = "gem";
};
version = "1.1.0";
version = "1.2.1";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn";
type = "gem";
};
version = "1.8.0";
version = "2.2.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
type = "gem";
};
version = "1.7.0";
};
windows_error = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kbcv9j5sc7pvjzf1dkp6h69i6lmj205zyy2arxcfgqg11bsz2kp";
sha256 = "0zmm2if81ia33hp18h8yrgnpgcdyrxziyf185r0zx8qy7n8mlchl";
type = "gem";
};
version = "0.1.2";
version = "0.1.4";
};
winrm = {
dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
@ -698,13 +829,14 @@
version = "1.3.5";
};
yard = {
dependencies = ["webrick"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h";
sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk";
type = "gem";
};
version = "0.9.26";
version = "0.9.28";
};
}

4
pkgs/tools/bluetooth/blueberry/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "blueberry";
version = "1.4.7";
version = "1.4.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-ziAdLFSZS8bh+OBSYLqxJ3g7mgFai/psvlBw3Qt17w0=";
sha256 = "sha256-MyIjcTyKn1aC2th6fCOw4cIqrRKatk2s4QD5R9cm83A=";
};
nativeBuildInputs = [

6
pkgs/tools/bluetooth/bluetuith/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bluetuith";
version = "0.0.3";
version = "0.0.5";
src = fetchFromGitHub {
owner = "darkhz";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7JqpF9iga6RO+/r2JK0N9gjieVRUNkHhGNsfVFfKfRY=";
sha256 = "sha256-NXQa3aOjTIcQQZNwkS5ypBp7jzUhXztJ6LgtucIEDYI=";
};
vendorSha256 = "sha256-MsVrhEG2DOFJAXvt5rvfctGUbb3hQsBJ7cjOSzWA+bc=";
vendorSha256 = "sha256-sCpJow5tiliiNSnKjgzxmgyHxPk8j1RdjobFwKhpU4w=";
ldflags = [ "-s" "-w" ];

12
pkgs/tools/misc/patdiff/default.nix
View File

@ -1,12 +0,0 @@
{ ocamlPackages }:
with ocamlPackages;
janePackage {
pname = "patdiff";
hash = "0623a7n5r659rkxbp96g361mvxkcgc6x9lcbkm3glnppplk5kxr9";
propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ];
meta = {
description = "File Diff using the Patience Diff algorithm";
};
}

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

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "kea";
version = "2.0.2"; # only even minor versions are stable
version = "2.2.0"; # only even minor versions are stable
src = fetchurl {
url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-jSghO9yOK7hwo4OzCsHlPVTh66Q9L4blFRsItmqmzzI=";
sha256 = "sha256-2n2QymKncmAtrG535QcxkDhCKJWtaO6xQvFIfWfVMdI=";
};
patches = [ ./dont-create-var.patch ];

24
pkgs/tools/security/qdigidoc/default.nix
View File

@ -1,15 +1,27 @@
{ lib, mkDerivation, fetchurl, cmake, gettext
, pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase
, qttranslations, qtsvg }:
{ lib
, mkDerivation
, fetchurl
, cmake
, gettext
, pkg-config
, libdigidocpp
, opensc
, openldap
, openssl
, pcsclite
, qtbase
, qttranslations
, qtsvg
}:
mkDerivation rec {
pname = "qdigidoc";
version = "4.2.11";
version = "4.2.12";
src = fetchurl {
url =
"https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4_${version}.110-1804.tar.xz";
sha256 = "sha256-Sg6lFZeIJn3T/suDc5Z/kNqBf/sIV9c6EJJ0Nr0dwTM=";
"https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz";
hash = "sha256-6bso1qvhVhbBfrcTq4S+aHtHli7X2A926N4r45ztq4E=";
};
tsl = fetchurl {

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

@ -380,6 +380,8 @@ with pkgs;
containerpilot = callPackage ../applications/networking/cluster/containerpilot { };
crc = callPackage ../applications/networking/cluster/crc { };
coordgenlibs = callPackage ../development/libraries/coordgenlibs { };
cp437 = callPackage ../tools/misc/cp437 { };
@ -4337,8 +4339,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
patdiff = callPackage ../tools/misc/patdiff { };
patool = with python3Packages; toPythonApplication patool;
pbgopy = callPackage ../tools/text/pbgopy { };
@ -27620,6 +27620,8 @@ with pkgs;
stdenv = clangStdenv;
};
hedgedoc-cli = callPackage ../tools/admin/hedgedoc-cli { };
heimer = libsForQt5.callPackage ../applications/misc/heimer { };
hello = callPackage ../applications/misc/hello { };

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

@ -1547,7 +1547,7 @@ let
if lib.versionOlder "4.10.2" ocaml.version
then import ../development/ocaml-modules/janestreet/0.15.nix {
inherit self;
inherit (pkgs) fetchpatch lib openssl patdiff zstd;
inherit (pkgs) fetchpatch lib openssl zstd;
}
else if lib.versionOlder "4.08" ocaml.version
then import ../development/ocaml-modules/janestreet/0.14.nix {

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

@ -5364,6 +5364,8 @@ in {
mdurl = callPackage ../development/python-modules/mdurl { };
mdutils = callPackage ../development/python-modules/mdutils { };
MDP = callPackage ../development/python-modules/mdp { };
measurement = callPackage ../development/python-modules/measurement { };