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

ma pkgs: stdenv.lib -> lib

Browse Source
This commit is contained in:
makefu 2021-12-04 21:24:48 +01:00
parent 4f500d5006
commit 7ca789f598
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
20 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefu/5pkgs/beef/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, bundlerEnv, ruby, fetchFromGitHub, nodejs }: { stdenv, lib, bundlerEnv, ruby, fetchFromGitHub, nodejs }:
# nix-shell --command "bundler install && bundix" in the clone, copy gemset.nix, Gemfile and Gemfile.lock # nix-shell --command "bundler install && bundix" in the clone, copy gemset.nix, Gemfile and Gemfile.lock
let let
gems = bundlerEnv { gems = bundlerEnv {
@ -35,7 +35,7 @@ EOF
chmod +x $bin chmod +x $bin
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = https://beefproject.com/; homepage = https://beefproject.com/;
description = "The Browser Exploitation Framework"; description = "The Browser Exploitation Framework";
platforms = platforms.linux; platforms = platforms.linux;

4
makefu/5pkgs/bintray-upload/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, ... }:
pkgs.python3Packages.buildPythonPackage rec { pkgs.python3Packages.buildPythonPackage rec {
name = "bintray-upload-${version}"; name = "bintray-upload-${version}";
@ -14,6 +14,6 @@ pkgs.python3Packages.buildPythonPackage rec {
meta = { meta = {
description = "Simple BinTray utility for uploading packages"; description = "Simple BinTray utility for uploading packages";
license = pkgs.stdenv.lib.licenses.asl20; license = lib.licenses.asl20;
}; };
} }

8
makefu/5pkgs/cmpforopenssl/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, buildPackages, perl, fetchgit { stdenv, lib, fetchurl, buildPackages, perl, fetchgit
, hostPlatform , hostPlatform
}: }:
with stdenv.lib; with lib;
let let
@ -70,8 +70,8 @@ let
meta = { meta = {
homepage = https://sourceforge.net/p/cmpforopenssl ; homepage = https://sourceforge.net/p/cmpforopenssl ;
description = "A cryptographic library that implements the SSL and TLS protocols"; description = "A cryptographic library that implements the SSL and TLS protocols";
platforms = stdenv.lib.platforms.all; platforms = lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.makefu ]; maintainers = [ lib.maintainers.makefu ];
priority = 0; # resolves collision with ‘man-pages’ priority = 0; # resolves collision with ‘man-pages’
}; };
}; };

6
makefu/5pkgs/custom/alsa-tools/default.nix
View File

@ -1,4 +1,4 @@
{stdenv,alsaToolTarget,fetchurl, alsaLib, ncurses, fltk13, gtk3}: {stdenv, lib, alsaToolTarget,fetchurl, alsaLib, ncurses, fltk13, gtk3}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "alsa-${alsaToolTarget}-${version}"; name = "alsa-${alsaToolTarget}-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://www.alsa-project.org/; homepage = http://www.alsa-project.org/;
description = "ALSA tools - ${name}"; description = "ALSA tools - ${name}";
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.makefu ]; maintainers = [ lib.maintainers.makefu ];
}; };
} }

12
makefu/5pkgs/custom/qcma/default.nix
View File

@ -22,9 +22,9 @@ let
meta = { meta = {
description = "Content Manager Assistant for the PS Vita"; description = "Content Manager Assistant for the PS Vita";
homepage = https://github.com/codestation/qcma; homepage = https://github.com/codestation/qcma;
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ makefu ]; maintainers = with lib.maintainers; [ makefu ];
}; };
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -50,8 +50,8 @@ in stdenv.mkDerivation rec {
meta = { meta = {
description = "Content Manager Assistant for the PS Vita"; description = "Content Manager Assistant for the PS Vita";
homepage = https://github.com/codestation/qcma; homepage = https://github.com/codestation/qcma;
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ makefu ]; maintainers = with lib.maintainers; [ makefu ];
}; };
} }

