Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2021-06-03 19:17:58 +02:00
commit 86007337dd
35 changed files with 188 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/2configs/shack/worlddomination.nix
View File

@ -58,7 +58,7 @@ let
src = pkgs.fetchurl { url = "https://pypi.python.org/packages/9c/f6/d839e4b14258d76e74a39810829c13f8dd31de2bfe0915579b2a609d1bbe/aiocoap-0.3.tar.gz"; sha256 = "402d4151db6d8d0b1d66af5b6e10e0de1521decbf12140637e5b8d2aa9c5aef6"; };
propagatedBuildInputs = [ ];
doCheck = false; # 2 errors, dunnolol
meta = with pkgs.stdenv.lib; {
meta = with pkgs.lib; {
homepage = "";
license = licenses.mit;
description = "Python CoAP library";
@ -68,7 +68,7 @@ let
name = "LinkHeader-0.4.3";
src = pkgs.fetchurl { url = "https://files.pythonhosted.org/packages/27/d4/eb1da743b2dc825e936ef1d9e04356b5701e3a9ea022c7aaffdf4f6b0594/LinkHeader-0.4.3.tar.gz"; sha256 = "7fbbc35c0ba3fbbc530571db7e1c886e7db3d718b29b345848ac9686f21b50c3"; };
propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; {
meta = with pkgs.lib; {
homepage = "";
license = licenses.bsdOriginal;
description = "Parse and format link headers according to RFC 5988 \"Web Linking\"";

1
krebs/3modules/exim.nix
View File

@ -78,6 +78,7 @@ in {
inherit (cfg.user) home name uid;
createHome = true;
group = cfg.group.name;
isSystemUser = true;
};
};
};

2
krebs/3modules/git.nix
View File

@ -366,6 +366,7 @@ let
# To allow running cgit-clear-cache via hooks.
cfg.cgit.fcgiwrap.group.name
];
isSystemUser = true;
shell = "/bin/sh";
openssh.authorizedKeys.keys =
unique
@ -384,6 +385,7 @@ let
users.${cfg.cgit.fcgiwrap.user.name} = {
inherit (cfg.cgit.fcgiwrap.user) home name uid;
group = cfg.cgit.fcgiwrap.group.name;
isSystemUser = true;
};
};

1
krebs/3modules/htgen.nix
View File

@ -66,6 +66,7 @@ let
nameValuePair htgen.user.name {
inherit (htgen.user) home name uid;
createHome = true;
isSystemUser = true;
}
) cfg;

1
krebs/3modules/tinc.nix
View File

@ -236,6 +236,7 @@ let
nameValuePair "${netname}" {
inherit (cfg.user) home name uid;
createHome = true;
isSystemUser = true;
}
) config.krebs.tinc;

44
krebs/5pkgs/override/default.nix
View File

