Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
a5bbeb4fb1
@ -58,9 +58,6 @@ indent_size = unset
|
||||
[eggs.nix]
|
||||
trim_trailing_whitespace = unset
|
||||
|
||||
[gemset*.nix]
|
||||
insert_final_newline = unset
|
||||
|
||||
[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
|
||||
trim_trailing_whitespace = unset
|
||||
|
||||
|
||||
@ -3887,6 +3887,12 @@
|
||||
githubId = 4458;
|
||||
name = "Ivan Kozik";
|
||||
};
|
||||
ivan-babrou = {
|
||||
email = "nixpkgs@ivan.computer";
|
||||
name = "Ivan Babrou";
|
||||
github = "bobrik";
|
||||
githubId = 89186;
|
||||
};
|
||||
ivan-timokhin = {
|
||||
email = "nixpkgs@ivan.timokhin.name";
|
||||
name = "Ivan Timokhin";
|
||||
|
||||
@ -26,6 +26,7 @@ in
|
||||
};
|
||||
reservedMemory = mkOption {
|
||||
default = "128M";
|
||||
type = types.str;
|
||||
description = ''
|
||||
The amount of memory reserved for the crashdump kernel.
|
||||
If you choose a too high value, dmesg will mention
|
||||
|
||||
@ -33,6 +33,7 @@ in {
|
||||
};
|
||||
configurationDir = mkOption {
|
||||
default = "${activemq}/conf";
|
||||
type = types.str;
|
||||
description = ''
|
||||
The base directory for ActiveMQ's configuration.
|
||||
By default, this directory is searched for a file named activemq.xml,
|
||||
|
||||
@ -58,6 +58,7 @@ in
|
||||
};
|
||||
|
||||
interface = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = ''
|
||||
The interface the BitlBee deamon will be listening to. If `127.0.0.1',
|
||||
@ -68,6 +69,7 @@ in
|
||||
|
||||
portNumber = mkOption {
|
||||
default = 6667;
|
||||
type = types.int;
|
||||
description = ''
|
||||
Number of the port BitlBee will be listening to.
|
||||
'';
|
||||
@ -142,6 +144,7 @@ in
|
||||
|
||||
extraSettings = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Will be inserted in the Settings section of the config file.
|
||||
'';
|
||||
@ -149,6 +152,7 @@ in
|
||||
|
||||
extraDefaults = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = ''
|
||||
Will be inserted in the Default section of the config file.
|
||||
'';
|
||||
|
||||
@ -4,13 +4,14 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.chrony;
|
||||
chronyPkg = cfg.package;
|
||||
|
||||
stateDir = "/var/lib/chrony";
|
||||
stateDir = cfg.directory;
|
||||
driftFile = "${stateDir}/chrony.drift";
|
||||
keyFile = "${stateDir}/chrony.keys";
|
||||
|
||||
configFile = pkgs.writeText "chrony.conf" ''
|
||||
${concatMapStringsSep "\n" (server: "server " + server + " iburst") cfg.servers}
|
||||
${concatMapStringsSep "\n" (server: "server " + server + " " + cfg.serverOption + optionalString (cfg.enableNTS) " nts") cfg.servers}
|
||||
|
||||
${optionalString
|
||||
(cfg.initstepslew.enabled && (cfg.servers != []))
|
||||
@ -19,6 +20,7 @@ let
|
||||
|
||||
driftfile ${driftFile}
|
||||
keyfile ${keyFile}
|
||||
${optionalString (cfg.enableNTS) "ntsdumpdir ${stateDir}"}
|
||||
|
||||
${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
|
||||
|
||||
@ -39,6 +41,15 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.chrony;
|
||||
defaultText = "pkgs.chrony";
|
||||
description = ''
|
||||
Which chrony package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
servers = mkOption {
|
||||
default = config.networking.timeServers;
|
||||
type = types.listOf types.str;
|
||||
@ -47,6 +58,29 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
serverOption = mkOption {
|
||||
default = "iburst";
|
||||
type = types.enum [ "iburst" "offline" ];
|
||||
description = ''
|
||||
Set option for server directives.
|
||||
|
||||
Use "iburst" to rapidly poll on startup. Recommended if your machine
|
||||
is consistently online.
|
||||
|
||||
Use "offline" to prevent polling on startup. Recommended if your
|
||||
machine boots offline or is otherwise frequently offline.
|
||||
'';
|
||||
};
|
||||
|
||||
enableNTS = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable Network Time Security authentication.
|
||||
Make sure it is supported by your selected NTP server(s).
|
||||
'';
|
||||
};
|
||||
|
||||
initstepslew = mkOption {
|
||||
default = {
|
||||
enabled = true;
|
||||
@ -59,6 +93,12 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
directory = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/chrony";
|
||||
description = "Directory where chrony state is stored.";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
@ -80,7 +120,7 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
meta.maintainers = with lib.maintainers; [ thoughtpolice ];
|
||||
|
||||
environment.systemPackages = [ pkgs.chrony ];
|
||||
environment.systemPackages = [ chronyPkg ];
|
||||
|
||||
users.groups.chrony.gid = config.ids.gids.chrony;
|
||||
|
||||
@ -110,12 +150,12 @@ in
|
||||
after = [ "network.target" ];
|
||||
conflicts = [ "ntpd.service" "systemd-timesyncd.service" ];
|
||||
|
||||
path = [ pkgs.chrony ];
|
||||
path = [ chronyPkg ];
|
||||
|
||||
unitConfig.ConditionCapability = "CAP_SYS_TIME";
|
||||
serviceConfig =
|
||||
{ Type = "simple";
|
||||
ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
|
||||
ExecStart = "${chronyPkg}/bin/chronyd ${chronyFlags}";
|
||||
|
||||
ProtectHome = "yes";
|
||||
ProtectSystem = "full";
|
||||
|
||||
@ -31,32 +31,38 @@ in
|
||||
|
||||
tempDir = mkOption {
|
||||
default = "/tmp";
|
||||
type = types.str;
|
||||
description = "Location where JBoss stores its temp files";
|
||||
};
|
||||
|
||||
logDir = mkOption {
|
||||
default = "/var/log/jboss";
|
||||
type = types.str;
|
||||
description = "Location of the logfile directory of JBoss";
|
||||
};
|
||||
|
||||
serverDir = mkOption {
|
||||
description = "Location of the server instance files";
|
||||
default = "/var/jboss/server";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
deployDir = mkOption {
|
||||
description = "Location of the deployment files";
|
||||
default = "/nix/var/nix/profiles/default/server/default/deploy/";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
libUrl = mkOption {
|
||||
default = "file:///nix/var/nix/profiles/default/server/default/lib";
|
||||
description = "Location where the shared library JARs are stored";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
default = "nobody";
|
||||
description = "User account under which jboss runs.";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
useJK = mkOption {
|
||||
|
||||
@ -226,6 +226,7 @@ in {
|
||||
"horizontalScrolling"
|
||||
"sendEventsMode"
|
||||
"tapping"
|
||||
"tappingDragLock"
|
||||
"disableWhileTyping"
|
||||
"additionalOptions"
|
||||
]);
|
||||
|
||||
@ -263,7 +263,7 @@ let
|
||||
}
|
||||
(mkIf (config.preStart != "")
|
||||
{ serviceConfig.ExecStartPre =
|
||||
makeJobScript "${name}-pre-start" config.preStart;
|
||||
[ (makeJobScript "${name}-pre-start" config.preStart) ];
|
||||
})
|
||||
(mkIf (config.script != "")
|
||||
{ serviceConfig.ExecStart =
|
||||
@ -271,7 +271,7 @@ let
|
||||
})
|
||||
(mkIf (config.postStart != "")
|
||||
{ serviceConfig.ExecStartPost =
|
||||
makeJobScript "${name}-post-start" config.postStart;
|
||||
[ (makeJobScript "${name}-post-start" config.postStart) ];
|
||||
})
|
||||
(mkIf (config.reload != "")
|
||||
{ serviceConfig.ExecReload =
|
||||
|
||||
@ -20,6 +20,8 @@
|
||||
, iproute
|
||||
, krb5
|
||||
, lib
|
||||
, mesa
|
||||
, libdrm
|
||||
, libX11
|
||||
, libXScrnSaver
|
||||
, libXcomposite
|
||||
@ -65,6 +67,8 @@ let
|
||||
gtk3
|
||||
icu
|
||||
krb5
|
||||
mesa
|
||||
libdrm
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXcomposite
|
||||
@ -92,11 +96,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appgate-sdp";
|
||||
version = "5.1.2";
|
||||
version = "5.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bin.appgate-sdp.com/5.1/client/appgate-sdp_${version}_amd64.deb";
|
||||
sha256 = "0v4vfibg1giml3vfz2w7qypqzymvfchi5qm6vfagah2vfbkw7xc2";
|
||||
url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
|
||||
sha256 = "123d4mx2nsh8q3ckm4g2chdcdwgg0cz9cvhiwjggxzvy7j6bqgy4";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@ -123,26 +127,35 @@ stdenv.mkDerivation rec {
|
||||
cp -r $out/usr/share $out/share
|
||||
|
||||
for file in $out/opt/appgate/linux/appgate-resolver.pre \
|
||||
$out/opt/appgate/linux/appgate-dumb-resolver.pre \
|
||||
$out/lib/systemd/system/appgatedriver.service \
|
||||
$out/lib/systemd/system/appgate-dumb-resolver.service \
|
||||
$out/lib/systemd/system/appgate-resolver.service
|
||||
$out/opt/appgate/linux/appgate-dumb-resolver.pre
|
||||
do
|
||||
substituteInPlace $file \
|
||||
--replace "/bin/sh" "${bash}/bin/sh" \
|
||||
--replace "/opt/" "$out/opt/" \
|
||||
--replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" \
|
||||
--replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media" \
|
||||
--replace "cat" "${coreutils}/bin/cat" \
|
||||
--replace "chattr" "${e2fsprogs}/bin/chattr" \
|
||||
--replace "mv" "${coreutils}/bin/mv" \
|
||||
--replace "pkill" "${procps}/bin/pkill"
|
||||
done
|
||||
|
||||
for file in $out/lib/systemd/system/appgatedriver.service \
|
||||
$out/lib/systemd/system/appgate-dumb-resolver.service \
|
||||
$out/lib/systemd/system/appgate-resolver.service
|
||||
do
|
||||
substituteInPlace $file \
|
||||
--replace "/bin/sh" "${bash}/bin/sh" \
|
||||
--replace "/opt/" "$out/opt/" \
|
||||
--replace "chattr" "${e2fsprogs}/bin/chattr" \
|
||||
--replace "mv" "${coreutils}/bin/mv"
|
||||
done
|
||||
|
||||
substituteInPlace $out/lib/systemd/system/appgatedriver.service \
|
||||
--replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media"
|
||||
|
||||
substituteInPlace $out/lib/systemd/system/appgate-resolver.service \
|
||||
--replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
|
||||
|
||||
substituteInPlace $out/opt/appgate/linux/nm.py --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq"
|
||||
substituteInPlace $out/opt/appgate/linux/set_dns \
|
||||
--replace "service appgate-resolver stop" "${systemd.out}/bin/systemctl stop appgate-resolver" \
|
||||
--replace "/etc/appgate.conf" "$out/etc/appgate.conf"
|
||||
substituteInPlace $out/opt/appgate/linux/set_dns --replace "/etc/appgate.conf" "$out/etc/appgate.conf"
|
||||
|
||||
'';
|
||||
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.11.1";
|
||||
version = "2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6XsjxTYmjr/3smwwS7c+Mq1sqfgKAhWzHOY8TWlIKHU=";
|
||||
sha256 = "sha256-k9G0lN7qKQhWiXibzhC9Ma9h+44LQJ966MIakWk5nJM=";
|
||||
};
|
||||
|
||||
patches = [ ./import-ssl-module.patch ];
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pijul";
|
||||
version = "1.0.0-alpha.35";
|
||||
version = "1.0.0-alpha.37";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "02x4v63shlbnyppwm10qv8smbfz6a8kpwr3rcvzwpa0blqx2sq4n";
|
||||
sha256 = "02hdnfpy0hlgwhahrd5ddjmq8r05pyny0r91q3avirli1i7rkvs6";
|
||||
};
|
||||
|
||||
cargoSha256 = "1hmj9470x1ynj5phxsyi0gakzmxbmgb5y51xarrks34f9z7a655v";
|
||||
cargoSha256 = "16v9nqrfdmrmll72yj6a6wl4rv28n838myjyw2n68kjmijakvnk4";
|
||||
|
||||
cargoBuildFlags = lib.optional gitImportSupport "--features=git";
|
||||
|
||||
|
||||
@ -35,13 +35,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03547axiwv161sbymh2vxqx591xr4nq6b9y8y45m15xvfv0f7vl8";
|
||||
sha256 = "sha256-OdB7UXLG99ErbfSCvq87LxBy5EYkUvTfyQNG70RFbl4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
25
pkgs/applications/virtualization/docker/buildx.nix
Normal file
25
pkgs/applications/virtualization/docker/buildx.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-buildx";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "buildx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
installPhase = ''
|
||||
install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Docker CLI plugin for extended build capabilities with BuildKit";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ivan-babrou ];
|
||||
};
|
||||
}
|
||||
@ -1,10 +1,11 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, sqlite, iproute, lvm2, systemd
|
||||
, sqlite, iproute, lvm2, systemd, docker-buildx
|
||||
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||
, procps, libseccomp
|
||||
, nixosTests
|
||||
, buildxSupport ? false
|
||||
}:
|
||||
|
||||
with lib;
|
||||
@ -15,7 +16,7 @@ rec {
|
||||
, mobyRev, mobySha256
|
||||
, runcRev, runcSha256
|
||||
, containerdRev, containerdSha256
|
||||
, tiniRev, tiniSha256
|
||||
, tiniRev, tiniSha256, buildxSupport
|
||||
} :
|
||||
let
|
||||
docker-runc = runc.overrideAttrs (oldAttrs: {
|
||||
@ -142,7 +143,7 @@ rec {
|
||||
makeWrapper
|
||||
] ++ optionals (stdenv.isLinux) [
|
||||
sqlite lvm2 btrfs-progs systemd libseccomp
|
||||
];
|
||||
] ++ optionals (buildxSupport) [ docker-buildx ];
|
||||
|
||||
# Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables
|
||||
buildPhase = ''
|
||||
@ -167,6 +168,9 @@ rec {
|
||||
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
|
||||
substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man"
|
||||
substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man
|
||||
'' + optionalString buildxSupport ''
|
||||
substituteInPlace ./components/cli/cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
|
||||
${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
|
||||
'';
|
||||
|
||||
outputs = ["out" "man"];
|
||||
@ -224,5 +228,6 @@ rec {
|
||||
containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";
|
||||
tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0
|
||||
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
|
||||
inherit buildxSupport;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20201129";
|
||||
version = "20201210";
|
||||
pname = "libewf";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
|
||||
sha256 = "168k1az9hm0lajh57zlbknsq5m8civ1rzp81zz4sd7v64xilzxdk";
|
||||
sha256 = "sha256-dI1We2bsBRDcyqd6HLC7eBE99dpzSkhHtNgt0ZE4aDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, geant_version }:
|
||||
{ lib, stdenv, fetchurl, geant_version }:
|
||||
|
||||
let
|
||||
mkDataset = { name, version, sha256, envvar }:
|
||||
|
||||
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
data = import ./datasets.nix {
|
||||
inherit stdenv fetchurl;
|
||||
inherit lib stdenv fetchurl;
|
||||
geant_version = version;
|
||||
};
|
||||
|
||||
|
||||
@ -388,10 +388,11 @@ let
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, meta ? {}
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node_${name}-${version}";
|
||||
@ -443,6 +444,11 @@ let
|
||||
# Run post install hook, if provided
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# default to Node.js' platforms
|
||||
platforms = nodejs.meta.platforms;
|
||||
} // meta;
|
||||
} // extraArgs);
|
||||
|
||||
# Builds a development shell
|
||||
|
||||
39
pkgs/development/ocaml-modules/emile/default.nix
Normal file
39
pkgs/development/ocaml-modules/emile/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib, buildDunePackage, fetchurl, ocaml
|
||||
, angstrom, ipaddr, base64, pecu, uutf
|
||||
, alcotest, cmdliner
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "emile";
|
||||
version = "1.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/emile/releases/download/v${version}/emile-v${version}.tbz";
|
||||
sha256 = "0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p";
|
||||
};
|
||||
|
||||
buildInputs = [ cmdliner ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
angstrom
|
||||
ipaddr
|
||||
base64
|
||||
pecu
|
||||
uutf
|
||||
];
|
||||
|
||||
# technically emile is available for ocaml >= 4.03, but alcotest
|
||||
# and angstrom (fmt) are only available for >= 4.05. Disabling
|
||||
# tests for < 4.05 at least improves the error message
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.05";
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parser of email address according RFC822";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/dinosaure/emile";
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
41
pkgs/development/ocaml-modules/hxd/default.nix
Normal file
41
pkgs/development/ocaml-modules/hxd/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib, buildDunePackage, fetchurl
|
||||
, dune-configurator, cmdliner, angstrom
|
||||
, rresult, stdlib-shims, fmt, fpath
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "hxd";
|
||||
version = "0.2.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
|
||||
sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dune-configurator
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmdliner
|
||||
angstrom
|
||||
rresult
|
||||
fmt
|
||||
fpath
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
stdlib-shims
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hexdump in OCaml";
|
||||
homepage = "https://github.com/dinosaure/hxd";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
26
pkgs/development/ocaml-modules/pecu/default.nix
Normal file
26
pkgs/development/ocaml-modules/pecu/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "pecu";
|
||||
version = "0.5";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/pecu/releases/download/v0.5/pecu-v0.5.tbz";
|
||||
sha256 = "713753cd6ba3f4609a26d94576484e83ffef7de5f2208a2993576a1b22f0e0e7";
|
||||
};
|
||||
|
||||
# fmt availability
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.05";
|
||||
checkInputs = [ fmt alcotest ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/mirage/pecu";
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +1,29 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage, ocaml
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0"
|
||||
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
|
||||
, stdlib-shims
|
||||
, stdlib-shims, ocaml-migrate-parsetree-2-1
|
||||
}:
|
||||
|
||||
let param = {
|
||||
"0.8.1" = {
|
||||
sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
|
||||
max_version = "4.10";
|
||||
useDune2 = false;
|
||||
useOMP2 = false;
|
||||
};
|
||||
"0.13.0" = {
|
||||
sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl";
|
||||
useDune2 = false;
|
||||
useOMP2 = false;
|
||||
};
|
||||
"0.15.0" = {
|
||||
sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
|
||||
min_version = "4.07";
|
||||
useDune2 = true;
|
||||
useOMP2 = false;
|
||||
};
|
||||
"0.18.0" = {
|
||||
sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm";
|
||||
min_version = "4.07";
|
||||
};
|
||||
}."${version}"; in
|
||||
|
||||
@ -28,7 +36,7 @@ buildDunePackage rec {
|
||||
pname = "ppxlib";
|
||||
inherit version;
|
||||
|
||||
useDune2 = param.useDune2 or false;
|
||||
useDune2 = param.useDune2 or true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-ppx";
|
||||
@ -38,7 +46,12 @@ buildDunePackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
|
||||
ocaml-compiler-libs
|
||||
(if param.useOMP2 or true
|
||||
then ocaml-migrate-parsetree-2-1
|
||||
else ocaml-migrate-parsetree)
|
||||
ppx_derivers
|
||||
stdio
|
||||
stdlib-shims
|
||||
];
|
||||
|
||||
|
||||
40
pkgs/development/ocaml-modules/wodan/default.nix
Normal file
40
pkgs/development/ocaml-modules/wodan/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint
|
||||
, checkseum, diet, bitv, nocrypto, logs, lru, io-page, mirage-block }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "wodan";
|
||||
version = "unstable-2020-11-20";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirage";
|
||||
repo = pname;
|
||||
rev = "cc08fe25888051c207f1009bcd2d39f8c514484f";
|
||||
sha256 = "0186vlhnl8wcz2hmpn327n9a0bibnypmjy3w4nxq3yyglh6vj1im";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lwt_ppx
|
||||
ppx_cstruct
|
||||
optint
|
||||
checkseum
|
||||
diet
|
||||
bitv
|
||||
nocrypto
|
||||
logs
|
||||
lru
|
||||
io-page
|
||||
mirage-block
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "A flash-friendly, safe and flexible filesystem library";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
};
|
||||
}
|
||||
20
pkgs/development/ocaml-modules/wodan/irmin.nix
Normal file
20
pkgs/development/ocaml-modules/wodan/irmin.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ lib, buildDunePackage, io-page-unix, irmin-chunk, irmin-git, irmin-unix
|
||||
, mirage-block-ramdisk, mirage-block-unix, wodan }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "wodan-irmin";
|
||||
inherit (wodan) version src useDune2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
io-page-unix
|
||||
irmin-chunk
|
||||
irmin-git
|
||||
irmin-unix
|
||||
mirage-block-ramdisk
|
||||
mirage-block-unix
|
||||
wodan
|
||||
];
|
||||
|
||||
meta = wodan.meta // { description = "Wodan as an Irmin store"; };
|
||||
|
||||
}
|
||||
27
pkgs/development/ocaml-modules/wodan/unix.nix
Normal file
27
pkgs/development/ocaml-modules/wodan/unix.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, buildDunePackage, base64, benchmark, csv, cmdliner, wodan, afl-persistent
|
||||
, io-page-unix, mirage-block-ramdisk, mirage-block-unix }:
|
||||
|
||||
buildDunePackage rec {
|
||||
outputs = [ "bin" "out" ];
|
||||
pname = "wodan-unix";
|
||||
inherit (wodan) version src useDune2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
afl-persistent
|
||||
base64
|
||||
benchmark
|
||||
cmdliner
|
||||
csv
|
||||
io-page-unix
|
||||
mirage-block-ramdisk
|
||||
mirage-block-unix
|
||||
wodan
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput bin "''${!outputBin}"
|
||||
'';
|
||||
|
||||
meta = wodan.meta // { description = "Wodan clients with Unix integration"; };
|
||||
|
||||
}
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ROPGadget";
|
||||
version = "6.4";
|
||||
version = "6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "51d7cbdf51ac8b3f3f00bc0d4ae44433ef58d3bf5495efb316ec918654f1e6c3";
|
||||
sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ capstone ];
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx";
|
||||
version = "0.6.8";
|
||||
version = "0.6.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9f9055bc2a9a72c5eab17e0ce5522edecd6de07e21cf347bf0cffabdabe5570e";
|
||||
sha256 = "0c28e9c058ee504a07eec11cb333bc6496d233da100dcab9c33549e9eb4985c0";
|
||||
};
|
||||
|
||||
# tests are not implemented
|
||||
|
||||
28
pkgs/development/python-modules/atenpdu/default.nix
Normal file
28
pkgs/development/python-modules/atenpdu/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pysnmp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atenpdu";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1np9p3d180c26p54nw33alb003lhx6fprr21h45dd8gqk3slm13c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pysnmp ];
|
||||
|
||||
# Project has no test
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "atenpdu" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface to control ATEN PE PDUs";
|
||||
homepage = "https://github.com/mtdcr/pductl";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awesomeversion";
|
||||
version = "20.12.5";
|
||||
version = "21.1.3";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1jwlfqnrqlxjp30fj9bcqh7vgicmpdbn5kjdcmll4srnl87lalfg";
|
||||
sha256 = "sha256-D31wmBrYFCArHddAINWjfTPow4K2TD+wGfmRUuIaBdA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "2.25.0";
|
||||
version = "2021.01.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1irp6s577yyjvrvkg00hh1wnl8vrv7pbnbr09mk67z9y7s6xhiw3";
|
||||
sha256 = "V2cEOzV/L1zjyQ76zlGyN9CIkq6W8y8Yab4NQi3/Ju4=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatasmota";
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emontnemery";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1xsqrpd0dprjfaa2yrdy1g9n4xyrw6ifnzkrh3sq5fx0yfmxbzqm";
|
||||
sha256 = "sha256-kRTgHFRnhjLM2DhKNy9HDKIsRk+w0AKP+o0hy8w+3ys=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tmb";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alemuro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0fmwm9dz2mik9zni50wrnw7k9ld4l4w3p92aws6jcrdfxfi7aq7p";
|
||||
sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix,
|
||||
nix-prefetch-git }:
|
||||
nix-prefetch-git, fetchpatch }:
|
||||
|
||||
buildRubyGem rec {
|
||||
inherit (bundler) ruby;
|
||||
@ -15,6 +15,15 @@ buildRubyGem rec {
|
||||
sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# write trailing newline to gemset.nix
|
||||
# https://github.com/nix-community/bundix/pull/78
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nix-community/bundix/commit/02ca7a6c656a1e5e5465ad78b31040d82ae1a7e6.patch";
|
||||
sha256 = "18r30icv7r79dlmxz1d1qlk5b6c7r257x23sqav55yhfail9hqrb";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ ruby bundler ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, jre, makeWrapper
|
||||
, mysqlSupport ? true, mysql_jdbc ? null }:
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper
|
||||
, mysqlSupport ? true, mysql_jdbc
|
||||
, postgresqlSupport ? true, postgresql_jdbc }:
|
||||
|
||||
assert mysqlSupport -> mysql_jdbc != null;
|
||||
|
||||
with stdenv.lib;
|
||||
let
|
||||
extraJars = optional mysqlSupport mysql_jdbc;
|
||||
extraJars =
|
||||
lib.optional mysqlSupport mysql_jdbc
|
||||
++ lib.optional postgresqlSupport postgresql_jdbc;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -47,15 +47,15 @@ stdenv.mkDerivation rec {
|
||||
# taken from the executable script in the source
|
||||
CP="$out/liquibase.jar"
|
||||
${addJars "$out/lib"}
|
||||
${concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}
|
||||
${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}
|
||||
|
||||
${getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \
|
||||
${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \
|
||||
liquibase.integration.commandline.Main \''${1+"\$@"}
|
||||
EOF
|
||||
chmod +x $out/bin/liquibase
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Version Control for your database";
|
||||
homepage = "https://www.liquibase.org/";
|
||||
changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt";
|
||||
|
||||
@ -40,5 +40,13 @@ rec {
|
||||
version = "0.15.0";
|
||||
};
|
||||
|
||||
ocamlformat = ocamlformat_0_15_0;
|
||||
ocamlformat_0_15_1 = mkOCamlformat {
|
||||
version = "0.15.1";
|
||||
};
|
||||
|
||||
ocamlformat_0_16_0 = mkOCamlformat {
|
||||
version = "0.16.0";
|
||||
};
|
||||
|
||||
ocamlformat = ocamlformat_0_16_0;
|
||||
}
|
||||
|
||||
@ -18,6 +18,8 @@ let src =
|
||||
"0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz";
|
||||
"0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl";
|
||||
"0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
|
||||
"0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
|
||||
"0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
|
||||
}."${version}";
|
||||
}
|
||||
; in
|
||||
@ -39,7 +41,23 @@ buildDunePackage rec {
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs =
|
||||
if lib.versionAtLeast version "0.14"
|
||||
if lib.versionAtLeast version "0.15.1"
|
||||
then [
|
||||
base
|
||||
cmdliner
|
||||
fpath
|
||||
odoc
|
||||
re
|
||||
stdio
|
||||
uuseg
|
||||
uutf
|
||||
fix
|
||||
menhir
|
||||
(ppxlib.override { version = "0.18.0"; })
|
||||
dune-build-info # lib.versionAtLeast version "0.16.0"
|
||||
ocaml-version # lib.versionAtLeast version "0.16.0"
|
||||
]
|
||||
else if lib.versionAtLeast version "0.14"
|
||||
then [
|
||||
base
|
||||
cmdliner
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-cache";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthiaskrgr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi";
|
||||
sha256 = "sha256-SqhGwm2VZW6ZUYyxN940fi/YLJGAZikjJCIq0GbljtY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw";
|
||||
cargoSha256 = "sha256-sZxkEQBZ2PJXSvwcA+IL7uW/gcnzuzRcDklNW5vpzWg=";
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
||||
59
pkgs/games/unciv/default.nix
Normal file
59
pkgs/games/unciv/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, jre
|
||||
, libpulseaudio
|
||||
, libXxf86vm
|
||||
}:
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "unciv";
|
||||
exec = "unciv";
|
||||
comment = "An open-source Android/Desktop remake of Civ V";
|
||||
desktopName = "Unciv";
|
||||
categories = "Game;";
|
||||
};
|
||||
|
||||
envLibPath = lib.makeLibraryPath [
|
||||
libpulseaudio
|
||||
libXxf86vm
|
||||
];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "3.12.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/unciv \
|
||||
--prefix LD_LIBRARY_PATH : ${envLibPath} \
|
||||
--prefix PATH : ${lib.makeBinPath [ jre ]} \
|
||||
--add-flags "-jar ${src}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source Android/Desktop remake of Civ V";
|
||||
homepage = "https://github.com/yairm210/Unciv";
|
||||
maintainers = with maintainers; [ tex ];
|
||||
license = licenses.mpl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -345,6 +345,18 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
mikestead.dotenv = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "dotenv";
|
||||
publisher = "mikestead";
|
||||
version = "1.0.1";
|
||||
sha256 = "sha256-dieCzNOIcZiTGu4Mv5zYlG7jLhaEsJR05qbzzzQ7RWc=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
mskelton.one-dark-theme = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "one-dark-theme";
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, installShellFiles
|
||||
, asciidoc
|
||||
, pkg-config
|
||||
, libxslt
|
||||
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
installShellFiles
|
||||
asciidoc
|
||||
pkg-config
|
||||
libxslt # xsltproc
|
||||
@ -66,6 +68,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name usbguard.bash scripts/bash_completion/usbguard
|
||||
installShellCompletion --zsh --name _usbguard scripts/usbguard-zsh-completion
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The USBGuard software framework helps to protect your computer against BadUSB";
|
||||
longDescription = ''
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
"asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
|
||||
"asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt
|
||||
"atag" = ps: with ps; [ ]; # missing inputs: pyatag
|
||||
"aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu
|
||||
"aten_pe" = ps: with ps; [ atenpdu ];
|
||||
"atome" = ps: with ps; [ ]; # missing inputs: pyatome
|
||||
"august" = ps: with ps; [ ]; # missing inputs: py-august
|
||||
"aurora" = ps: with ps; [ ]; # missing inputs: auroranoaa
|
||||
|
||||
@ -33,5 +33,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://sourceforge.net/projects/lprof";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
broken = true; # Broken since 2020-07-28 (https://hydra.nixos.org/build/135234622)
|
||||
};
|
||||
}
|
||||
|
||||
32
pkgs/tools/misc/sfeed/default.nix
Normal file
32
pkgs/tools/misc/sfeed/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv, lib, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sfeed";
|
||||
version = "0.9.20";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.codemadness.org/sfeed";
|
||||
rev = version;
|
||||
sha256 = "17bs31wns71fx7s06rdzqkghkgv86r9d9i3814rznyzi9484c7aq";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
make install PREFIX=$out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://codemadness.org/sfeed-simple-feed-parser.html";
|
||||
description = "A RSS and Atom parser (and some format programs)";
|
||||
longDescription = ''
|
||||
It converts RSS or Atom feeds from XML to a TAB-separated file. There are
|
||||
formatting programs included to convert this TAB-separated format to
|
||||
various other formats. There are also some programs and scripts included
|
||||
to import and export OPML and to fetch, filter, merge and order feed
|
||||
items.
|
||||
'';
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,28 +1,34 @@
|
||||
{ lib, stdenv, fetchurl, jdk11, runtimeShell }:
|
||||
{ lib, stdenv, fetchurl, jdk11, runtimeShell, unzip, chromium }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "burpsuite";
|
||||
version = "2020.12.1";
|
||||
jar = fetchurl {
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
|
||||
sha256 = "1vdxwasvcyxyyidq3cfjphzkir358sxikgvxgl36czylap4hzjh1";
|
||||
sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0=";
|
||||
};
|
||||
launcher = ''
|
||||
#!${runtimeShell}
|
||||
exec ${jdk11}/bin/java -jar ${jar} "$@"
|
||||
'';
|
||||
in stdenv.mkDerivation {
|
||||
pname = "burpsuite";
|
||||
inherit version;
|
||||
buildCommand = ''
|
||||
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
echo "${launcher}" > $out/bin/burpsuite
|
||||
echo '#!${runtimeShell}
|
||||
eval "$(${unzip}/bin/unzip -p ${src} chromium.properties)"
|
||||
mkdir -p "$HOME/.BurpSuite/burpbrowser/$linux64"
|
||||
ln -sf "${chromium}/bin/chromium" "$HOME/.BurpSuite/burpbrowser/$linux64/chrome"
|
||||
exec ${jdk11}/bin/java -jar ${src} "$@"' > $out/bin/burpsuite
|
||||
chmod +x $out/bin/burpsuite
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "An integrated platform for performing security testing of web applications";
|
||||
longDescription = ''
|
||||
Burp Suite is an integrated platform for performing security testing of web applications.
|
||||
@ -32,9 +38,9 @@ in stdenv.mkDerivation {
|
||||
'';
|
||||
homepage = "https://portswigger.net/burp/";
|
||||
downloadPage = "https://portswigger.net/burp/freedownload";
|
||||
license = [ lib.licenses.unfree ];
|
||||
license = licenses.unfree;
|
||||
platforms = jdk11.meta.platforms;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with lib.maintainers; [ bennofs ];
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9-3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
|
||||
hash = "sha256-XAeWcGy1moFp1v0djYwYwKlzdX0UA8cqwtTNWBKLazc=";
|
||||
hash = "sha256-REuES0yTjTsBHapmj1YLCTIq2cIVtr7Z8ZiEgMCrwrs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -7663,6 +7663,8 @@ in
|
||||
|
||||
sewer = callPackage ../tools/admin/sewer { };
|
||||
|
||||
sfeed = callPackage ../tools/misc/sfeed { };
|
||||
|
||||
sftpman = callPackage ../tools/filesystems/sftpman { };
|
||||
|
||||
screenfetch = callPackage ../tools/misc/screenfetch { };
|
||||
@ -10492,7 +10494,8 @@ in
|
||||
inherit (callPackage ../development/tools/ocaml/ocamlformat { })
|
||||
ocamlformat # latest version
|
||||
ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
|
||||
ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0;
|
||||
ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
|
||||
ocamlformat_0_15_1 ocamlformat_0_16_0;
|
||||
|
||||
orc = callPackage ../development/compilers/orc { };
|
||||
|
||||
@ -21444,6 +21447,8 @@ in
|
||||
|
||||
afterburn = callPackage ../tools/admin/afterburn {};
|
||||
|
||||
docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
|
||||
|
||||
amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
|
||||
|
||||
docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { };
|
||||
@ -26969,6 +26974,8 @@ in
|
||||
ffmpeg = ffmpeg_2;
|
||||
};
|
||||
|
||||
unciv = callPackage ../games/unciv { };
|
||||
|
||||
unnethack = callPackage ../games/unnethack { };
|
||||
|
||||
uqm = callPackage ../games/uqm { };
|
||||
|
||||
@ -285,6 +285,8 @@ let
|
||||
|
||||
encore = callPackage ../development/ocaml-modules/encore { };
|
||||
|
||||
emile = callPackage ../development/ocaml-modules/emile { };
|
||||
|
||||
enumerate = callPackage ../development/ocaml-modules/enumerate { };
|
||||
|
||||
eqaf = callPackage ../development/ocaml-modules/eqaf { };
|
||||
@ -361,6 +363,8 @@ let
|
||||
|
||||
hmap = callPackage ../development/ocaml-modules/hmap { };
|
||||
|
||||
hxd = callPackage ../development/ocaml-modules/hxd { };
|
||||
|
||||
imagelib = callPackage ../development/ocaml-modules/imagelib { };
|
||||
|
||||
imagelib-unix = callPackage ../development/ocaml-modules/imagelib/unix.nix { };
|
||||
@ -845,6 +849,8 @@ let
|
||||
|
||||
pcap-format = callPackage ../development/ocaml-modules/pcap-format { };
|
||||
|
||||
pecu = callPackage ../development/ocaml-modules/pecu { };
|
||||
|
||||
pgsolver = callPackage ../development/ocaml-modules/pgsolver { };
|
||||
|
||||
phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };
|
||||
@ -1075,6 +1081,12 @@ let
|
||||
|
||||
webmachine = callPackage ../development/ocaml-modules/webmachine { };
|
||||
|
||||
wodan = callPackage ../development/ocaml-modules/wodan { };
|
||||
|
||||
wodan-irmin = callPackage ../development/ocaml-modules/wodan/irmin.nix { };
|
||||
|
||||
wodan-unix = callPackage ../development/ocaml-modules/wodan/unix.nix { };
|
||||
|
||||
wtf8 = callPackage ../development/ocaml-modules/wtf8 { };
|
||||
|
||||
x509 = callPackage ../development/ocaml-modules/x509 { };
|
||||
|
||||
@ -492,6 +492,8 @@ in {
|
||||
|
||||
asysocks = callPackage ../development/python-modules/asysocks { };
|
||||
|
||||
atenpdu = callPackage ../development/python-modules/atenpdu { };
|
||||
|
||||
atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
|
||||
|
||||
atom = callPackage ../development/python-modules/atom { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user