8
makefu/5pkgs/debmirror/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgs, fetchgit }: { stdenv, lib, pkgs, fetchgit }:
pkgs.perlPackages.buildPerlPackage rec { pkgs.perlPackages.buildPerlPackage rec {
pname = "debmirror"; pname = "debmirror";
@ -34,8 +34,8 @@ pkgs.perlPackages.buildPerlPackage rec {
meta = { meta = {
description = "mirror apt repos"; description = "mirror apt repos";
homepage = https://tracker.debian.org/pkg/debmirror; homepage = https://tracker.debian.org/pkg/debmirror;
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ makefu ]; maintainers = with lib.maintainers; [ makefu ];
}; };
} }

4
makefu/5pkgs/default.nix
View File

@ -20,12 +20,12 @@ with super.lib; with builtins; let
(filterAttrs (_: eq "directory") (readDir path)); (filterAttrs (_: eq "directory") (readDir path));
in { in {
quodlibet = super.pkgs.stdenv.lib.overrideDerivation super.quodlibet (old: { quodlibet = super.pkgs.lib.overrideDerivation super.quodlibet (old: {
doCheck = false; # 1 error because of warnings (possibly upstream) doCheck = false; # 1 error because of warnings (possibly upstream)
patches = [ ./custom/quodlibet/single-digit-discnumber.patch patches = [ ./custom/quodlibet/single-digit-discnumber.patch
./custom/quodlibet/remove-override-warning.patch ]; ./custom/quodlibet/remove-override-warning.patch ];
}); });
#rclone = super.pkgs.stdenv.lib.overrideDerivation super.rclone (old: { #rclone = super.pkgs.lib.overrideDerivation super.rclone (old: {
# postInstall = old.postInstall + '' # postInstall = old.postInstall + ''
# $out/bin/rclone genautocomplete zsh _rclone # $out/bin/rclone genautocomplete zsh _rclone

2
makefu/5pkgs/devpi/default.nix
View File

@ -1,5 +1,5 @@
{ pkgs ? import <nixpkgs> {} }: { pkgs ? import <nixpkgs> {} }:
with pkgs.stdenv.lib; with pkgs.lib;
let let
readme-renderer = pkgs.python3Packages.buildPythonPackage rec { readme-renderer = pkgs.python3Packages.buildPythonPackage rec {

4
makefu/5pkgs/gen-oath-safe/default.nix
View File

@ -1,4 +1,4 @@
{ coreutils, makeWrapper, openssl, libcaca, qrencode, fetchFromGitHub, yubikey-manager, python, stdenv, ... }: { coreutils, makeWrapper, openssl, libcaca, qrencode, fetchFromGitHub, yubikey-manager, python, stdenv, lib, ... }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gen-oath-safe-2017-06-30"; name = "gen-oath-safe-2017-06-30";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
installPhase = installPhase =
let let
path = stdenv.lib.makeBinPath [ path = lib.makeBinPath [
coreutils coreutils
openssl openssl
qrencode qrencode

6
makefu/5pkgs/kalauerbot/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, python3, fetchgit }: { stdenv, lib, python3, fetchgit }:
python3.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
name = "kalauerbot"; name = "kalauerbot";
rev = "f244b35"; rev = "f244b35";
@ -9,12 +9,12 @@ rev = "f244b35";
}; };
propagatedBuildInputs = with python3.pkgs;[ propagatedBuildInputs = with python3.pkgs;[
(callPackage ./python-matrixbot.nix { (callPackage ./python-matrixbot.nix {
matrix-client = (stdenv.lib.overrideDerivation matrix-client (self: { matrix-client = (lib.overrideDerivation matrix-client (self: {
patches = [ ./badsync.patch ]; patches = [ ./badsync.patch ];
})); }));
}) })
(stdenv.lib.overrideDerivation googletrans (self: { (lib.overrideDerivation googletrans (self: {
patches = [ ./translate.patch ]; patches = [ ./translate.patch ];
})) }))
]; ];

4
makefu/5pkgs/logstash-input-rss/default.nix
View File

@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "logstash output plugin"; description = "logstash output plugin";
homepage = https://github.com/logstash-plugins/logstash-input-rss; homepage = https://github.com/logstash-plugins/logstash-input-rss;
license = stdenv.lib.licenses.asl20; license = lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = with maintainers; [ makefu ]; maintainers = with maintainers; [ makefu ];
}; };
} }

4
makefu/5pkgs/logstash-output-exec/default.nix
View File