@ -11,44 +11,14 @@ self: super: {
});
flameshot = super.flameshot.overrideAttrs (old: rec {
patches = old.patches or [] ++ [
(self.writeText "flameshot-imgur.patch" /* diff */ ''
--- a/src/tools/imgur/imguruploader.cpp
+++ b/src/tools/imgur/imguruploader.cpp
@@ -40,6 +40,7 @@
#include <QTimer>
#include <QJsonDocument>
#include <QJsonObject>
+#include <stdlib.h>
ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) :
QWidget(parent), m_pixmap(capture)
@@ -74,7 +75,10 @@ void ImgurUploader::handleReply(QNetworkReply *reply) {
QJsonObject json = response.object();
QJsonObject data = json["data"].toObject();
m_imageURL.setUrl(data["link"].toString());
- m_deleteImageURL.setUrl(QString("https://imgur.com/delete/%1").arg(
+ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL");
+ if (deleteImageURLPattern == NULL)
+ deleteImageURLPattern = "https://imgur.com/delete/%1";
+ m_deleteImageURL.setUrl(QString(deleteImageURLPattern).arg(
data["deletehash"].toString()));
onUploadOk();
} else {
@@ -105,7 +109,10 @@ void ImgurUploader::upload() {
QString description = FileNameHandler().parsedPattern();
urlQuery.addQueryItem("description", description);
- QUrl url("https://api.imgur.com/3/image");
+ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL");
+ if (createImageURLPattern == NULL)
+ createImageURLPattern = "https://api.imgur.com/3/image";
+ QUrl url(createImageURLPattern);
url.setQuery(urlQuery);
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader,
'')
patches = old.patches or [] ++ {
"0.6.0" = [
./flameshot/flameshot_imgur_0.6.0.patch
];
"0.9.0" = [
./flameshot/flameshot_imgur_0.9.0.patch
];
}.${old.version};
});
# https://github.com/proot-me/PRoot/issues/106

34
krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch Normal file
View File

@ -0,0 +1,34 @@
--- a/src/tools/imgur/imguruploader.cpp
+++ b/src/tools/imgur/imguruploader.cpp
@@ -40,6 +40,7 @@
#include <QTimer>
#include <QJsonDocument>
#include <QJsonObject>
+#include <stdlib.h>
ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) :
QWidget(parent), m_pixmap(capture)
@@ -74,7 +75,10 @@ void ImgurUploader::handleReply(QNetworkReply *reply) {
QJsonObject json = response.object();
QJsonObject data = json["data"].toObject();
m_imageURL.setUrl(data["link"].toString());
- m_deleteImageURL.setUrl(QString("https://imgur.com/delete/%1").arg(
+ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL");
+ if (deleteImageURLPattern == NULL)
+ deleteImageURLPattern = "https://imgur.com/delete/%1";
+ m_deleteImageURL.setUrl(QString(deleteImageURLPattern).arg(
data["deletehash"].toString()));
onUploadOk();
} else {
@@ -105,7 +109,10 @@ void ImgurUploader::upload() {
QString description = FileNameHandler().parsedPattern();
urlQuery.addQueryItem("description", description);
- QUrl url("https://api.imgur.com/3/image");
+ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL");
+ if (createImageURLPattern == NULL)
+ createImageURLPattern = "https://api.imgur.com/3/image";
+ QUrl url(createImageURLPattern);
url.setQuery(urlQuery);
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader,

35
krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch Normal file
View File

@ -0,0 +1,35 @@
--- a/src/tools/imgur/imguruploader.cpp
+++ b/src/tools/imgur/imguruploader.cpp
@@ -31,6 +31,7 @@
#include <QTimer>
#include <QUrlQuery>
#include <QVBoxLayout>
+#include <stdlib.h>
ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent)
: QWidget(parent)
@@ -79,8 +80,11 @@ void ImgurUploader::handleReply(QNetworkReply* reply)
m_imageURL.setUrl(data[QStringLiteral("link")].toString());
auto deleteToken = data[QStringLiteral("deletehash")].toString();
+ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL");
+ if (deleteImageURLPattern == NULL)
+ deleteImageURLPattern = "https://imgur.com/delete/%1";
m_deleteImageURL.setUrl(
- QStringLiteral("https://imgur.com/delete/%1").arg(deleteToken));
+ QString::fromUtf8(deleteImageURLPattern).arg(deleteToken));
// save history
QString imageName = m_imageURL.toString();
@@ -133,7 +137,10 @@ void ImgurUploader::upload()
QString description = FileNameHandler().parsedPattern();
urlQuery.addQueryItem(QStringLiteral("description"), description);
- QUrl url(QStringLiteral("https://api.imgur.com/3/image"));
+ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL");
+ if (createImageURLPattern == NULL)
+ createImageURLPattern = "https://api.imgur.com/3/image";
+ QUrl url(QString::fromUtf8(createImageURLPattern));
url.setQuery(urlQuery);
QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader,

5
krebs/5pkgs/simple/airdcpp-webclient/default.nix
View File

@ -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;

6
krebs/5pkgs/simple/cac-api/default.nix
View File

@ -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

6
krebs/5pkgs/simple/dic/default.nix
View File

@ -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

6
krebs/5pkgs/simple/drivedroid-gen-repo/default.nix
View File

@ -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;
};
}

4
krebs/5pkgs/simple/ftb/default.nix
View File

@ -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;

6
krebs/5pkgs/simple/get/default.nix
View File

@ -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

4
krebs/5pkgs/simple/github-hosts-sync/default.nix
View File

@ -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

4
krebs/5pkgs/simple/internetarchive/default.nix
View File

@ -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;
};

14
krebs/5pkgs/simple/passwdqc-utils/default.nix
View File

@ -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
};
}

