mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
7f28a5962a
6
.github/CODEOWNERS
vendored
6
.github/CODEOWNERS
vendored
|
|
@ -218,9 +218,9 @@
|
|||
/nixos/modules/services/mail/rspamd.nix @peti
|
||||
|
||||
# Emacs
|
||||
/pkgs/applications/editors/emacs-modes @adisbladis
|
||||
/pkgs/applications/editors/emacs @adisbladis
|
||||
/pkgs/top-level/emacs-packages.nix @adisbladis
|
||||
/pkgs/applications/editors/emacs/elisp-packages @adisbladis
|
||||
/pkgs/applications/editors/emacs @adisbladis
|
||||
/pkgs/top-level/emacs-packages.nix @adisbladis
|
||||
|
||||
# Neovim
|
||||
/pkgs/applications/editors/neovim @jonringer @teto
|
||||
|
|
|
|||
2
.github/labeler.yml
vendored
2
.github/labeler.yml
vendored
|
|
@ -16,7 +16,7 @@
|
|||
- nixos/modules/services/editors/emacs.nix
|
||||
- nixos/modules/services/editors/emacs.xml
|
||||
- nixos/tests/emacs-daemon.nix
|
||||
- pkgs/applications/editors/emacs-modes/**/*
|
||||
- pkgs/applications/editors/emacs/elisp-packages/**/*
|
||||
- pkgs/applications/editors/emacs/**/*
|
||||
- pkgs/build-support/emacs/**/*
|
||||
- pkgs/top-level/emacs-packages.nix
|
||||
|
|
|
|||
|
|
@ -103,7 +103,8 @@ Sample template for a new package review is provided below.
|
|||
- [ ] `meta.maintainers` is set
|
||||
- [ ] build time only dependencies are declared in `nativeBuildInputs`
|
||||
- [ ] source is fetched using the appropriate function
|
||||
- [ ] phases are respected
|
||||
- [ ] the list of `phases` is not overridden
|
||||
- [ ] when a phase (like `installPhase`) is overridden it starts with `runHook preInstall` and ends with `runHook postInstall`.
|
||||
- [ ] patches that are remotely available are fetched with `fetchpatch`
|
||||
|
||||
##### Possible improvements
|
||||
|
|
|
|||
|
|
@ -325,6 +325,8 @@ This generic command invokes a number of *phases*. Package builds are split into
|
|||
|
||||
Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`.
|
||||
|
||||
When overriding a phase, for example `installPhase`, it is important to start with `runHook preInstall` and end it with `runHook postInstall`, otherwise `preInstall` and `postInstall` will not be run. Even if you don't use them directly, it is good practice to do so anyways for downstream users who would want to add a `postInstall` by overriding your derivation.
|
||||
|
||||
While inside an interactive `nix-shell`, if you wanted to run all phases in the order they would be run in an actual build, you can invoke `genericBuild` yourself.
|
||||
|
||||
### Controlling phases {#ssec-controlling-phases}
|
||||
|
|
@ -337,7 +339,8 @@ There are a number of variables that control what phases are executed and in wha
|
|||
|
||||
Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is `$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases`.
|
||||
|
||||
Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`), as you then don’t specify all the normal phases.
|
||||
It is discouraged to set this variable, as it is easy to miss some important functionality hidden in some of the less obviously needed phases (like `fixupPhase` which patches the shebang of scripts).
|
||||
Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`).
|
||||
|
||||
##### `prePhases` {#var-stdenv-prePhases}
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
</para>
|
||||
<para>
|
||||
To use the Antispam Module, add <package>matrix-synapse-plugins.matrix-synapse-mjolnir-antispam</package>
|
||||
to the Synapse plugin list and enable the <literal>mjolnir.AntiSpam</literal> module.
|
||||
to the Synapse plugin list and enable the <literal>mjolnir.Module</literal> module.
|
||||
</para>
|
||||
<programlisting>
|
||||
{
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
];
|
||||
extraConfig = ''
|
||||
modules:
|
||||
- module: mjolnir.AntiSpam
|
||||
- module: mjolnir.Module
|
||||
config:
|
||||
# Prevent servers/users in the ban lists from inviting users on this
|
||||
# server to rooms. Default true.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
let
|
||||
|
||||
inherit (lib.options) literalExpression mkEnableOption mkOption;
|
||||
inherit (lib.types) bool enum ints lines attrsOf nullOr path str submodule;
|
||||
inherit (lib.types) bool enum ints lines attrsOf nonEmptyStr nullOr path str submodule;
|
||||
inherit (lib.modules) mkDefault mkIf mkMerge;
|
||||
|
||||
commonDescr = ''
|
||||
|
|
@ -17,8 +17,6 @@ let
|
|||
configuration to yield an operational system.
|
||||
'';
|
||||
|
||||
str1 = lib.types.addCheck str (s: s!=""); # non-empty string
|
||||
|
||||
configAttrType =
|
||||
# Options in HylaFAX configuration files can be
|
||||
# booleans, strings, integers, or list thereof
|
||||
|
|
@ -37,7 +35,7 @@ let
|
|||
modemConfigOptions = { name, config, ... }: {
|
||||
options = {
|
||||
name = mkOption {
|
||||
type = str1;
|
||||
type = nonEmptyStr;
|
||||
example = "ttyS1";
|
||||
description = ''
|
||||
Name of modem device,
|
||||
|
|
@ -45,7 +43,7 @@ let
|
|||
'';
|
||||
};
|
||||
type = mkOption {
|
||||
type = str1;
|
||||
type = nonEmptyStr;
|
||||
example = "cirrus";
|
||||
description = ''
|
||||
Name of modem configuration file,
|
||||
|
|
@ -135,14 +133,14 @@ in
|
|||
};
|
||||
|
||||
countryCode = mkOption {
|
||||
type = nullOr str1;
|
||||
type = nullOr nonEmptyStr;
|
||||
default = null;
|
||||
example = "49";
|
||||
description = "Country code for server and all modems.";
|
||||
};
|
||||
|
||||
areaCode = mkOption {
|
||||
type = nullOr str1;
|
||||
type = nullOr nonEmptyStr;
|
||||
default = null;
|
||||
example = "30";
|
||||
description = "Area code for server and all modems.";
|
||||
|
|
@ -279,7 +277,7 @@ in
|
|||
each time the spooling area is initialized.
|
||||
'';
|
||||
faxcron.enable.frequency = mkOption {
|
||||
type = nullOr str1;
|
||||
type = nullOr nonEmptyStr;
|
||||
default = null;
|
||||
example = "daily";
|
||||
description = ''
|
||||
|
|
@ -319,7 +317,7 @@ in
|
|||
each time the spooling area is initialized.
|
||||
'';
|
||||
faxqclean.enable.frequency = mkOption {
|
||||
type = nullOr str1;
|
||||
type = nullOr nonEmptyStr;
|
||||
default = null;
|
||||
example = "daily";
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "feedbackd";
|
||||
# Not an actual upstream project release,
|
||||
# only a Debian package release that is tagged in the upstream repo
|
||||
version = "0.0.0+git20210426";
|
||||
version = "0.0.0+git20211018";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "Librem5";
|
||||
repo = "feedbackd";
|
||||
rev = "v${version}";
|
||||
sha256 = "12kdchv11c5ynpv6fbagcx755x5p2kd7acpwjxi9khwdwjsqxlmn";
|
||||
hash = "sha256-jqKRHcxISK54xq/tQm6zV+J+U71eKh04OVTNHDDy65E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "100.0.4878.0",
|
||||
"sha256": "0ac8fdbh3f66wq3y1l4s1i906zriajff84hpx9df9cwavj6r9svr",
|
||||
"sha256bin64": "1q37q02v6aaqkxwyavljga0h60cclklxj8adr1jc1fqs0irks8a8",
|
||||
"version": "100.0.4892.0",
|
||||
"sha256": "03f003prk0vqxac7l0sp3nfhh3adlrdx60dklm74v504ykdw84yn",
|
||||
"sha256bin64": "00033b2iq3aw5pvgm5nbh99sz8mj98rj32h1m6iw2xxwqaij06qw",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-21",
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2022.2.0";
|
||||
version = "2022.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
hash = "sha256-yo4Tu9wSxGdUAr2436lAlaP2U+5m/J4+oNQd/UQk3a0=";
|
||||
hash = "sha256-y9TduC6Fa1p3UFvSeW9n42AUD63dp/LEagiv3xlT/4U=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)";
|
||||
homepage = "https://www.cloudflare.com/products/tunnel";
|
||||
license = licenses.unfree;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ bbigras enorris thoughtpolice ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, kubectl
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
@ -40,13 +38,6 @@ buildGoModule rec {
|
|||
"-X github.com/alexellis/arkade/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/arkade" \
|
||||
--prefix PATH : ${lib.makeBinPath [ kubectl ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/alexellis/arkade";
|
||||
description = "Open Source Kubernetes Marketplace";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{ lib
|
||||
, bundlerApp
|
||||
, makeWrapper
|
||||
, kubectl
|
||||
, bundlerUpdateScript
|
||||
}:
|
||||
|
||||
|
|
@ -10,13 +8,6 @@ bundlerApp {
|
|||
gemdir = ./.;
|
||||
exes = [ "krane" ];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
wrapProgram "$out/bin/krane" \
|
||||
--prefix PATH : ${lib.makeBinPath [ kubectl ]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "krane";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubergrunt";
|
||||
version = "0.7.11";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "kubergrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1224ssqdz9ak0vylyfbr9c2w0yfdp4hw9jh99qmfi2j5nhw9kzcc";
|
||||
sha256 = "sha256-K94cGU+cFHOrAGXjHQFFFJYhZi9zNfdlGy5eb2DkcV8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-95rteSEMOBQnAw0QKuj5Yyi8n3xXGl0Tm97WiyTGxVw=";
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.23.3";
|
||||
version = "1.23.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ccf+9mwDv1Fs0+xN8yDkUjh4A3aGox7rBGesyYtkUDs=";
|
||||
sha256 = "sha256-srJHW/wvrFKKgxVwJB4h0FGeaT7iSJYOTtSeTkcR3FE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "temporal";
|
||||
version = "1.12.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gdks7pzaqrsdihh2m3v597x0dw2qww95jlznj0h112jgicanimj";
|
||||
sha256 = "sha256-5Tu838086qgIa2fqda2xi7vn4JbkENVJH4XU3NwW7Ic=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-dGmd6tCUKoK4uwhB5kXGOpXemtLn0VssabDE4iQWEAw=";
|
||||
vendorSha256 = "sha256-caRBgkuHQ38r6OsKQCJ2pxAe8s6mc4g/QCIsCEXvY3M=";
|
||||
|
||||
# Errors:
|
||||
# > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite
|
||||
|
|
@ -22,6 +22,7 @@ buildGoModule rec {
|
|||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -Dm755 "$GOPATH/bin/cli" -T $out/bin/tctl
|
||||
install -Dm755 "$GOPATH/bin/authorization" -T $out/bin/tctl-authorization-plugin
|
||||
install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra
|
||||
install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server
|
||||
install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql
|
||||
|
|
@ -35,9 +36,9 @@ buildGoModule rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability";
|
||||
downloadPage = "https://github.com/temporalio/temporal";
|
||||
homepage = "https://temporal.io";
|
||||
changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ titanous ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, protobuf
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gurk-rs";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boxdot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY=";
|
||||
buildInputs = [ protobuf ];
|
||||
|
||||
PROTOC = "${protobuf}/bin/protoc";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Signal Messenger client for terminal";
|
||||
homepage = "https://github.com/boxdot/gurk-rs";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ devhell ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20220216";
|
||||
version = "20220218";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hB5zjSBOcpVW+kGja4DP0syAvYqkeDBJbtg0y2sX9w4=";
|
||||
sha256 = "sha256-6fwkhqXM6T0WCC1Y+GCmyLwStqhBTUAzDDsBTd5XlSE=";
|
||||
};
|
||||
|
||||
# Remove when Apple SDK is >= 10.13
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extensions";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0ObyJz8I1S2SX8K7ZrR7KOXvUNG4oUAgh3xmJCPVB9M=";
|
||||
sha256 = "rZuoL0y9BHJpc7XoevrRiv2qMjhgoK8+ckDzp00iLxk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -54,11 +54,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.18beta2";
|
||||
version = "1.18rc1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-PLFOLILaNm9zk8mI8fP8LBa3GlSSvT1J01iGzfJ6nRM=";
|
||||
sha256 = "sha256-XOx6ZlMAj6hfiCGzNmXeN74om3oC8X829wWojEOYC7g=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure";
|
||||
version = "1.10.3.1075";
|
||||
version = "1.10.3.1082";
|
||||
|
||||
src = fetchurl {
|
||||
# https://clojure.org/releases/tools
|
||||
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
||||
sha256 = "5uJtr6uz6mrkoFfzUmUb6vy5H4s1Lag3CNCsGwsQZ9Q=";
|
||||
sha256 = "sha256-8hW8zgP+D72MtXYFPXx9FfkThQuCBo1Y6CU5w7xPE7c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,17 +8,21 @@
|
|||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-geojson-geonetnz-volcano";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-geojson-geonetnz-volcano";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n97kij2fprzajh57sy1z57kaqiil7pd5y67lq2hqm2cnvkar5ci";
|
||||
sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -34,7 +38,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ];
|
||||
pythonImportsCheck = [
|
||||
"aio_geojson_geonetnz_volcano"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds";
|
||||
|
|
|
|||
|
|
@ -8,17 +8,21 @@
|
|||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-geojson-nsw-rfs-incidents";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-geojson-nsw-rfs-incidents";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o9tuoJ7VZ6bg0rYeRWClKxdbxxj6wPgkSF7ZdOfmJew=";
|
||||
sha256 = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -34,7 +38,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ];
|
||||
pythonImportsCheck = [
|
||||
"aio_geojson_nsw_rfs_incidents"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for accessing the NSW Rural Fire Service incidents feeds";
|
||||
|
|
|
|||
|
|
@ -15,14 +15,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-georss-client";
|
||||
version = "0.8";
|
||||
version = "0.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-georss-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "0447scp5n906p8kfzy0lwdq06f6hkq71r2zala6g3vr6b3kla6h8";
|
||||
sha256 = "sha256-cnOW9Ey6WdL2bAqPop5noETn12OeeKsMkWHKGmYCjJU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -40,7 +42,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aio_georss_client" ];
|
||||
pythonImportsCheck = [
|
||||
"aio_georss_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for accessing GeoRSS feeds";
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "aio-georss-gdacs";
|
||||
version = "0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -32,7 +34,9 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aio_georss_gdacs" ];
|
||||
pythonImportsCheck = [
|
||||
"aio_georss_gdacs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for accessing GeoRSS feeds";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.2.84";
|
||||
version = "1.2.85";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-0ItNYdbGnIzgIh23Qtg9zQ5lm7zhY3qz+5s4MCfXN0E=";
|
||||
sha256 = "sha256-DFRnyWBQ3/g5NwZH5hoVYJfj3gN/UP57JvNSnNaqws4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-config";
|
||||
version = "8.7.1";
|
||||
version = "8.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo.config";
|
||||
inherit version;
|
||||
sha256 = "a0c346d778cdc8870ab945e438bea251b5f45fae05d6d99dfe4953cca2277b60";
|
||||
sha256 = "sha256-lpM9MBHa4VYIoRYWv7ANlH4i2jywm2/zfd11dqvUdkw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-serialization";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo.serialization";
|
||||
inherit version;
|
||||
sha256 = "3007e1b017ad3754cce54def894054cbcd05887e85928556657434b0fc7e4d83";
|
||||
sha256 = "sha256-OqRy9DSu6LvMByUxK39AmqH6VLvBNJBBJM9JsOhrkRU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-utils";
|
||||
version = "4.12.1";
|
||||
version = "4.12.2";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo.utils";
|
||||
inherit version;
|
||||
sha256 = "sha256-zzEhx2/jwpY+1WOo68PJ/TvDy6XUT76K7LVAfUMMMJI=";
|
||||
sha256 = "sha256-Qf0sT/bS6No4qttaW/JCWKhlDg4KaYprI51IuOQXfDs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycfmodel";
|
||||
version = "0.16.0";
|
||||
version = "0.16.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-44G1H6bOtqVkplaX/sHxEzErlunclLh97OPO0m6n9eM=";
|
||||
hash = "sha256-hOe6BH8aSGJ7YeraiCsJ10mbeGbFGaR3Bt5fh6M8iWI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, devtools
|
||||
, email_validator
|
||||
, fetchFromGitHub
|
||||
, pytest-mock
|
||||
|
|
@ -7,7 +9,6 @@
|
|||
, python-dotenv
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
, ujson
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -22,11 +23,15 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
devtools
|
||||
email_validator
|
||||
python-dotenv
|
||||
typing-extensions
|
||||
ujson
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.866";
|
||||
version = "2.0.873";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ASaRZO5/4IGT6GPQTMmwGao4Q+yuyiLO9eGV3Dy8mLQ=";
|
||||
hash = "sha256-81gNvfaFqTEGReOP7LgcN5OLU3xeO62r/45b5lEEgow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.265";
|
||||
version = "4.14.267";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1iwjg2z8818g1sl6l79pm5590hzwpxqcxh7wcdb00y4m3maksr0s";
|
||||
sha256 = "13hq4hcq686gdragjcgmz3m0kkk8abz5lna0ildaa9gybj43yd4c";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.228";
|
||||
version = "4.19.230";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "14iis3x3jmfxwqqi7v7ijssqzha8d8nnydi4zqnpk53m45jw7km8";
|
||||
sha256 = "107sqv4izdnazscwhyam88vbinsvnd33z8agn4awc42hkqh9l20p";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.300";
|
||||
version = "4.9.302";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1bzmnkhxgz093ninqg8bh348d7s4xmkld2bld8nl215gnji0wfdb";
|
||||
sha256 = "0difn0vjz4hz9vl5lklawqy19ccb5gz5p5r1cyckschf0l2nyifm";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.99";
|
||||
version = "5.10.101";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0j84g55d0v3832y9c5gh7bnmhnrb5bc9xdivps5n7n6km9c3b980";
|
||||
sha256 = "13hwpb85dynbayghxs3ln3hbyh8djgl5fj63vxwc8izfny62aj87";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.22";
|
||||
version = "5.15.24";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1hv3ci37nz79m1dg83ha4hl1jjnl3l52lvdzx514sp8hqihgji1m";
|
||||
sha256 = "0zx9big7n8gh6y14c05llxsqh543q0czjdrq906m8cc7r01yp5pl";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.16.8";
|
||||
version = "5.16.10";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "05h3b11czr710lilmb5gq84a78cfz3jm03q2q0gcrpcaxq2mzajj";
|
||||
sha256 = "17i3j07hgljsiz2kymbskp35p2xp14gb0mdi5s2r61c0h406yk8c";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.178";
|
||||
version = "5.4.180";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "19k2yzqlr4rarl086sr6vjnh0lq5wmg5n7r2p0cai9yfvq3spp2c";
|
||||
sha256 = "07ckmgcqpr39bzpp8v60b2vkb03p8931k7sl3ywg6f00lvcbaf8n";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.90-rt60"; # updated by ./update-rt.sh
|
||||
version = "5.10.78-rt55"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
|
|
@ -18,14 +18,14 @@ in buildLinux (args // {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "0997ijkmvf9iz4hn8m8naiagphhyvl4r6qx4q3gxk8qlq1j44pll";
|
||||
sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0533s01ckjjw45b08zs9nhpszdcrqgfpwvnjs2dfjmc6yg9d13pi";
|
||||
sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
|
|
|||
37
pkgs/os-specific/linux/virtio_vmmci/default.nix
Normal file
37
pkgs/os-specific/linux/virtio_vmmci/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ stdenv, lib, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "virtio_vmmci";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "voutilad";
|
||||
repo = "virtio_vmmci";
|
||||
rev = "${version}";
|
||||
sha256 = "104xnpcy5kb4y7ipy1fx1v6byddzs63bv2dqjy3yl23n764fsy43";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
extraConfig = ''
|
||||
CONFIG_RTC_HCTOSYS yes
|
||||
'';
|
||||
|
||||
makeFlags = kernel.makeFlags ++ [
|
||||
"DEPMOD=echo"
|
||||
"INSTALL_MOD_PATH=$(out)"
|
||||
"KERNELRELEASE=${kernel.modDirVersion}"
|
||||
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OpenBSD VMM Control Interface (vmmci) for Linux";
|
||||
homepage = "https://github.com/voutilad/virtio_vmmci";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ qbit ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
|
|
@ -30,8 +30,8 @@
|
|||
let
|
||||
|
||||
pname = "hylafaxplus";
|
||||
version = "7.0.4";
|
||||
sha256 = "1y4b178rxa4ivxm8cnypnnyc8db7cjqyyzy60hiw215x4cyyj4i5";
|
||||
version = "7.0.5";
|
||||
sha256 = "1blv251r0yhnhxk9wgkjgr35al50q23hiskjkcbs8lmqqrz0cm8f";
|
||||
|
||||
configSite = substituteAll {
|
||||
name = "${pname}-config.site";
|
||||
|
|
@ -96,6 +96,7 @@ stdenv.mkDerivation {
|
|||
postInstall = ". ${postInstall}";
|
||||
postInstallCheck = ". ${./post-install-check.sh}";
|
||||
meta = {
|
||||
changelog = "https://hylafax.sourceforge.io/news/${version}.php";
|
||||
description = "enterprise-class system for sending and receiving facsimiles";
|
||||
downloadPage = "https://hylafax.sourceforge.io/download.php";
|
||||
homepage = "https://hylafax.sourceforge.io";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,41 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, fetchpatch }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-synapse-mjolnir-antispam";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "mjolnir";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fvdzn5l1a6bhr1qzgs30a3kh6nj0byqichnl149sjgr0v4lpkz1";
|
||||
sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Update legacy antispam plugin with newer types. Or it'll just ignore mjolnir 1.3.1 rules.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/matrix-org/mjolnir/commit/eb8c5e08b4c2b78e6a796e38e826ac3b7e9dfbaf.patch";
|
||||
sha256 = "sha256-rfFU45PfxR2YmNRU74eBI9M2hqBVZcNH0Sw8W/cavD4=";
|
||||
stripLen = 1;
|
||||
})
|
||||
# Port to Synapse module API (needs Synapse >= 1.37.0)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/matrix-org/mjolnir/commit/9c9bd0e02907412b5fa6b95844e9f53ac07b61fd.patch";
|
||||
sha256 = "sha256-HR2OvqFnlQwRV7ezfOjseatjo+3P8i9PsV7D+hLD1Yo=";
|
||||
stripLen = 1;
|
||||
excludes = [
|
||||
"README.md"
|
||||
"mx-tester.yml"
|
||||
];
|
||||
})
|
||||
# Move glob_to_regex into the source
|
||||
(fetchpatch {
|
||||
url = "https://github.com/matrix-org/mjolnir/commit/6cb461fed424f07bf50a1fdc0693d40ed8bbee12.patch";
|
||||
sha256 = "sha256-tqcKXNs+fxwPIvN5sJjdNgcz5KUVHiXgulLHR2redYk=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "./source/synapse_antispam";
|
||||
|
||||
propagatedBuildInputs = [ matrix-synapse ];
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2022-02-12T00-51-25Z";
|
||||
version = "2022-02-16T00-35-27Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-xAzfMyUa81gZgZhfe1XNAFJ6LFXdR2cFCba8aBDg6Rc=";
|
||||
sha256 = "sha256-Lh51R5CAidPmqScwzmQEGlSlv2sNJbqa+z9fsTnQb+s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tw7SUCqQrDrET+GQbSkHaHC4usCapnH+NpILLwm6l9U=";
|
||||
vendorSha256 = "sha256-V8hCSpdIYQKFlHuV2GI9dt2rEhhr5q3cCSd8kEyMiDM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mjolnir";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "mjolnir";
|
||||
rev = "v${version}";
|
||||
sha256 = "4c9LyQb5SZ1IoBayiP0C0ho4hwJDv49DhsuoQIv9bTs=";
|
||||
sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
# This file originates from node2nix
|
||||
|
||||
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
|
||||
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
|
||||
|
||||
let
|
||||
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
|
||||
|
|
@ -40,36 +40,22 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
includeDependencies = {dependencies}:
|
||||
lib.optionalString (dependencies != [])
|
||||
(lib.concatMapStrings (dependency:
|
||||
''
|
||||
# Bundle the dependencies of the package
|
||||
mkdir -p node_modules
|
||||
cd node_modules
|
||||
# Common shell logic
|
||||
installPackage = writeShellScript "install-package" ''
|
||||
installPackage() {
|
||||
local packageName=$1 src=$2
|
||||
|
||||
# Only include dependencies if they don't exist. They may also be bundled in the package.
|
||||
if [ ! -e "${dependency.name}" ]
|
||||
then
|
||||
${composePackage dependency}
|
||||
fi
|
||||
local strippedName
|
||||
|
||||
cd ..
|
||||
''
|
||||
) dependencies);
|
||||
|
||||
# Recursively composes the dependencies of a package
|
||||
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
||||
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
|
||||
DIR=$(pwd)
|
||||
local DIR=$PWD
|
||||
cd $TMPDIR
|
||||
|
||||
unpackFile ${src}
|
||||
unpackFile $src
|
||||
|
||||
# Make the base dir in which the target dependency resides first
|
||||
mkdir -p "$(dirname "$DIR/${packageName}")"
|
||||
mkdir -p "$(dirname "$DIR/$packageName")"
|
||||
|
||||
if [ -f "${src}" ]
|
||||
if [ -f "$src" ]
|
||||
then
|
||||
# Figure out what directory has been unpacked
|
||||
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
|
||||
|
|
@ -79,28 +65,53 @@ let
|
|||
chmod -R u+w "$packageDir"
|
||||
|
||||
# Move the extracted tarball into the output folder
|
||||
mv "$packageDir" "$DIR/${packageName}"
|
||||
elif [ -d "${src}" ]
|
||||
mv "$packageDir" "$DIR/$packageName"
|
||||
elif [ -d "$src" ]
|
||||
then
|
||||
# Get a stripped name (without hash) of the source directory.
|
||||
# On old nixpkgs it's already set internally.
|
||||
if [ -z "$strippedName" ]
|
||||
then
|
||||
strippedName="$(stripHash ${src})"
|
||||
strippedName="$(stripHash $src)"
|
||||
fi
|
||||
|
||||
# Restore write permissions to make building work
|
||||
chmod -R u+w "$strippedName"
|
||||
|
||||
# Move the extracted directory into the output folder
|
||||
mv "$strippedName" "$DIR/${packageName}"
|
||||
mv "$strippedName" "$DIR/$packageName"
|
||||
fi
|
||||
|
||||
# Unset the stripped name to not confuse the next unpack step
|
||||
unset strippedName
|
||||
# Change to the package directory to install dependencies
|
||||
cd "$DIR/$packageName"
|
||||
}
|
||||
'';
|
||||
|
||||
# Include the dependencies of the package
|
||||
cd "$DIR/${packageName}"
|
||||
# Bundle the dependencies of the package
|
||||
#
|
||||
# Only include dependencies if they don't exist. They may also be bundled in the package.
|
||||
includeDependencies = {dependencies}:
|
||||
lib.optionalString (dependencies != []) (
|
||||
''
|
||||
mkdir -p node_modules
|
||||
cd node_modules
|
||||
''
|
||||
+ (lib.concatMapStrings (dependency:
|
||||
''
|
||||
if [ ! -e "${dependency.name}" ]; then
|
||||
${composePackage dependency}
|
||||
fi
|
||||
''
|
||||
) dependencies)
|
||||
+ ''
|
||||
cd ..
|
||||
''
|
||||
);
|
||||
|
||||
# Recursively composes the dependencies of a package
|
||||
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
||||
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
|
||||
installPackage "${packageName}" "${src}"
|
||||
${includeDependencies { inherit dependencies; }}
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
|
|
@ -415,6 +426,8 @@ let
|
|||
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
# Create and enter a root node_modules/ folder
|
||||
mkdir -p $out/lib/node_modules
|
||||
cd $out/lib/node_modules
|
||||
|
|
@ -492,6 +505,8 @@ let
|
|||
passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
mkdir -p $out/${packageName}
|
||||
cd $out/${packageName}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ store_src="$(nix-build . -A mjolnir.src --no-out-link)"
|
|||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
node2nix \
|
||||
--nodejs-12 \
|
||||
--nodejs-14 \
|
||||
--development \
|
||||
--node-env ./node-env.nix \
|
||||
--output ./node-deps.nix \
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "miniserve";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = "miniserve";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2/LBldSIiAFMY8ytMurbPfLQoKn1FNn6hfMozD48LaI=";
|
||||
sha256 = "sha256-pKNcgrhq5sh6AXKCStAIYAjTpW+tcnSheFHohp+Z84k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0EuYYaH0Quy6wvuUsy9u/ayf/8zToTtTJzvYCWNk8ac=";
|
||||
cargoSha256 = "sha256-QonLcAixRR7HEefU6D7cSF/stWFodWLWQI7HAkPJHrY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config zlib ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
buildGoModule rec {
|
||||
pname = "mmctl";
|
||||
version = "6.3.0";
|
||||
version = "6.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "mmctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hrNVDHM8AweAdda9SC29EGhkOhdiLD0EE1BLPhwe5SI=";
|
||||
sha256 = "sha256-V2p6diXymu37aJdHs0ZQJ7ak4LWe55KYCq15JRzMF48=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ let
|
|||
in
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "03.03.12";
|
||||
version = "03.04.00";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||
sha256 = "sha256-1KpM2lobU+KsxjHpNeAxwAx3mCrU8IZyhvfYJwlUQJ4=";
|
||||
sha256 = "sha256-uIpIygxV5l122FN8sz+OMeQh8iL4Vy87EM1/CjFvLVI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = tclLibraries;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2022-02-07T09-25-34Z";
|
||||
version = "2022-02-13T23-26-13Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-EoRJK+0C1SYKRrCoddCNkjyVV7yJp0vekYUD6yf86Rs=";
|
||||
sha256 = "sha256-1Led0OTJO/nN8NisLD/of5IybwYOygsL4xwQmXYCxfs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tJh+ElqKG3HUex2VT2YoawVZYq9rtK1X24E1GpDuOPA=";
|
||||
vendorSha256 = "sha256-DDtpRKBetVyeUYk0OGddKkAEe3mqL7d+cbSdIbXeZ2s=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config
|
||||
, openssl, ppp
|
||||
, systemd ? null }:
|
||||
, openssl
|
||||
, ppp
|
||||
, systemd
|
||||
, withSystemd ? stdenv.isLinux
|
||||
, withPpp ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
let
|
||||
withSystemd = stdenv.isLinux && !(systemd == null);
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfortivpn";
|
||||
version = "1.17.1";
|
||||
|
|
@ -26,15 +26,16 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl ppp
|
||||
openssl
|
||||
]
|
||||
++ lib.optional withSystemd systemd;
|
||||
++ lib.optional withSystemd systemd
|
||||
++ lib.optional withPpp ppp;
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--with-pppd=${ppp}/bin/pppd"
|
||||
]
|
||||
++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system";
|
||||
++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ in lib.makeExtensible (self: {
|
|||
};
|
||||
|
||||
nix_2_6 = common {
|
||||
version = "2.6.0";
|
||||
sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=";
|
||||
version = "2.6.1";
|
||||
sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0=";
|
||||
};
|
||||
|
||||
stable = self.nix_2_6;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-02-11";
|
||||
version = "2022-02-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pSvjTL/vS3E9jYGxae9RUw+DD9u49PoF7oNM/UZOzDg=";
|
||||
sha256 = "sha256-qmddjXZq4SLsAMEIMtpkXURfTUEDjXnkFGXLt/zrk9s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ];
|
||||
propagatedBuildInputs = (with python3Packages; [ dpkt scapy lxml ]) ++ # For pcap2john.py
|
||||
(with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl
|
||||
CompressRawLzma # For 7z2john.pl
|
||||
perlldap ]); # For sha-dump.pl
|
||||
# TODO: Get dependencies for radius2john.pl and lion2john-alt.pl
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.29"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.30"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 61b21e59fe8f4f65fba27f88d49782dece0aad00
|
||||
ref: refs/tags/6.1.29
|
||||
revision: aab66244adaadb275bd780c1301fea51f444426a
|
||||
ref: refs/tags/6.1.30
|
||||
specs:
|
||||
metasploit-framework (6.1.29)
|
||||
metasploit-framework (6.1.30)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -31,7 +31,7 @@ GIT
|
|||
metasploit-concern
|
||||
metasploit-credential
|
||||
metasploit-model
|
||||
metasploit-payloads (= 2.0.72)
|
||||
metasploit-payloads (= 2.0.74)
|
||||
metasploit_data_models
|
||||
metasploit_payloads-mettle (= 1.0.18)
|
||||
mqtt
|
||||
|
|
@ -98,25 +98,25 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
Ascii85 (1.1.0)
|
||||
actionpack (6.1.4.4)
|
||||
actionview (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
actionpack (6.1.4.6)
|
||||
actionview (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
rack (~> 2.0, >= 2.0.9)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actionview (6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
actionview (6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
activemodel (6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
activerecord (6.1.4.4)
|
||||
activemodel (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
activesupport (6.1.4.4)
|
||||
activemodel (6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
activerecord (6.1.4.6)
|
||||
activemodel (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
activesupport (6.1.4.6)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
|
|
@ -128,16 +128,16 @@ GEM
|
|||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.554.0)
|
||||
aws-sdk-core (3.126.0)
|
||||
aws-partitions (1.555.0)
|
||||
aws-sdk-core (3.126.2)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.298.0)
|
||||
aws-sdk-ec2 (1.299.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.66.0)
|
||||
aws-sdk-iam (1.67.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.54.0)
|
||||
|
|
@ -175,7 +175,7 @@ GEM
|
|||
eventmachine (1.2.7)
|
||||
faker (2.19.0)
|
||||
i18n (>= 1.6, < 2)
|
||||
faraday (1.9.3)
|
||||
faraday (1.10.0)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
|
|
@ -216,12 +216,12 @@ GEM
|
|||
domain_name (~> 0.5)
|
||||
http_parser.rb (0.8.0)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.9.1)
|
||||
i18n (1.10.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
io-console (0.5.11)
|
||||
irb (1.3.6)
|
||||
reline (>= 0.2.5)
|
||||
jmespath (1.5.0)
|
||||
jmespath (1.6.0)
|
||||
jsobfu (0.4.2)
|
||||
rkelly-remix
|
||||
json (2.6.1)
|
||||
|
|
@ -229,7 +229,7 @@ GEM
|
|||
logging (2.3.0)
|
||||
little-plugger (~> 1.1)
|
||||
multi_json (~> 1.14)
|
||||
loofah (2.13.0)
|
||||
loofah (2.14.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
metasm (1.0.5)
|
||||
|
|
@ -251,7 +251,7 @@ GEM
|
|||
activemodel (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
railties (~> 6.0)
|
||||
metasploit-payloads (2.0.72)
|
||||
metasploit-payloads (2.0.74)
|
||||
metasploit_data_models (5.0.4)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -267,7 +267,7 @@ GEM
|
|||
mini_portile2 (2.7.1)
|
||||
minitest (5.15.0)
|
||||
mqtt (0.5.0)
|
||||
msgpack (1.4.4)
|
||||
msgpack (1.4.5)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.1.1)
|
||||
mustermann (1.1.1)
|
||||
|
|
@ -298,13 +298,13 @@ GEM
|
|||
hashery (~> 2.0)
|
||||
ruby-rc4
|
||||
ttfunk
|
||||
pg (1.3.1)
|
||||
pg (1.3.2)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.6.1)
|
||||
puma (5.6.2)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.6.0)
|
||||
rack (2.2.3)
|
||||
rack-protection (2.1.0)
|
||||
rack-protection (2.2.0)
|
||||
rack
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
|
|
@ -313,9 +313,9 @@ GEM
|
|||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.4.2)
|
||||
loofah (~> 2.3)
|
||||
railties (6.1.4.4)
|
||||
actionpack (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
railties (6.1.4.6)
|
||||
actionpack (= 6.1.4.6)
|
||||
activesupport (= 6.1.4.6)
|
||||
method_source
|
||||
rake (>= 0.13)
|
||||
thor (~> 1.0)
|
||||
|
|
@ -334,7 +334,7 @@ GEM
|
|||
rex-core
|
||||
rex-struct2
|
||||
rex-text
|
||||
rex-core (0.1.25)
|
||||
rex-core (0.1.26)
|
||||
rex-encoder (0.1.6)
|
||||
metasm
|
||||
rex-arch
|
||||
|
|
@ -353,7 +353,7 @@ GEM
|
|||
rex-arch
|
||||
rex-ole (0.1.7)
|
||||
rex-text
|
||||
rex-powershell (0.1.94)
|
||||
rex-powershell (0.1.95)
|
||||
rex-random_identifier
|
||||
rex-text
|
||||
ruby-rc4
|
||||
|
|
@ -379,7 +379,7 @@ GEM
|
|||
ruby-macho (3.0.0)
|
||||
ruby-rc4 (0.1.5)
|
||||
ruby2_keywords (0.0.5)
|
||||
ruby_smb (3.0.2)
|
||||
ruby_smb (3.0.4)
|
||||
bindata
|
||||
openssl-ccm
|
||||
openssl-cmac
|
||||
|
|
@ -392,10 +392,10 @@ GEM
|
|||
faraday (> 0.8, < 2.0)
|
||||
simpleidn (0.2.1)
|
||||
unf (~> 0.1.4)
|
||||
sinatra (2.1.0)
|
||||
sinatra (2.2.0)
|
||||
mustermann (~> 1.0)
|
||||
rack (~> 2.2)
|
||||
rack-protection (= 2.1.0)
|
||||
rack-protection (= 2.2.0)
|
||||
tilt (~> 2.0)
|
||||
sqlite3 (1.4.2)
|
||||
sshkey (2.0.0)
|
||||
|
|
@ -432,9 +432,9 @@ GEM
|
|||
logging (>= 1.6.1, < 3.0)
|
||||
nori (~> 2.0)
|
||||
rubyntlm (~> 0.6.0, >= 0.6.3)
|
||||
xdr (3.0.2)
|
||||
activemodel (>= 4.2, < 7.0)
|
||||
activesupport (>= 4.2, < 7.0)
|
||||
xdr (3.0.3)
|
||||
activemodel (>= 4.2, < 8.0)
|
||||
activesupport (>= 4.2, < 8.0)
|
||||
xmlrpc (0.3.2)
|
||||
webrick
|
||||
zeitwerk (2.5.4)
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.29";
|
||||
version = "6.1.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-S0R9D6Tih9+aVdYkpAodfwcRCq8WaqaJ5oYuPl7PgK8=";
|
||||
sha256 = "sha256-QSKJIcHaWsxbHe2uTW5MnZFMoK1fOa6TejIT2Mq0z7k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -4,50 +4,50 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9";
|
||||
sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.4.6";
|
||||
};
|
||||
actionview = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm";
|
||||
sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.4.6";
|
||||
};
|
||||
activemodel = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm";
|
||||
sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.4.6";
|
||||
};
|
||||
activerecord = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik";
|
||||
sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.4.6";
|
||||
};
|
||||
activesupport = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98";
|
||||
sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.4.6";
|
||||
};
|
||||
addressable = {
|
||||
groups = ["default"];
|
||||
|
|
@ -104,40 +104,40 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0c5dyi1hy9xawlicdfzakj279r514vmb93kpwfa92lbb9bz1plg5";
|
||||
sha256 = "0r3ihnddcizpf34mcfggyjii8lmjyy1q89mswpbzqa5mxvws85qg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.554.0";
|
||||
version = "1.555.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "002hgcpsch33r82jd5imyxj0h2w4v8ymmby42rnxdisd03jkygy9";
|
||||
sha256 = "19xi4dr675f7x9dmk1fc10jmjdgv45j3dn9k44m5xavd3qnpzx7v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.126.0";
|
||||
version = "3.126.2";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0s0xdcrhmcgbh4m1g57dnw04g45zviv6a4r3qaw8468bm6bi16z6";
|
||||
sha256 = "13kl993psm21mni2g3llyj6b1nzway8kcabnrblnrjkd4d4fg3v7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.298.0";
|
||||
version = "1.299.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dr1lgg76syyqj12x8w0j6qvwn3410vdjhy0r9y8k930svrjlkh7";
|
||||
sha256 = "1iv8db2wb3lajcnqx6icn7bdvhrfd7di01c329r95kgw6gzsf7sc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.66.0";
|
||||
version = "1.67.0";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
groups = ["default"];
|
||||
|
|
@ -344,10 +344,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
|
||||
sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.3";
|
||||
version = "1.10.0";
|
||||
};
|
||||
faraday-em_http = {
|
||||
groups = ["default"];
|
||||
|
|
@ -564,10 +564,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8";
|
||||
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
};
|
||||
io-console = {
|
||||
groups = ["default"];
|
||||
|
|
@ -594,10 +594,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan";
|
||||
sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
};
|
||||
jsobfu = {
|
||||
groups = ["default"];
|
||||
|
|
@ -644,10 +644,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg";
|
||||
sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
};
|
||||
metasm = {
|
||||
groups = ["default"];
|
||||
|
|
@ -684,12 +684,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "61b21e59fe8f4f65fba27f88d49782dece0aad00";
|
||||
sha256 = "1bw0rxg3wbl6ws4scshnmw5121vz3l5a896nanddz1z2lh7psi2b";
|
||||
rev = "aab66244adaadb275bd780c1301fea51f444426a";
|
||||
sha256 = "1ffgnk5dh4rjga9swfazmnh4r4cx9ip4vbpd3mdwqnnsq4hqj8j1";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.29";
|
||||
version = "6.1.30";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -706,10 +706,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ybw1daczslifq684hjxmr5668w7db1fi0z6g53812yva7lf4sv6";
|
||||
sha256 = "03q70mqn38chhm9cmjh6k4ch5jsrgf2id09jv0ylkn3vsrrjfzpg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.72";
|
||||
version = "2.0.74";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
|
|
@ -776,10 +776,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739";
|
||||
sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
|
|
@ -977,10 +977,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zn1miz2h3pki11jwf6f474540kvai3sc43jp8smi3mjx8brvws0";
|
||||
sha256 = "0m776cj2hik15wi730vhgczd5v9s0xmi45q2hgcf5m5cnqvfih35";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
|
|
@ -997,10 +997,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03blhf8snz59433zsv7apwqy1hg92yhkb5am9x2dpqr0c4i6hscs";
|
||||
sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.6.1";
|
||||
version = "5.6.2";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1027,10 +1027,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
|
||||
sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
};
|
||||
rack-test = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1067,10 +1067,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nmyds2www6dmqbbd5ggq31gxxb9mwxd5llzmb3iyczssk6l7lla";
|
||||
sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.4.4";
|
||||
version = "6.1.4.6";
|
||||
};
|
||||
rake = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1147,10 +1147,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04w1pknswnjs02fgsqcr8dx6cz3qjmx7hs83kbhn836s4yfpyv6a";
|
||||
sha256 = "1hjc70q6wb580k0jk4g4s9aqwd25l48kr0pcyjjs2ffax0zcm4d0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.25";
|
||||
version = "0.1.26";
|
||||
};
|
||||
rex-encoder = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1217,10 +1217,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ib75d16j8z0chni7m9v74xpxf13164hh8kr7v7yg93zpsqxw6p5";
|
||||
sha256 = "0ydzvakfg8can56jn0i8qnrf742csyk82krj50b44sj93ncj7h54";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.94";
|
||||
version = "0.1.95";
|
||||
};
|
||||
rex-random_identifier = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1357,10 +1357,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13sp6bqgj06h7jkw5qvafwawfh2akyrsj38vq8qkjfjdg79pkbxf";
|
||||
sha256 = "0w7ywnf3b3dsfqarj9yc21q1f5p29vs359x5d7sipvc0ljdwn95l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.2";
|
||||
version = "3.0.4";
|
||||
};
|
||||
rubyntlm = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1407,10 +1407,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
|
||||
sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
};
|
||||
sqlite3 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1607,10 +1607,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "019yzxddyndc7m7basars0m380m27sfcq99vr5hk1ag4ymayqkwr";
|
||||
sha256 = "1vsimn1vha6qjh1zbkvma5biwlh3hzc6s24ksw7vsxg0z27m8bmz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
};
|
||||
xmlrpc = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -25647,6 +25647,8 @@ with pkgs;
|
|||
fftw = fftwSinglePrec;
|
||||
};
|
||||
|
||||
gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { };
|
||||
|
||||
gjay = callPackage ../applications/audio/gjay { };
|
||||
|
||||
photivo = callPackage ../applications/graphics/photivo { };
|
||||
|
|
|
|||
|
|
@ -440,6 +440,8 @@ in {
|
|||
|
||||
vhba = callPackage ../applications/emulators/cdemu/vhba.nix { };
|
||||
|
||||
virtio_vmmci = callPackage ../os-specific/linux/virtio_vmmci { };
|
||||
|
||||
virtualbox = callPackage ../os-specific/linux/virtualbox {
|
||||
virtualbox = pkgs.virtualboxHardened;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue