summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs/simple
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/5pkgs/simple')
-rw-r--r--krebs/5pkgs/simple/airdcpp-webclient/default.nix5
-rw-r--r--krebs/5pkgs/simple/cac-api/default.nix6
-rw-r--r--krebs/5pkgs/simple/dic/default.nix6
-rw-r--r--krebs/5pkgs/simple/drivedroid-gen-repo/default.nix6
-rw-r--r--krebs/5pkgs/simple/ergo.nix23
-rw-r--r--krebs/5pkgs/simple/ftb/default.nix4
-rw-r--r--krebs/5pkgs/simple/get/default.nix6
-rw-r--r--krebs/5pkgs/simple/github-hosts-sync/default.nix4
-rw-r--r--krebs/5pkgs/simple/internetarchive/default.nix4
-rw-r--r--krebs/5pkgs/simple/passwdqc-utils/default.nix14
-rw-r--r--krebs/5pkgs/simple/populate/default.nix5
-rw-r--r--krebs/5pkgs/simple/slog/default.nix4
-rw-r--r--krebs/5pkgs/simple/solanum/default.nix62
-rw-r--r--krebs/5pkgs/simple/solanum/dont-create-logdir.patch14
-rw-r--r--krebs/5pkgs/simple/ssh-audit.nix6
-rw-r--r--krebs/5pkgs/simple/tinc_graphs/default.nix4
-rw-r--r--krebs/5pkgs/simple/translate-shell/default.nix10
-rw-r--r--krebs/5pkgs/simple/whatsupnix/default.nix6
18 files changed, 73 insertions, 116 deletions
diff --git a/krebs/5pkgs/simple/airdcpp-webclient/default.nix b/krebs/5pkgs/simple/airdcpp-webclient/default.nix
index 2bc6cdca9..754fecf9c 100644
--- a/krebs/5pkgs/simple/airdcpp-webclient/default.nix
+++ b/krebs/5pkgs/simple/airdcpp-webclient/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, which
+{ fetchurl, lib, makeWrapper, stdenv
+, which
}:
stdenv.mkDerivation rec {
name = "airdcpp-webclient-${version}";
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ makeWrapper ];
- meta = with stdenv.lib; {
+ meta = with lib; {
# to start it: airdcpp -p=<pid-file> -c=<config-store-path (must be writeable)> --configure
description = "dcpp client (statically precompiled)";
homepage = http://fixme;
diff --git a/krebs/5pkgs/simple/cac-api/default.nix b/krebs/5pkgs/simple/cac-api/default.nix
index e2bd8c148..5f37f6682 100644
--- a/krebs/5pkgs/simple/cac-api/default.nix
+++ b/krebs/5pkgs/simple/cac-api/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchgit, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass, ... }:
+{ fetchgit, lib, stdenv
+, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass
+}:
stdenv.mkDerivation {
name = "cac-api-1.1.2";
@@ -18,7 +20,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin
{ cat <<\EOF
#! ${dash}/bin/dash
- export PATH=${stdenv.lib.makeBinPath [
+ export PATH=${lib.makeBinPath [
bc
coreutils
curl
diff --git a/krebs/5pkgs/simple/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix
index a74899630..1825e4ee7 100644
--- a/krebs/5pkgs/simple/dic/default.nix
+++ b/krebs/5pkgs/simple/dic/default.nix
@@ -1,4 +1,6 @@
-{ coreutils, curl, fetchgit, gnugrep, gnused, stdenv, utillinux }:
+{ fetchgit, lib, stdenv
+, coreutils, curl, gnugrep, gnused, utillinux
+}:
stdenv.mkDerivation {
name = "dic";
@@ -16,7 +18,7 @@ stdenv.mkDerivation {
installPhase =
let
- path = stdenv.lib.makeBinPath [
+ path = lib.makeBinPath [
coreutils
curl
gnused
diff --git a/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix b/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
index de8046c4a..dee96d784 100644
--- a/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
+++ b/krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
@@ -1,10 +1,10 @@
-{stdenv,fetchurl,pkgs,python3Packages, ... }:
+{ fetchurl, lib, stdenv, python3Packages }:
python3Packages.buildPythonPackage rec {
name = "drivedroid-gen-repo-${version}";
version = "0.4.4";
- propagatedBuildInputs = with pkgs;[
+ propagatedBuildInputs = [
python3Packages.docopt
];
@@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec {
meta = {
homepage = http://krebsco.de/;
description = "Generate Drivedroid repos";
- license = stdenv.lib.licenses.wtfpl;
+ license = lib.licenses.wtfpl;
};
}
diff --git a/krebs/5pkgs/simple/ergo.nix b/krebs/5pkgs/simple/ergo.nix
new file mode 100644
index 000000000..1c84cb4a6
--- /dev/null
+++ b/krebs/5pkgs/simple/ergo.nix
@@ -0,0 +1,23 @@
+{ buildGo116Module , fetchFromGitHub, lib }:
+
+buildGo116Module rec {
+ pname = "ergo";
+ version = "2.7.0-rc1";
+
+ src = fetchFromGitHub {
+ owner = "ergochat";
+ repo = "ergo";
+ rev = "v${version}";
+ sha256 = "0vdrvr991an6f6zsadpsy0npmb4058b278xgc7rh8vhp12m501b4";
+ };
+
+ vendorSha256 = null;
+
+ meta = {
+ description = "A modern IRC server (daemon/ircd) written in Go";
+ homepage = "https://github.com/ergochat/ergo";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.tv ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/krebs/5pkgs/simple/ftb/default.nix b/krebs/5pkgs/simple/ftb/default.nix
index ab7d6e651..8007eaa52 100644
--- a/krebs/5pkgs/simple/ftb/default.nix
+++ b/krebs/5pkgs/simple/ftb/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl
+{ fetchurl, lib, stdenv
, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
, openjdk
, mesa_glu, openal
, useAlsa ? false, alsaOss ? null }:
-with stdenv.lib;
+with lib;
assert useAlsa -> alsaOss != null;
diff --git a/krebs/5pkgs/simple/get/default.nix b/krebs/5pkgs/simple/get/default.nix
index 83f6b0228..5c024a00d 100644
--- a/krebs/5pkgs/simple/get/default.nix
+++ b/krebs/5pkgs/simple/get/default.nix
@@ -1,4 +1,6 @@
-{ coreutils, gnugrep, gnused, fetchgit, jq, nix, stdenv, ... }:
+{ fetchgit, lib, stdenv
+, coreutils, gnugrep, gnused, jq, nix
+}:
stdenv.mkDerivation {
name = "get-1.4.1";
@@ -16,7 +18,7 @@ stdenv.mkDerivation {
installPhase =
let
- path = stdenv.lib.makeBinPath [
+ path = lib.makeBinPath [
coreutils
gnugrep
gnused
diff --git a/krebs/5pkgs/simple/github-hosts-sync/default.nix b/krebs/5pkgs/simple/github-hosts-sync/default.nix
index fbc48fa3f..60dd58ee7 100644
--- a/krebs/5pkgs/simple/github-hosts-sync/default.nix
+++ b/krebs/5pkgs/simple/github-hosts-sync/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, ... }:
+{ lib, pkgs, stdenv }:
stdenv.mkDerivation rec {
name = "github-hosts-sync-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
installPhase = let
ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
- path = stdenv.lib.makeBinPath [
+ path = lib.makeBinPath [
pkgs.git
pkgs.nettools
pkgs.openssh
diff --git a/krebs/5pkgs/simple/internetarchive/default.nix b/krebs/5pkgs/simple/internetarchive/default.nix
index 3c83093be..dfe93befd 100644
--- a/krebs/5pkgs/simple/internetarchive/default.nix
+++ b/krebs/5pkgs/simple/internetarchive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, ... }:
+{ lib, pkgs, stdenv, pkgs }:
with pkgs.python3Packages;
buildPythonPackage rec {
pname = "internetarchive";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
sed -i "s/'schema.*'/'schema>=0.4.0'/" setup.py
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "python library and cli for uploading files to internet archive";
license = licenses.agpl3;
};
diff --git a/krebs/5pkgs/simple/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix
index 53e7f5482..4cc8d5b21 100644
--- a/krebs/5pkgs/simple/passwdqc-utils/default.nix
+++ b/krebs/5pkgs/simple/passwdqc-utils/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, pam,
- fetchurl, lib,
- wordset-file ? null, # set your own wordset-file
- ... }:
+{ fetchurl, lib, stdenv
+, pam
+, wordset-file ? null, # set your own wordset-file
+}:
stdenv.mkDerivation rec {
name = "passwdqc-utils-${version}";
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
meta = {
description = "passwdqc utils (pwqgen,pwqcheck) and library";
- license = stdenv.lib.licenses.bsd3;
- maintainers = [ stdenv.lib.maintainers.makefu ];
- patforms = stdenv.lib.platforms.linux; # more installFlags must be set for Darwin,Solaris
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.makefu ];
+ patforms = lib.platforms.linux; # more installFlags must be set for Darwin,Solaris
};
}
diff --git a/krebs/5pkgs/simple/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix
index e35423b49..ef9ff04bf 100644
--- a/krebs/5pkgs/simple/populate/default.nix
+++ b/krebs/5pkgs/simple/populate/default.nix
@@ -1,8 +1,9 @@
-{ coreutils, fetchgit, findutils, git, gnused, jq, openssh, pass, rsync, stdenv
+{ fetchgit, lib, stdenv
+, coreutils, findutils, git, gnused, jq, openssh, pass, rsync
}:
let
- PATH = stdenv.lib.makeBinPath [
+ PATH = lib.makeBinPath [
coreutils
findutils
git
diff --git a/krebs/5pkgs/simple/slog/default.nix b/krebs/5pkgs/simple/slog/default.nix
index c74a2ad80..bd10bac5e 100644
--- a/krebs/5pkgs/simple/slog/default.nix
+++ b/krebs/5pkgs/simple/slog/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub }:
+{ fetchFromGitHub, lib, pkgs, stdenv }:
## use with:
# . $(command -v slog.sh)
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
install -m755 slog.sh $out/bin
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "POSIX shell logging";
license = licenses.mit;
};
diff --git a/krebs/5pkgs/simple/solanum/default.nix b/krebs/5pkgs/simple/solanum/default.nix
deleted file mode 100644
index 3fa765c94..000000000
--- a/krebs/5pkgs/simple/solanum/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, pkg-config
-, bison
-, flex
-, openssl
-, sqlite
-, lksctp-tools
-}:
-
-stdenv.mkDerivation rec {
- pname = "solanum";
- version = "unstable-2021-04-27";
-
- src = fetchFromGitHub {
- owner = "solanum-ircd";
- repo = pname;
- rev = "3ff5a12e75662e9a642f2a4364797bd361eb0925";
- sha256 = "14ywmfdv8cncbyg08y2qdis00kwg8lvhkcgj185is67smh0qf88f";
- };
-
- patches = [
- ./dont-create-logdir.patch
- ];
-
- configureFlags = [
- "--enable-epoll"
- "--enable-ipv6"
- "--enable-openssl=${openssl.dev}"
- "--with-program-prefix=solanum-"
- "--localstatedir=/var/lib"
- "--with-rundir=/run"
- "--with-logdir=/var/log"
- ] ++ lib.optionals (stdenv.isLinux) [
- "--enable-sctp=${lksctp-tools.out}/lib"
- ];
-
- nativeBuildInputs = [
- autoreconfHook
- bison
- flex
- pkg-config
- ];
-
- buildInputs = [
- openssl
- sqlite
- ];
-
- doCheck = !stdenv.isDarwin;
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "An IRCd for unified networks";
- homepage = "https://github.com/solanum-ircd/solanum";
- license = licenses.gpl2Only;
- maintainers = with maintainers; [ hexa ];
- platforms = platforms.unix;
- };
-}
diff --git a/krebs/5pkgs/simple/solanum/dont-create-logdir.patch b/krebs/5pkgs/simple/solanum/dont-create-logdir.patch
deleted file mode 100644
index e348dd7b8..000000000
--- a/krebs/5pkgs/simple/solanum/dont-create-logdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 19e7b396..21093521 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -35,9 +35,6 @@ include/serno.h:
- echo '#define DATECODE 0UL' >>include/serno.h; \
- fi
-
--install-data-hook:
-- test -d ${DESTDIR}${logdir} || mkdir -p ${DESTDIR}${logdir}
--
- install-exec-hook:
- rm -f ${DESTDIR}${libdir}/*.la
- rm -f ${DESTDIR}${moduledir}/*.la
diff --git a/krebs/5pkgs/simple/ssh-audit.nix b/krebs/5pkgs/simple/ssh-audit.nix
index 7d2e6fb34..4574eb644 100644
--- a/krebs/5pkgs/simple/ssh-audit.nix
+++ b/krebs/5pkgs/simple/ssh-audit.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, python3Packages, stdenv }:
+{ fetchFromGitHub, lib, python3Packages, stdenv }:
python3Packages.buildPythonPackage rec {
inherit (meta) version;
@@ -46,9 +46,9 @@ python3Packages.buildPythonPackage rec {
meta = {
description = "tool for ssh server auditing";
homepage = "https://github.com/arthepsy/ssh-audit";
- license = stdenv.lib.licenses.mit;
+ license = lib.licenses.mit;
maintainers = [
- stdenv.lib.maintainers.tv
+ lib.maintainers.tv
];
version = "1.7.0";
};
diff --git a/krebs/5pkgs/simple/tinc_graphs/default.nix b/krebs/5pkgs/simple/tinc_graphs/default.nix
index 025e85df0..d281c9b50 100644
--- a/krebs/5pkgs/simple/tinc_graphs/default.nix
+++ b/krebs/5pkgs/simple/tinc_graphs/default.nix
@@ -1,4 +1,4 @@
-{stdenv,fetchurl,pkgs,python3Packages, ... }:
+{ fetchurl, lib, pkgs, python3Packages, stdenv }:
python3Packages.buildPythonPackage rec {
name = "tinc_graphs-${version}";
@@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec {
meta = {
homepage = http://krebsco.de/;
description = "Create Graphs from Tinc Stats";
- license = stdenv.lib.licenses.wtfpl;
+ license = lib.licenses.wtfpl;
};
}
diff --git a/krebs/5pkgs/simple/translate-shell/default.nix b/krebs/5pkgs/simple/translate-shell/default.nix
index 00ab226e5..cd698a2bd 100644
--- a/krebs/5pkgs/simple/translate-shell/default.nix
+++ b/krebs/5pkgs/simple/translate-shell/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl,pkgs,... }:
+{ fetchurl, lib, pkgs, stdenv }:
let
s =
rec {
@@ -8,7 +8,7 @@ let
url=https://github.com/soimort/translate-shell/archive/v0.9.0.9.tar.gz;
sha256="1269j4yr9dr1d8c5kmysbzfplbgdg8apqnzs5w57d29sd7gz2i34";
};
- searchpath = with pkgs; stdenv.lib.makeSearchPath "bin" [
+ searchpath = with pkgs; lib.makeSearchPath "bin" [
fribidi
gawk
bash
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''translate using google api'';
- license = stdenv.lib.licenses.free;
- maintainers = [stdenv.lib.maintainers.makefu];
- platforms = stdenv.lib.platforms.linux ;
+ license = lib.licenses.free;
+ maintainers = [ lib.maintainers.makefu ];
+ platforms = lib.platforms.linux ;
};
}
diff --git a/krebs/5pkgs/simple/whatsupnix/default.nix b/krebs/5pkgs/simple/whatsupnix/default.nix
index 62ef597c8..61972bb05 100644
--- a/krebs/5pkgs/simple/whatsupnix/default.nix
+++ b/krebs/5pkgs/simple/whatsupnix/default.nix
@@ -1,4 +1,6 @@
-{ bash, coreutils, gawk, makeWrapper, nix, openssh, stdenv }:
+{ lib, makeWrapper, stdenv
+, bash, coreutils, gawk, nix, openssh
+}:
stdenv.mkDerivation {
name = "whatsupnix";
@@ -8,7 +10,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin
cat - ${./whatsupnix.bash} > $out/bin/whatsupnix <<\EOF
#! ${bash}/bin/bash
- export PATH=${stdenv.lib.makeBinPath [ coreutils gawk nix openssh ]}
+ export PATH=${lib.makeBinPath [ coreutils gawk nix openssh ]}
EOF
chmod +x $out/bin/whatsupnix
'';
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:41:16 +0000