@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "logstash output plugin"; description = "logstash output plugin";
homepage = https://github.com/logstash-plugins/logstash-output-exec; homepage = https://github.com/logstash-plugins/logstash-output-exec;
license = stdenv.lib.licenses.asl20; license = lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = with maintainers; [ makefu ]; maintainers = with maintainers; [ makefu ];
}; };
} }

6
makefu/5pkgs/novnc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgs }: { stdenv, lib, fetchurl, pkgs }:
# source: https://github.com/hyphon81/Nixtack/blob/master/noVNC/noVNC.nix # source: https://github.com/hyphon81/Nixtack/blob/master/noVNC/noVNC.nix
let let
in in
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
url = "https://github.com/novnc/noVNC/archive/v${version}.tar.gz"; url = "https://github.com/novnc/noVNC/archive/v${version}.tar.gz";
sha256 = "16ygbdzdmnfg9a26d9il4a6fr16qmq0ix9imfbpzl0drfbj7z8kh"; sha256 = "16ygbdzdmnfg9a26d9il4a6fr16qmq0ix9imfbpzl0drfbj7z8kh";
}; };
p = stdenv.lib.makeBinPath [ pkgs.nettools pkgs.python27Packages.websockify p = lib.makeBinPath [ pkgs.nettools pkgs.python27Packages.websockify
pkgs.coreutils pkgs.which pkgs.procps ]; pkgs.coreutils pkgs.which pkgs.procps ];
patchPhase = '' patchPhase = ''
sed -i '1aset -efu\nexport PATH=${p}\n' utils/launch.sh sed -i '1aset -efu\nexport PATH=${p}\n' utils/launch.sh
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
cp vnc_auto.html $out cp vnc_auto.html $out
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = http://novnc.com/info.html; homepage = http://novnc.com/info.html;
repositories.git = git://github.com/novnc/noVNC.git; repositories.git = git://github.com/novnc/noVNC.git;
description = '' description = ''

4
makefu/5pkgs/ns-atmosphere-programmer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip { stdenv, fetchzip, lib
, makeWrapper , makeWrapper
, autoPatchelfHook , autoPatchelfHook
, xlibs , xlibs
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
meta = with stdenv.lib; { meta = with lib; {
description = "Payload programmer for ns-atmosphere injector for nintendo switch"; description = "Payload programmer for ns-atmosphere injector for nintendo switch";
homepage = http://www.ns-atmosphere.com; homepage = http://www.ns-atmosphere.com;
maintainers = [ maintainers.makefu ]; maintainers = [ maintainers.makefu ];

8
makefu/5pkgs/nx_game_info/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl , mono , unzip { lib, stdenv, fetchurl , mono , unzip,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "NX_Game_Info"; pname = "NX_Game_Info";
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Tool to read information from Nintendo Switch game files"; description = "Tool to read information from Nintendo Switch game files";
homepage = https://github.com/garoxas/NX_Game_Info; homepage = https://github.com/garoxas/NX_Game_Info;
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ makefu ]; maintainers = with lib.maintainers; [ makefu ];
}; };
} }

6
makefu/5pkgs/pavumeter/default.nix
View File

@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "PulseAudio volumene meter"; description = "PulseAudio volumene meter";
homepage = http://0pointer.de/lennart/projects/pavumeter; homepage = http://0pointer.de/lennart/projects/pavumeter;
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ makefu ]; maintainers = with lib.maintainers; [ makefu ];
}; };
} }