5
krebs/5pkgs/simple/populate/default.nix
View File

@ -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

4
krebs/5pkgs/simple/slog/default.nix
View File

@ -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;
};

6
krebs/5pkgs/simple/ssh-audit.nix
View File

@ -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";
};

4
krebs/5pkgs/simple/tinc_graphs/default.nix
View File

@ -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;
};
}

10
krebs/5pkgs/simple/translate-shell/default.nix
View File

@ -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 ;
};
}

6
krebs/5pkgs/simple/whatsupnix/default.nix
View File

@ -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
'';

10
krebs/5pkgs/test/infest-cac-centos7/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, coreutils, makeWrapper,
cac-api, cac-cert, cac-panel, gnumake, gnused, jq, openssh, sshpass, proot,
... }:
{ lib, makeWrapper, stdenv
, cac-api, cac-cert, cac-panel, coreutils, gnumake, gnused, jq, openssh, proot, sshpass
}:
stdenv.mkDerivation rec {
name = "${shortname}-${version}";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
path = stdenv.lib.makeSearchPath "bin" [
path = lib.makeSearchPath "bin" [
coreutils
cac-api
cac-panel
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
--set REQUESTS_CA_BUNDLE ${cac-cert} \
--set SSL_CERT_FILE ${cac-cert}
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://krebsco.de;
description = "infest a CaC box with stockholm";
license = licenses.wtfpl;

1
tv/2configs/default.nix
View File

@ -38,7 +38,6 @@ with import <stockholm/lib>;
}
{
i18n.defaultLocale = mkDefault "C.UTF-8";
security.hideProcessInformation = true;
security.sudo.extraConfig = ''
Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE"
Defaults mailto="${config.krebs.users.tv.mail}"

2
tv/2configs/gitrepos.nix
View File

@ -33,7 +33,7 @@ let {
cgit = {
settings = {
about-filter = pkgs.exec "krebs.cgit.about-filter" rec {
filename = "${pkgs.pythonPackages.markdown2}/bin/markdown2";
filename = "${pkgs.python3Packages.markdown2}/bin/markdown2";
argv = [
filename
"--extras=fenced-code-blocks"

1
tv/2configs/pulse.nix
View File

@ -116,6 +116,7 @@ in
group = "pulse";
extraGroups = [ "audio" ];
home = "${runDir}/home";
isSystemUser = true;
};
};
}

8
tv/5pkgs/override/default.nix
View File

@ -4,14 +4,16 @@ self: super: {
# XXX cannot use `patches` because fzf has a custom patchPhase
patchPhase = ''
patch -Np1 < ${./fzf.complete1.patch}
${old.patchPhase}
${old.patchPhase or ""}
'';
});
input-fonts = super.input-fonts.overrideAttrs (old: rec {
src = self.fetchurl {
src = self.fetchzip {
url = "http://xu.r/~tv/mirrors/input-fonts/Input-Font-2.zip";
sha256 = "1vvipqcflz4ximy7xpqy9idrdpq3a0c490hp5137r2dq03h865y0";
sha256 = "1q58x92nm7dk9ylp09pvgj74nxkywvqny3xmfighnsl30dv42fcr";
stripRoot = false;
};
sourceRoot = null;
outputHash = null;
outputHashAlgo = null;
outputHashMode = null;

4
tv/5pkgs/rpi/433Utils/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv
{ fetchFromGitHub, lib, stdenv
, wiringPi ? WiringPi.wiringPi
, wiringPiDev ? WiringPi.wiringPiDev
, WiringPi ? rpiPackages.WiringPi
@ -9,7 +9,7 @@ stdenv.mkDerivation {
pname = "433Utils-RPi_utils";
version = "2018-06-07";
src = fetchFromGitHub (stdenv.lib.importJSON ./src.json);
src = fetchFromGitHub (lib.importJSON ./src.json);
patches = [
./rc-switch.protocols.patch

4
tv/5pkgs/rpi/WiringPi/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, runCommand, stdenv }:
{ fetchFromGitHub, lib, runCommand, stdenv }:
let
generic = name: extraAttrs:
@ -6,7 +6,7 @@ let
pname = "WiringPi-${name}";
version = "2020-09-14";
src = fetchFromGitHub (stdenv.lib.importJSON ./src.json);
src = fetchFromGitHub (lib.importJSON ./src.json);
buildPhase = ''
runHook postBuild

6
tv/5pkgs/simple/diff-so-fancy.nix
View File

@ -1,4 +1,6 @@
{stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}:
{ fetchFromGitHub, lib, stdenv
, coreutils, git, makeWrapper, ncurses, perl
}:
stdenv.mkDerivation rec {
name = "diff-so-fancy-${version}";
@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
--prefix PATH : "${ncurses.out}/bin"
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://github.com/so-fancy/diff-so-fancy;
description = "Good-looking diffs filter for git";
license = licenses.mit;

9
tv/5pkgs/simple/fzmenu/default.nix
View File

@ -1,4 +1,7 @@
{ coreutils, dash, gnused, fzf, pass-otp, runCommand, rxvt_unicode, stdenv, utillinux, xdotool }:
{ lib, stdenv
, runCommand
, coreutils, dash, gnused, fzf, pass-otp, rxvt_unicode, utillinux, xdotool
}:
runCommand "fzmenu" {
} /* sh */ ''
@ -8,7 +11,7 @@ runCommand "fzmenu" {
substituteInPlace $out/bin/otpmenu \
--replace '#! /bin/sh' '#! ${dash}/bin/dash' \
--replace '#PATH=' PATH=${stdenv.lib.makeBinPath [
--replace '#PATH=' PATH=${lib.makeBinPath [
coreutils
dash
fzf
@ -21,7 +24,7 @@ runCommand "fzmenu" {
substituteInPlace $out/bin/passmenu \
--replace '#! /bin/sh' '#! ${dash}/bin/dash' \
--replace '#PATH=' PATH=${stdenv.lib.makeBinPath [
--replace '#PATH=' PATH=${lib.makeBinPath [
coreutils
dash
fzf

6
tv/5pkgs/simple/hc.nix
View File

@ -1,4 +1,6 @@
{ coreutils, fetchgit, findutils, gawk, gnugrep, makeWrapper, qrencode, stdenv, texlive, utillinux, zbar }:
{ fetchgit, lib, makeWrapper, stdenv
, coreutils, findutils, gawk, gnugrep, qrencode, texlive, utillinux, zbar
}:
stdenv.mkDerivation rec {
name = "hc-${meta.version}";
@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
cp $src/bin/hc $out/bin/hc
wrapProgram $out/bin/hc \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils
findutils
gawk

5
tv/5pkgs/simple/rox-filer.nix
View File

@ -1,4 +1,5 @@
{ autoconf, stdenv, fetchFromGitLab, pkgconfig, libxml2, libSM, shared-mime-info
{ fetchFromGitLab, lib, stdenv
, autoconf, pkgconfig, libxml2, libSM, shared-mime-info
, libxslt, docbook_xml_dtd_412, docbook_xsl
, gtk ? gtk2, gtk2
}:
@ -84,7 +85,7 @@ stdenv.mkDerivation {
ln -sv application-{msword,rtf}.png
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Fast, lightweight, gtk2 file manager";
homepage = "http://rox.sourceforge.net/desktop";
license = with licenses; [ gpl2 lgpl2 ];

40
tv/5pkgs/simple/utsushi.nix
View File

@ -1,4 +1,6 @@
{ boost, fetchurl, file, imagemagick, libudev, libusb, pkgconfig, stdenv
{ fetchurl, lib, stdenv
, boost, file, imagemagick, libudev, libusb, pkgconfig
, coreutils, dash, patchelf, writeScriptBin # for add-rpath
, guiSupport ? false, gtkmm2 ? null
@ -81,7 +83,7 @@ let
preFixup = ''
patchelf --set-interpreter \
${stdenv.glibc}/lib/ld-linux${stdenv.lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \
${stdenv.glibc}/lib/ld-linux${lib.optionalString stdenv.is64bit "-x86-64"}.so.2 \
$out/lib/utsushi/networkscan
# libstdc++.so.6
@ -96,9 +98,9 @@ let
Image Scan v3 scanner driver bundle, which can be used by Utsushi.
'';
homepage = "http://support.epson.net/linux/en/imagescanv3.php?version=${version}";
license = stdenv.lib.licenses.eapl;
maintainers = [ stdenv.lib.maintainers.tv ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.eapl;
maintainers = [ lib.maintainers.tv ];
platforms = lib.platforms.linux;
};
};
@ -129,7 +131,7 @@ stdenv.mkDerivation rec {
# Allow configuration to be done via /etc/utsushi.conf
ln -s /etc/utsushi.conf $out/etc/utsushi/utsushi.conf
${stdenv.lib.optionalString saneSupport ''
${lib.optionalString saneSupport ''
# Make this package compatible with hardware.sane.extraBackends
mkdir $out/etc/sane.d
echo utsushi > $out/etc/sane.d/dll.conf
@ -137,7 +139,7 @@ stdenv.mkDerivation rec {
ln -s $out/lib/utsushi/sane/libsane-utsushi.* $out/lib/sane
''}
${stdenv.lib.optionalString networkSupport ''
${lib.optionalString networkSupport ''
ln -s ${imagescan-plugin-networkscan}/lib/utsushi/networkscan \
$out/libexec/utsushi/
''}
@ -151,7 +153,7 @@ stdenv.mkDerivation rec {
#
preFixup = ''
add-rpath ${boost}/lib $out/lib/utsushi/libdrv-esci.so
${stdenv.lib.optionalString saneSupport ''
${lib.optionalString saneSupport ''
add-rpath ${boost}/lib $out/lib/utsushi/sane/libsane-utsushi.so
''}
'';
@ -167,10 +169,10 @@ stdenv.mkDerivation rec {
libudev
libusb
]
++ stdenv.lib.optional guiSupport gtkmm2
++ stdenv.lib.optional ocrSupport tesseract
++ stdenv.lib.optional saneSupport saneBackends
++ stdenv.lib.optional tiffSupport libtiff
++ lib.optional guiSupport gtkmm2
++ lib.optional ocrSupport tesseract
++ lib.optional saneSupport saneBackends
++ lib.optional tiffSupport libtiff
;
NIX_CFLAGS_COMPILE = [
@ -184,16 +186,16 @@ stdenv.mkDerivation rec {
"--with-magick-pp"
"--with-udev-confdir=$(out)/etc/udev"
]
++ stdenv.lib.optionals guiSupport [
++ lib.optionals guiSupport [
"--with-gtkmm"
]
++ stdenv.lib.optionals jpegSupport [
++ lib.optionals jpegSupport [
"--with-jpeg"
]
++ stdenv.lib.optionals saneSupport [
++ lib.optionals saneSupport [
"--with-sane"
]
++ stdenv.lib.optionals tiffSupport [
++ lib.optionals tiffSupport [
"--with-tiff"
]
;
@ -210,8 +212,8 @@ stdenv.mkDerivation rec {
around the SANE standard.
'';
homepage = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.tv ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.tv ];
platforms = lib.platforms.linux;
};
}