3
makefu/5pkgs/studio-link/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv { stdenv
, lib
, fetchurl , fetchurl
, alsaLib , alsaLib
, unzip , unzip
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
install -m755 -D studio-link-standalone-v${version} $out/bin/studio-link install -m755 -D studio-link-standalone-v${version} $out/bin/studio-link
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = https://studio-link.com; homepage = https://studio-link.com;
description = "Voip transfer"; description = "Voip transfer";
platforms = platforms.linux; platforms = platforms.linux;

6
makefu/5pkgs/uhub/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd { stdenv, lib, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
, tlsSupport ? false }: , tlsSupport ? false }:
assert tlsSupport -> openssl != null; assert tlsSupport -> openssl != null;
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; buildInputs = [ cmake sqlite systemd ] ++ lib.optional tlsSupport openssl;
outputs = [ "out" outputs = [ "out"
"mod_example" "mod_example"
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"} ${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"}
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "High performance peer-to-peer hub for the ADC network"; description = "High performance peer-to-peer hub for the ADC network";
homepage = https://www.uhub.org/; homepage = https://www.uhub.org/;
license = licenses.gpl3; license = licenses.gpl3;

4
makefu/5pkgs/v4l2loopback-dc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, kernel, kmod }: { stdenv, lib, fetchFromGitHub, kernel, kmod }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "v4l2loopback-dc-${version}-${kernel.version}"; name = "v4l2loopback-dc-${version}-${kernel.version}";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
"INSTALL_MOD_PATH=$(out)" "INSTALL_MOD_PATH=$(out)"
]; ];
meta = with stdenv.lib; { meta = with lib; {
description = "A kernel module to create V4L2 loopback devices"; description = "A kernel module to create V4L2 loopback devices";
homepage = "https://github.com/aramg/droidcam"; homepage = "https://github.com/aramg/droidcam";
license = licenses.gpl2; license = licenses.gpl2;

16
makefu/5pkgs/xdcc-dl/default.nix
View File

@ -11,7 +11,7 @@
let let
inherit (pkgs) makeWrapper; inherit (pkgs) makeWrapper;
inherit (pkgs.stdenv.lib) fix' extends inNixShell; inherit (pkgs.lib) fix' extends inNixShell;
pythonPackages = pythonPackages =
import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" { import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" {
@ -73,7 +73,7 @@ let
propagatedBuildInputs = [ propagatedBuildInputs = [
self."six" self."six"
]; ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
homepage = ""; homepage = "";
license = licenses.mit; license = licenses.mit;
description = "Run JavaScript code from Python"; description = "Run JavaScript code from Python";
@ -91,7 +91,7 @@ let
propagatedBuildInputs = [ propagatedBuildInputs = [
self."beautifulsoup4" self."beautifulsoup4"
]; ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
homepage = ""; homepage = "";
license = licenses.mit; license = licenses.mit;
description = "Screen-scraping library"; description = "Screen-scraping library";
@ -106,7 +106,7 @@ let
doCheck = commonDoCheck; doCheck = commonDoCheck;
buildInputs = commonBuildInputs; buildInputs = commonBuildInputs;
propagatedBuildInputs = [ ]; propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
homepage = ""; homepage = "";
license = "MPL-2.0"; license = "MPL-2.0";
description = "Python package for providing Mozilla's CA Bundle."; description = "Python package for providing Mozilla's CA Bundle.";
@ -124,7 +124,7 @@ let
self."PyExecJS" self."PyExecJS"
self."requests" self."requests"
]; ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
homepage = ""; homepage = "";
license = ""; license = "";
description = "A simple Python module to bypass Cloudflare's anti-bot page. See https://github.com/Anorov/cloudflare-scrape for more information."; description = "A simple Python module to bypass Cloudflare's anti-bot page. See https://github.com/Anorov/cloudflare-scrape for more information.";
@ -139,7 +139,7 @@ let
doCheck = commonDoCheck; doCheck = commonDoCheck;
buildInputs = commonBuildInputs; buildInputs = commonBuildInputs;
propagatedBuildInputs = [ ]; propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
homepage = ""; homepage = "";
license = licenses.psfl; license = licenses.psfl;
description = "Type Hints for Python"; description = "Type Hints for Python";
@ -155,7 +155,7 @@ let
doCheck = commonDoCheck; doCheck = commonDoCheck;
buildInputs = commonBuildInputs; buildInputs = commonBuildInputs;
propagatedBuildInputs = [ ]; propagatedBuildInputs = [ ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
homepage = ""; homepage = "";
license = licenses.lgpl2; license = licenses.lgpl2;
description = "A full-featured console (xterm et al.) user interface library"; description = "A full-featured console (xterm et al.) user interface library";
@ -177,7 +177,7 @@ let
self."typing" self."typing"
self."urwid" self."urwid"
]; ];
meta = with pkgs.stdenv.lib; { meta = with pkgs.lib; {
homepage = ""; homepage = "";
license = licenses.gpl3; license = licenses.gpl3;
description = "An XDCC File Downloader based on the irclib framework"; description = "An XDCC File Downloader based on the irclib framework";