Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
Malte Brandy
@@ -6494,6 +6494,12 @@
|
||||
githubId = 791115;
|
||||
name = "Linquize";
|
||||
};
|
||||
linsui = {
|
||||
email = "linsui555@gmail.com";
|
||||
github = "linsui";
|
||||
githubId = 36977733;
|
||||
name = "linsui";
|
||||
};
|
||||
linus = {
|
||||
email = "linusarver@gmail.com";
|
||||
github = "listx";
|
||||
@@ -10134,6 +10140,12 @@
|
||||
githubId = 307899;
|
||||
name = "Gurkan Gur";
|
||||
};
|
||||
sersorrel = {
|
||||
email = "ash@sorrel.sh";
|
||||
github = "sersorrel";
|
||||
githubId = 9433472;
|
||||
name = "ash";
|
||||
};
|
||||
servalcatty = {
|
||||
email = "servalcat@pm.me";
|
||||
github = "servalcatty";
|
||||
|
||||
@@ -50,9 +50,8 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
# This is enough to make a symlink because the xserver
|
||||
# module already links all /share/X11 paths.
|
||||
environment.systemPackages = [ x11Fonts ];
|
||||
environment.pathsToLink = [ "/share/X11/fonts" ];
|
||||
|
||||
services.xserver.filesSection = ''
|
||||
FontPath "${x11Fonts}/share/X11/fonts"
|
||||
|
||||
@@ -144,7 +144,7 @@ in
|
||||
dictd = 105;
|
||||
couchdb = 106;
|
||||
#searx = 107; # dynamically allocated as of 2020-10-27
|
||||
kippo = 108;
|
||||
#kippo = 108; # removed 2021-10-07, the kippo package was removed in 1b213f321cdbfcf868b96fd9959c24207ce1b66a during 2021-04
|
||||
jenkins = 109;
|
||||
systemd-journal-gateway = 110;
|
||||
#notbit = 111; # unused
|
||||
@@ -462,7 +462,7 @@ in
|
||||
dictd = 105;
|
||||
couchdb = 106;
|
||||
#searx = 107; # dynamically allocated as of 2020-10-27
|
||||
kippo = 108;
|
||||
#kippo = 108; # removed 2021-10-07, the kippo package was removed in 1b213f321cdbfcf868b96fd9959c24207ce1b66a during 2021-04
|
||||
jenkins = 109;
|
||||
systemd-journal-gateway = 110;
|
||||
#notbit = 111; # unused
|
||||
|
||||
@@ -760,7 +760,6 @@
|
||||
./services/networking/kea.nix
|
||||
./services/networking/keepalived/default.nix
|
||||
./services/networking/keybase.nix
|
||||
./services/networking/kippo.nix
|
||||
./services/networking/knot.nix
|
||||
./services/networking/kresd.nix
|
||||
./services/networking/lambdabot.nix
|
||||
|
||||
@@ -31,15 +31,39 @@ in
|
||||
section of git-config(1) for more information.
|
||||
'';
|
||||
};
|
||||
|
||||
lfs = {
|
||||
enable = mkEnableOption "git-lfs";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.git-lfs;
|
||||
defaultText = literalExpression "pkgs.git-lfs";
|
||||
description = "The git-lfs package to use";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
environment.etc.gitconfig = mkIf (cfg.config != {}) {
|
||||
text = generators.toGitINI cfg.config;
|
||||
};
|
||||
};
|
||||
config = mkMerge [
|
||||
(mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
environment.etc.gitconfig = mkIf (cfg.config != {}) {
|
||||
text = generators.toGitINI cfg.config;
|
||||
};
|
||||
})
|
||||
(mkIf (cfg.enable && cfg.lfs.enable) {
|
||||
environment.systemPackages = [ cfg.lfs.package ];
|
||||
programs.git.config = {
|
||||
filter.lfs = {
|
||||
clean = "git-lfs clean -- %f";
|
||||
smudge = "git-lfs smudge -- %f";
|
||||
process = "git-lfs filter-process";
|
||||
required = true;
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
meta.maintainers = with maintainers; [ figsoda ];
|
||||
}
|
||||
|
||||
@@ -81,6 +81,8 @@ with lib;
|
||||
'')
|
||||
(mkRemovedOptionModule ["services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces.<name>.wakeOnLan")
|
||||
|
||||
(mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.")
|
||||
|
||||
# Do NOT add any option renames here, see top of the file
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
# NixOS module for kippo honeypot ssh server
|
||||
# See all the options for configuration details.
|
||||
#
|
||||
# Default port is 2222. Recommend using something like this for port redirection to default SSH port:
|
||||
# networking.firewall.extraCommands = ''
|
||||
# iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222'';
|
||||
#
|
||||
# Lastly: use this service at your own risk. I am working on a way to run this inside a VM.
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.kippo;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.kippo = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = "Enable the kippo honeypot ssh server.";
|
||||
};
|
||||
port = mkOption {
|
||||
default = 2222;
|
||||
type = types.int;
|
||||
description = "TCP port number for kippo to bind to.";
|
||||
};
|
||||
hostname = mkOption {
|
||||
default = "nas3";
|
||||
type = types.str;
|
||||
description = "Hostname for kippo to present to SSH login";
|
||||
};
|
||||
varPath = mkOption {
|
||||
default = "/var/lib/kippo";
|
||||
type = types.path;
|
||||
description = "Path of read/write files needed for operation and configuration.";
|
||||
};
|
||||
logPath = mkOption {
|
||||
default = "/var/log/kippo";
|
||||
type = types.path;
|
||||
description = "Path of log files needed for operation and configuration.";
|
||||
};
|
||||
pidPath = mkOption {
|
||||
default = "/run/kippo";
|
||||
type = types.path;
|
||||
description = "Path of pid files needed for operation.";
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
description = "Extra verbatim configuration added to the end of kippo.cfg.";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs.pythonPackages; [
|
||||
python pkgs.kippo.twisted pycrypto pyasn1 ];
|
||||
|
||||
environment.etc."kippo.cfg".text = ''
|
||||
# Automatically generated by NixOS.
|
||||
# See ${pkgs.kippo}/src/kippo.cfg for details.
|
||||
[honeypot]
|
||||
log_path = ${cfg.logPath}
|
||||
download_path = ${cfg.logPath}/dl
|
||||
filesystem_file = ${cfg.varPath}/honeyfs
|
||||
filesystem_file = ${cfg.varPath}/fs.pickle
|
||||
data_path = ${cfg.varPath}/data
|
||||
txtcmds_path = ${cfg.varPath}/txtcmds
|
||||
public_key = ${cfg.varPath}/keys/public.key
|
||||
private_key = ${cfg.varPath}/keys/private.key
|
||||
ssh_port = ${toString cfg.port}
|
||||
hostname = ${cfg.hostname}
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
users.users.kippo = {
|
||||
description = "kippo web server privilege separation user";
|
||||
uid = 108; # why does config.ids.uids.kippo give an error?
|
||||
};
|
||||
users.groups.kippo.gid = 108;
|
||||
|
||||
systemd.services.kippo = with pkgs; {
|
||||
description = "Kippo Web Server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.kippo.twisted}/lib/python2.7/site-packages/:.";
|
||||
preStart = ''
|
||||
if [ ! -d ${cfg.varPath}/ ] ; then
|
||||
mkdir -p ${cfg.logPath}/tty
|
||||
mkdir -p ${cfg.logPath}/dl
|
||||
mkdir -p ${cfg.varPath}/keys
|
||||
cp ${pkgs.kippo}/src/honeyfs ${cfg.varPath} -r
|
||||
cp ${pkgs.kippo}/src/fs.pickle ${cfg.varPath}/fs.pickle
|
||||
cp ${pkgs.kippo}/src/data ${cfg.varPath} -r
|
||||
cp ${pkgs.kippo}/src/txtcmds ${cfg.varPath} -r
|
||||
|
||||
chmod u+rw ${cfg.varPath} -R
|
||||
chown kippo.kippo ${cfg.varPath} -R
|
||||
chown kippo.kippo ${cfg.logPath} -R
|
||||
chmod u+rw ${cfg.logPath} -R
|
||||
fi
|
||||
if [ ! -d ${cfg.pidPath}/ ] ; then
|
||||
mkdir -p ${cfg.pidPath}
|
||||
chmod u+rw ${cfg.pidPath}
|
||||
chown kippo.kippo ${cfg.pidPath}
|
||||
fi
|
||||
'';
|
||||
|
||||
serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
|
||||
serviceConfig.PermissionsStartOnly = true;
|
||||
serviceConfig.User = "kippo";
|
||||
serviceConfig.Group = "kippo";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "faustPhysicalModeling";
|
||||
version = "2.30.5";
|
||||
version = "2.33.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grame-cncm";
|
||||
repo = "faust";
|
||||
rev = version;
|
||||
sha256 = "sha256-hfpMeUhv6FC9lnPCfdWnAFCaKiteplyrS/o3Lf7cQY4=";
|
||||
sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk=";
|
||||
};
|
||||
|
||||
buildInputs = [ faust2jaqt faust2lv2 ];
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, libappindicator
|
||||
, libpulseaudio
|
||||
, librsvg
|
||||
, pycairo
|
||||
, pygobject3
|
||||
, six
|
||||
, wrapGAppsHook
|
||||
, xlib
|
||||
}:
|
||||
|
||||
buildPythonApplication {
|
||||
pname = "hushboard";
|
||||
version = "unstable-2021-03-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stuartlangridge";
|
||||
repo = "hushboard";
|
||||
rev = "c16611c539be111891116a737b02c5fb359ad1fc";
|
||||
sha256 = "06jav6j0bsxhawrq31cnls8zpf80fpwk0cak5s82js6wl4vw2582";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libappindicator
|
||||
libpulseaudio
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pycairo
|
||||
pygobject3
|
||||
six
|
||||
xlib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace hushboard/_pulsectl.py \
|
||||
--replace "ctypes.util.find_library('libpulse') or 'libpulse.so.0'" "'${libpulseaudio}/lib/libpulse.so.0'"
|
||||
substituteInPlace snap/gui/hushboard.desktop \
|
||||
--replace "\''${SNAP}/hushboard/icons/hushboard.svg" "hushboard"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Fix tray icon, see e.g. https://github.com/NixOS/nixpkgs/pull/43421
|
||||
wrapProgram $out/bin/hushboard \
|
||||
--set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
|
||||
|
||||
mkdir -p $out/share/applications $out/share/icons/hicolor/{scalable,512x512}/apps
|
||||
cp snap/gui/hushboard.desktop $out/share/applications
|
||||
cp hushboard/icons/hushboard.svg $out/share/icons/hicolor/scalable/apps
|
||||
cp hushboard-512.png $out/share/icons/hicolor/512x512/apps/hushboard.png
|
||||
'';
|
||||
|
||||
# There are no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://kryogenix.org/code/hushboard/";
|
||||
license = licenses.mit;
|
||||
description = "Mute your microphone while typing";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ sersorrel ];
|
||||
};
|
||||
}
|
||||
@@ -16,11 +16,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "nano";
|
||||
version = "5.8";
|
||||
version = "5.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
|
||||
sha256 = "133nhxg4xfxisjzi85rn2l575hdbvcax1s13l4m6wcvq5zdn6fz4";
|
||||
sha256 = "dX24zaS7KHNZnkd4OvRj47VHpiewyrsw6nv3H7TCSTc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, vala
|
||||
, gtk3, glib, gtk-layer-shell
|
||||
, dbus, dbus-glib, librsvg
|
||||
, gobject-introspection, gdk-pixbuf, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "avizo";
|
||||
version = "unstable-2021-07-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "misterdanb";
|
||||
repo = "avizo";
|
||||
rev = "7b3874e5ee25c80800b3c61c8ea30612aaa6e8d1";
|
||||
sha256 = "sha256-ixAdiAH22Nh19uK5GoAXtAZJeAfCGSWTcGbrvCczWYc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ];
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace "$out"/bin/volumectl \
|
||||
--replace 'avizo-client' "$out/bin/avizo-client"
|
||||
substituteInPlace "$out"/bin/lightctl \
|
||||
--replace 'avizo-client' "$out/bin/avizo-client"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A neat notification daemon for Wayland";
|
||||
homepage = "https://github.com/misterdanb/avizo";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.berbiche ];
|
||||
};
|
||||
}
|
||||
@@ -2,25 +2,23 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfoundry-cli";
|
||||
version = "7.3.0";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I+4tFAMmmsmi5WH9WKXIja1vVWsPHNGkWbvjWGUCmkU=";
|
||||
sha256 = "00cwnfylra0msbb423ad21if98s6smzccsyidqsl4r2mrlkhahwm";
|
||||
};
|
||||
# vendor directory stale
|
||||
deleteVendor = true;
|
||||
vendorSha256 = null;
|
||||
vendorSha256 = "0fcgyyd11xfhn8i11bqnaw3h51bj1y8s37b4d8wzv31dr8zswqsc";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
# upstream have helpfully moved the bash completion script to a separate
|
||||
# repo which receives no releases or even tags
|
||||
bashCompletionScript = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7";
|
||||
sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy";
|
||||
url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/5f4f0d5d01e89c6333673f0fa96056749e71b3cd/ci/installers/completion/cf8";
|
||||
sha256 = "06w26kpnjd3f2wdjhb4pp0kaq2gb9kf87v7pjd9n2g7s7qhdqyhy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -44,11 +44,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bluejeans";
|
||||
version = "2.23.0.39";
|
||||
version = "2.24.0.89";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm";
|
||||
sha256 = "sha256-LGg14KJ/hEnSaSrdTltY9YXv7Nekkfo66uLkxjMx8AI=";
|
||||
sha256 = "sha256-rneX8ys/oKfVLavAZk5RJouOZkVsp+9BIAReSeYiKJc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rpmextract makeWrapper ];
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emuflight-configurator";
|
||||
version = "0.3.6";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip";
|
||||
sha256 = "sha256-egSUd/+RNo0vr2EJibgk9nNnql5sHC11gctUMK+DzW0=";
|
||||
sha256 = "sha256-s5AE+r9Fw6S7IG2cDW2T7vctcYIAY8al7eCFIDjD5oI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ];
|
||||
|
||||
@@ -38,25 +38,25 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is
|
||||
assert gbmSupport || waylandSupport || x11Support;
|
||||
|
||||
let
|
||||
kodiReleaseDate = "20210508";
|
||||
kodiVersion = "19.1";
|
||||
kodiReleaseDate = "20211006";
|
||||
kodiVersion = "19.2";
|
||||
rel = "Matrix";
|
||||
|
||||
kodi_src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "xbmc";
|
||||
rev = "${kodiVersion}-${rel}";
|
||||
sha256 = "0jh67vw3983lnfgqzqfislawwbpq0vxxk1ljsg7mar06mlwfxb7h";
|
||||
sha256 = "sha256-w5m7xlnjQDJ4l75b3ctF0wMZ4kqi+H0X6WFLs0gV6lM=";
|
||||
};
|
||||
|
||||
ffmpeg = stdenv.mkDerivation rec {
|
||||
pname = "kodi-ffmpeg";
|
||||
version = "4.3.1";
|
||||
version = "4.3.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = "FFmpeg";
|
||||
rev = "${version}-${rel}-Beta1";
|
||||
sha256 = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w";
|
||||
rev = "${version}-${rel}-${kodiVersion}";
|
||||
sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f";
|
||||
};
|
||||
preConfigure = ''
|
||||
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "7.01";
|
||||
in
|
||||
fetchzip {
|
||||
name = "i.ming-${version}";
|
||||
url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf";
|
||||
sha256 = "1b2dj7spkznpkad8a0blqigj9f6ism057r0wn9wdqg5g88yp32vd";
|
||||
|
||||
postFetch = ''
|
||||
install -DT -m444 $downloadedFile $out/share/fonts/truetype/I.Ming/I.Ming.ttf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source Pan-CJK serif typeface";
|
||||
homepage = "https://github.com/ichitenfont/I.Ming";
|
||||
license = licenses.ipa;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linsui ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-emoji-selector";
|
||||
version = "19";
|
||||
version = "20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maoschanz";
|
||||
repo = "emoji-selector-for-gnome";
|
||||
rev = version;
|
||||
sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb";
|
||||
sha256 = "sha256-I5aEHDC5GaGkAoH+1l4eyhBmJ+lmyZZoDw2Fq2SSlmo=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "13";
|
||||
patch_version = "0";
|
||||
sha256 = "sha256:1f7gnndzs6qcyy2gnzalnhm808pifxhvxg2qp5dnsziz6li7x303";
|
||||
patch_version = "1";
|
||||
sha256 = "sha256:1s7xwqidpjwfhnpfma4nb93gxfr7g9jfn03s1j03iyavmpgph7ck";
|
||||
}
|
||||
|
||||
@@ -1,36 +1,35 @@
|
||||
{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo }:
|
||||
with lib;
|
||||
{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tcc";
|
||||
version = "0.9.27";
|
||||
upstreamVersion = "release_${concatStringsSep "_" (builtins.splitVersion version)}";
|
||||
version = "unstable-2021-10-09";
|
||||
|
||||
src = fetchFromRepoOrCz {
|
||||
repo = "tinycc";
|
||||
rev = upstreamVersion;
|
||||
sha256 = "12mm1lqywz0akr2yb2axjfbw8lwv57nh395vzsk534riz03ml977";
|
||||
rev = "ca11849ebb88ef4ff87beda46bf5687e22949bd6";
|
||||
sha256 = "sha256-xnUDyTYZxbxUCblACyX73boBhU073VRqSy1SWlWsvIw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl texinfo ];
|
||||
nativeBuildInputs = [ perl texinfo which ];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "texi2pod.pl" \
|
||||
--replace "/usr/bin/perl" "${perl}/bin/perl"
|
||||
patchShebangs texi2pod.pl
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--cc=cc"
|
||||
"--crtprefix=${lib.getLib stdenv.cc.libc}/lib"
|
||||
"--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include"
|
||||
"--libpaths=${lib.getLib stdenv.cc.libc}/lib"
|
||||
# build cross compilers
|
||||
"--enable-cross"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
echo ${version} > VERSION
|
||||
|
||||
configureFlagsArray+=("--cc=cc")
|
||||
configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)")
|
||||
configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib")
|
||||
configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include")
|
||||
configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
@@ -47,9 +46,8 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Small, fast, and embeddable C compiler and interpreter";
|
||||
|
||||
longDescription = ''
|
||||
TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike
|
||||
other C compilers, it is meant to be self-sufficient: you do not
|
||||
@@ -73,11 +71,9 @@ stdenv.mkDerivation rec {
|
||||
With libtcc, you can use TCC as a backend for dynamic code
|
||||
generation.
|
||||
'';
|
||||
|
||||
homepage = "http://www.tinycc.org/";
|
||||
license = licenses.mit;
|
||||
|
||||
platforms = [ "x86_64-linux" ];
|
||||
homepage = "https://repo.or.cz/tinycc.git";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.joachifm ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -114,12 +114,12 @@ let
|
||||
};
|
||||
|
||||
self = mkDerivation rec {
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
pname = "octave";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-RX0f2oY0qDni/Xz8VbmL1W82tq5z0xu530Pd4wEsqnw=";
|
||||
sha256 = "sha256-IyBl86cvwwE/6fF/Qpo99p1nLB9rYHcCmjHI881Ypm4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -13,12 +13,18 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [
|
||||
"AR=${stdenv.cc.targetPrefix}ar"
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"LD=${stdenv.cc.targetPrefix}cc"
|
||||
"LDDLL=${stdenv.cc.targetPrefix}cc"
|
||||
] ++ lib.optional stdenv.hostPlatform.isStatic "DLL=no";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D build/brssl $bin/brssl
|
||||
install -D build/testcrypto $bin/testcrypto
|
||||
install -Dm644 build/libbearssl.so $lib/lib/libbearssl.so
|
||||
install -Dm644 build/libbearssl.a $lib/lib/libbearssl.a
|
||||
install -Dm644 -t $lib/lib build/libbearssl.*
|
||||
install -Dm644 -t $dev/include inc/*.h
|
||||
touch $out
|
||||
runHook postInstall
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-mysql=${getDev libmysqlclient}/bin/mysql_config"
|
||||
"--with-geotiff=${libgeotiff}"
|
||||
"--with-sqlite3=${sqlite.dev}"
|
||||
"--with-spatialite=${libspatialite}"
|
||||
"--with-spatialite=${libspatialite.dev}"
|
||||
"--with-python" # optional
|
||||
"--with-proj=${proj.dev}" # optional
|
||||
"--with-geos=${geos}/bin/geos-config" # optional
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
, perlPackages
|
||||
, pythonBindings ? true
|
||||
, tclBindings ? true
|
||||
, perlBindings ? true
|
||||
, perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -27,11 +28,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [
|
||||
swig
|
||||
pkg-config
|
||||
libtool
|
||||
];
|
||||
] ++ lib.optionals pythonBindings [ python3 ]
|
||||
++ lib.optionals tclBindings [ tcl ]
|
||||
++ lib.optionals perlBindings [ perl ];
|
||||
|
||||
buildInputs = [
|
||||
gd
|
||||
@@ -39,10 +44,12 @@ stdenv.mkDerivation rec {
|
||||
libusb-compat-0_1
|
||||
boost
|
||||
] ++ lib.optionals pythonBindings [ python3 ncurses ]
|
||||
++ lib.optionals tclBindings [ tcl ]
|
||||
++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ];
|
||||
++ lib.optionals tclBindings [ tcl ];
|
||||
|
||||
configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ]
|
||||
|
||||
configureFlags = [
|
||||
"CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc"
|
||||
] ++ lib.optionals perlBindings [ "--with-perl-binding" ]
|
||||
++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ]
|
||||
++ lib.optionals pythonBindings [ "--with-python-binding" ];
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtstyleplugin-kvantum-qt4";
|
||||
version = "0.16.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "Kvantum";
|
||||
rev = "V${version}";
|
||||
sha256 = "05ihjslnv7rrp4giwvvyaiig0dpfmw3jijfaadzax8jhbyscmxsq";
|
||||
sha256 = "sha256-sY2slI9ZVuEurBIEaJMxUiKiUNXx+h7UEwEZKKr7R2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wxsqlite3";
|
||||
version = "4.6.4";
|
||||
version = "4.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utelle";
|
||||
repo = "wxsqlite3";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fIm8xbNP7pjzvfBn7NgYmUtbVVh2aiaXQVANJQnrWCs=";
|
||||
sha256 = "sha256-t8y4oq4p7ZMDELAkRVmoNguYRNG8spcW7MHnpdINN8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
{ buildPecl, lib, rabbitmq-c }:
|
||||
|
||||
buildPecl {
|
||||
pname = "amqp";
|
||||
|
||||
version = "1.11.0beta";
|
||||
sha256 = "sha256-HbVLN6fg2htYZgAFw+IhYHP+XN8j7cTLG6S0YHHOC14=";
|
||||
|
||||
buildInputs = [ rabbitmq-c ];
|
||||
|
||||
AMQP_DIR = rabbitmq-c;
|
||||
|
||||
meta = with lib; {
|
||||
description = "PHP extension to communicate with any AMQP compliant server";
|
||||
license = licenses.php301;
|
||||
homepage = "https://github.com/php-amqp/php-amqp";
|
||||
maintainers = teams.php.members;
|
||||
};
|
||||
}
|
||||
@@ -28,11 +28,11 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-base";
|
||||
version = "2.10.14";
|
||||
version = "2.10.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gAxGRsWKWJf3HyIwFn21YmoZbeuiCPDvRWChg//Z39o=";
|
||||
sha256 = "sha256-RHiBi6gh26FD4SNWjsXTF9yPpKxuFRP3pQFzTlKXa/8=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
||||
@@ -29,11 +29,11 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-core";
|
||||
version = "2.11.5";
|
||||
version = "2.11.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fTzkcBQSKQdFRwQ2NIXkhRP4rQ8AE4uIhw622IlT0SE=";
|
||||
sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible";
|
||||
version = "2.9.26";
|
||||
version = "2.9.27";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OuAqrSu+3PtBnOdevSpkjp3rc+ni2N6GyC1gR7G962M=";
|
||||
sha256 = "sha256-R5FZ5Qs72Qkg0GvFlBDDpR0/m+m04QKeEdHkotBwVzY=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
pname = "bids-validator";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a2940b447fdbea084311de55d415a1538299ad40ee1cc6ae711319c0734dc401";
|
||||
sha256 = "63e7a02c9ddb5505a345e178f4e436b82c35ec0a177d7047b67ea10ea3029a68";
|
||||
};
|
||||
|
||||
# needs packages which are not available in nixpkgs
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homepluscontrol";
|
||||
version = "0.0.61";
|
||||
version = "0.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chemaaa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1g61xj417dz1nz5g5ic8rs34fp424zvbgsymry1zldg3gskaqgvk";
|
||||
sha256 = "sha256-COOGqfYiR4tueQHXuCvVxShrYS0XNltcW4mclbFWcfA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jaraco.itertools";
|
||||
version = "6.0.1";
|
||||
version = "6.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6939e47806a39330a9f9772bf9ea910da39abc159ff2579d454a763358553439";
|
||||
sha256 = "1775bfcad5de275a540a36720c5ab34594ea1dbe7ffefa32099b0129c5604608";
|
||||
};
|
||||
|
||||
pythonNamespaces = [ "jaraco" ];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cmake
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, pytest
|
||||
@@ -11,19 +12,19 @@
|
||||
, scipy
|
||||
, pandas
|
||||
, matplotlib
|
||||
, ninja
|
||||
, numba
|
||||
, pybind11
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phik";
|
||||
version = "0.12.0";
|
||||
format = "wheel";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
python = "py3";
|
||||
sha256 = "57db39d1c74c84a24d0270b63d1c629a5cb975462919895b96a8522ae0678408";
|
||||
inherit pname version;
|
||||
sha256 = "959fd40482246e3f643cdac5ea04135b2c11a487e917af7d4e75843f47183549";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
@@ -40,6 +41,15 @@ buildPythonPackage rec {
|
||||
pandas
|
||||
matplotlib
|
||||
numba
|
||||
pybind11
|
||||
];
|
||||
|
||||
# uses setuptools to drive build process
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfuse3";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f";
|
||||
sha256 = "22d146dac59a8429115e9a93317975ea54b35e0278044a94d3fac5b4ad5f7e33";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhaversion";
|
||||
version = "21.07.0";
|
||||
version = "21.10.1";
|
||||
|
||||
# Only 3.8.0 and beyond are supported
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LcuMLYekeK9HR+SR8+R+EvuxxaN3RCh7KV969RngZjw=";
|
||||
sha256 = "sha256-7J7zzJlevNQb7TpFYuGvsk3EWBgwhmV32xPNSLA/LS4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ec2-metadata-mock";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-ec2-metadata-mock";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k4YzG4M+r6BHc4DdAMXoUvVDTJqmzr8vIL1J6kbJBeY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-uq0gcpFzAcz1HMwI1ZjHykWU93bV2U5kxC/G+J4ob7Q=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{cmd,ec2-metadata-mock}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Amazon EC2 Metadata Mock";
|
||||
homepage = "https://github.com/aws/amazon-ec2-metadata-mock";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ymatsiuk ];
|
||||
};
|
||||
}
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackfire-agent";
|
||||
version = "1.46.0";
|
||||
version = "1.49.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb";
|
||||
sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2";
|
||||
sha256 = "t1S54z3xTMTUBWz0jCFX1A7GJdWWsP/lTa9MMjo8t1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "00xr74yc0kj9rrqa1a8b7bih865qlp9i4zs67ysavkfrjrwwssxm";
|
||||
};
|
||||
|
||||
|
||||
@@ -2,16 +2,24 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dejagnu";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd";
|
||||
sha256 = "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ expect ];
|
||||
|
||||
# dejagnu-1.6.3 can't successfully run tests in source tree:
|
||||
# https://wiki.linuxfromscratch.org/lfs/ticket/4871
|
||||
preConfigure = ''
|
||||
mkdir build
|
||||
cd build
|
||||
'';
|
||||
configureScript = "../configure";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pypi-mirror";
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "montag451";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0slh8ahywcgbggfcmzyqpb8bmq9dkk6vvjfkbi0ashnm8c6x19vd";
|
||||
sha256 = "0sjzjvq2jnsr5mfyvkww3rfk3k5xcl8wa07q614850m0sn907laz";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "pypi_mirror" ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sumneko-lua-language-server";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sumneko";
|
||||
repo = "lua-language-server";
|
||||
rev = version;
|
||||
sha256 = "sha256-RhjH/phRVlNO9nPL+TtcrZYpwqNygpXjI/Pdyrxxv/4=";
|
||||
sha256 = "sha256-PYlHjKMnqnhAJAvmHbH6Bb+qOyNzDH+ewOkXkj2u4CU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -33,13 +33,14 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/extras
|
||||
cp -r ./{locale,meta,script,*.lua} $out/extras/
|
||||
cp ./bin/Linux/{bee.so,lpeglabel.so} $out/extras
|
||||
cp ./bin/Linux/lua-language-server $out/extras/.lua-language-server-unwrapped
|
||||
makeWrapper $out/extras/.lua-language-server-unwrapped \
|
||||
install -Dt "$out"/share/lua-language-server/bin/Linux bin/Linux/lua-language-server
|
||||
install -m644 -t "$out"/share/lua-language-server/bin/Linux bin/Linux/*.*
|
||||
install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua
|
||||
cp -r locale meta script "$out"/share/lua-language-server
|
||||
|
||||
makeWrapper "$out"/share/lua-language-server/bin/Linux/lua-language-server \
|
||||
$out/bin/lua-language-server \
|
||||
--add-flags "-E $out/extras/main.lua \
|
||||
--add-flags "-E $out/share/lua-language-server/main.lua \
|
||||
--logpath='~/.cache/sumneko_lua/log' \
|
||||
--metapath='~/.cache/sumneko_lua/meta'"
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@ assert tlsSupport -> gnutls != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tintin";
|
||||
version = "2.02.05";
|
||||
version = "2.02.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tintin/tintin-${version}.tar.gz";
|
||||
sha256 = "sha256-Y6cAUhItJNade8ASOVdF8aBBLf/UVqjoqrhXBNRL1aE=";
|
||||
sha256 = "sha256-s5KJ7x4m0vW39+M/cLzYlAYMld2WwVe7l28GPFmosfU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional tlsSupport gnutls.dev;
|
||||
|
||||
@@ -44,16 +44,16 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "6.17";
|
||||
version = "6.19";
|
||||
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-nbHyQ12AJiw3dzF98HWFWu6j5qUst3xjDsGysfuUjwg=";
|
||||
sha256 = "sha256-QYLi2WJ3BMw3b0b8MQlYDqkHd5b0T17oPgjj6Wvwq2Y=";
|
||||
inherit (stable) gecko32 gecko64;
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
mono = fetchurl rec {
|
||||
version = "6.3.0";
|
||||
version = "6.4.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
sha256 = "sha256-pfAtMqAoNpKkpiX1Qc+7tFGIMShHTFyANiOFMXzQmfA=";
|
||||
sha256 = "sha256-24uF87kQWQ9hrb+gAFqZXWE+KZocxz0AVT1w3IEBDjY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -65,7 +65,7 @@ in rec {
|
||||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-rR5m6D8M3vTXXIHzsF8+o2G5rlRS2HLfCHoatbJwlrQ=";
|
||||
sha256 = "sha256-1Ng+kFFnqEndlCvI0eG1YmyqPdcolD3cVJ2KU5GU7Z4=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
||||
@@ -157,5 +157,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.viric ];
|
||||
mainProgram = "gs";
|
||||
};
|
||||
}
|
||||
|
||||
+243
-243
File diff suppressed because it is too large
Load Diff
@@ -548,8 +548,8 @@ ojroques/vim-oscyank@main
|
||||
Olical/aniseed
|
||||
Olical/conjure
|
||||
olimorris/onedark.nvim
|
||||
onsails/diaglist.nvim
|
||||
onsails/lspkind-nvim
|
||||
onsails/vimway-lsp-diag.nvim
|
||||
OrangeT/vim-csharp
|
||||
osyo-manga/shabadou.vim
|
||||
osyo-manga/vim-anzu
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.14.9";
|
||||
suffix = "lqx4";
|
||||
version = "5.14.11";
|
||||
suffix = "lqx1";
|
||||
in
|
||||
|
||||
buildLinux (args // {
|
||||
@@ -14,7 +14,7 @@ buildLinux (args // {
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "sha256-nT8lc/JeuXsKVHGPQxK+w8BTasxyIfxCdKbAvoFgbYg=";
|
||||
sha256 = "sha256-4SSAcI1TwaKgz/bwma+YQtIBtodEAYxqdtUI3ESM7I8=";
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchurl, withoutInitTools ? false }:
|
||||
|
||||
let version = "2.99"; in
|
||||
let version = "3.00"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz";
|
||||
sha256 = "sha256-sFw2d7tpiv5kyZeWiwDEmyqb0yDOljUjIw7n6kEZd1c=";
|
||||
sha256 = "sha256-7WvCCttnNTiYQefT64ZQ+nUMdq8gv07XOxMwpNTBQBc=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -61,13 +61,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sympa";
|
||||
version = "6.2.60";
|
||||
version = "6.2.64";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sympa-community";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0mnpmkvxf3bmrmahkf3d0i5r6sj7xb1yca5v7xdnwnh5wh9vlx7v";
|
||||
sha256 = "sha256-7bBOhx6sDyln37OEgRLJwgu0rklJm872hINog2EJ/+E=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
|
||||
with python3Packages; buildPythonApplication rec {
|
||||
pname = "synadm";
|
||||
version = "0.30";
|
||||
version = "0.31";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9e7c2e2540fb786c1064a9a2bfe6ef3ec8b0ed27f6fd6beda80ed615c72a6103";
|
||||
sha256 = "1098a5248a1e2de53ced3c699b3b78ced3327c5f4e0ff092a95ef4940e4f9c6e";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -4,19 +4,19 @@
|
||||
# * Download the tarball of the new version to use.
|
||||
# * Remove the `resolutions`-section from upstream `package.json`
|
||||
# as this breaks with `yarn2nix`.
|
||||
# * Regenerate `yarn.lock` and `yarn2nix`.
|
||||
# * Regenerate `yarn.lock` and `yarn2nix --no-patch`.
|
||||
# * Replace new `package.json`, `yarn.nix`, `yarn.lock` here.
|
||||
# * Update `version`+`hash` and rebuild.
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PEi8jreYCafKBa8M5Mo6/g03pS1PHvmhgMpuwIlUePY=";
|
||||
sha256 = "sha256-1xHRfEjtxiXXRt6Rpl4j8xxTQ6qXG4/ps885CLc35OQ=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"url": "http://github.com/grafana/grafana-image-renderer.git"
|
||||
},
|
||||
"scripts": {
|
||||
"eslint": "eslint -c eslint.json",
|
||||
"eslint": "eslint . --ext .ts",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"prettier:check": "prettier --list-different \"**/*.ts\"",
|
||||
"prettier:write": "prettier --list-different \"**/*.ts\" --write",
|
||||
@@ -22,7 +22,6 @@
|
||||
"@grpc/proto-loader": "^0.5.4",
|
||||
"@hapi/boom": "^9.1.0",
|
||||
"chokidar": "^3.5.2",
|
||||
"eslint": "^7.13.0",
|
||||
"express": "^4.16.3",
|
||||
"express-prom-bundle": "^5.1.5",
|
||||
"google-protobuf": "3.5.0",
|
||||
@@ -37,11 +36,20 @@
|
||||
"winston": "^3.2.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/eslint-config": "^2.5.0",
|
||||
"@types/express": "^4.11.1",
|
||||
"@types/node": "^14.14.41",
|
||||
"@typescript-eslint/eslint-plugin": "^4.32.0",
|
||||
"@typescript-eslint/parser": "^4.32.0",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-jsdoc": "^36.1.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-react": "^7.26.1",
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
"husky": "^4.3.8",
|
||||
"lint-staged": "^9.5.0",
|
||||
"pkg": "^5.1.0",
|
||||
"lint-staged": "^11.2.0",
|
||||
"pkg": "^5.3.3",
|
||||
"prettier": "2.2.1",
|
||||
"tsc-watch": "^4.2.3",
|
||||
"typescript": "^4.3.2"
|
||||
@@ -53,8 +61,7 @@
|
||||
},
|
||||
"lint-staged": {
|
||||
"*.ts": [
|
||||
"prettier --write",
|
||||
"git add"
|
||||
"prettier --write"
|
||||
]
|
||||
},
|
||||
"pkg": {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -15,13 +15,13 @@ let
|
||||
]);
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "moonraker";
|
||||
version = "unstable-2021-09-21";
|
||||
version = "unstable-2021-10-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arksine";
|
||||
repo = "moonraker";
|
||||
rev = "2447ccab6252fddc829da3eec8b29d1abe3dee60";
|
||||
sha256 = "qaorF26e2pkOCxiUfo8MOPQVpZjx5G1uo66jFoQpMcs=";
|
||||
rev = "c3f1b290f8667f771f2d58a3f012e87853c4e85c";
|
||||
sha256 = "a49sVvgzpGHrjWbSH6GiH5kGeXm1LrLgd+lKv7Xxi9w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2021-10-06";
|
||||
version = "2021-10-07";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "29b5c182bec4cec7704fb8bac9ee0ab971dfb89a";
|
||||
rev = "dc83d0b7204cf66315471e980729490813b7d915";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "pPBeZj/QTQCIuBtE7+4CmuXacblU4RGXty+cdeQw+54=";
|
||||
sha256 = "7V6v9II48C4OoTf2CBQt+mqfh4kbMb8MspGBkX42Q/c=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "2.28.0";
|
||||
version = "2.28.1";
|
||||
srcName = "azure-cli-${version}-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -9,7 +9,7 @@ let
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
sha256 = "sha256-fTt6tIcc96f8t3NUaR0RG0JQ+LPgqSHuJSmVx4a6X7M=";
|
||||
sha256 = "sha256-9EkCScEj5kuKtkfnCmFUZg/qDzvmI3rvDS+NtkZC7sk=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overriden in the py package scope
|
||||
|
||||
@@ -4,11 +4,11 @@ with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "adafruit-ampy";
|
||||
version = "1.0.7";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd";
|
||||
sha256 = "f4cba36f564096f2aafd173f7fbabb845365cc3bb3f41c37541edf98b58d3976";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "dialogbox";
|
||||
version = "1.0+unstable=2020-11-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martynets";
|
||||
repo = pname;
|
||||
rev = "6989740746f376becc989ab2698e77d14186a0f9";
|
||||
hash = "sha256-paTas3KbV4yZ0ePnrOH1S3bLLHDddFml1h6b6azK4RQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -d $out/{bin,share/doc/dialogbox}
|
||||
install dist/dialogbox $out/bin
|
||||
install README.md $out/share/doc/dialogbox/
|
||||
cp -r demos $out/share/doc/dialogbox/demos
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/martynets/dialogbox/";
|
||||
description = "Qt-based scriptable engine providing GUI dialog boxes";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -46,6 +46,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/strongswan/strongswan/pull/150.patch";
|
||||
sha256 = "1irfxb99blb8v3hs0kmlhzkkwbmds1p0gq319z8lmacz36cgyj2c";
|
||||
})
|
||||
|
||||
# fix build with -fno-common tollchain
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://git.strongswan.org/?p=strongswan.git;a=patch;h=91c6387e69c09beaa9b9ca1e28471751a834fc24";
|
||||
sha256 = "0jp9walxwffp5cl7q0hb80h3s2gdj1nn3n8bvnbmwgh2s6pi148f";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = optionalString stdenv.isLinux ''
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cameradar";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ullaakut";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "03nm03cqhq04ixw4rssfkgrin918pa0v7ai26v4h99gz7j8hs7ll";
|
||||
};
|
||||
|
||||
vendorSha256 = "099np130dn51nb4lcyrrm46fihfipxrw0vpqs2jh5g4c6pnbk200";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
];
|
||||
|
||||
subPackages = [
|
||||
"cmd/cameradar"
|
||||
];
|
||||
# At least one test is outdated
|
||||
#doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "RTSP stream access tool";
|
||||
homepage = "https://github.com/Ullaakut/cameradar";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cdk-go";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk-team";
|
||||
repo = "CDK";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zz9jaz5nlvs52nqlaisivrnz7lz8g48qii0n2s1783a5jpkk9ml";
|
||||
};
|
||||
|
||||
vendorSha256 = "0sn709mbhfymwwfdqc5xpdz2lgimqx3xycfmq24vbfmlh8wqcs7l";
|
||||
|
||||
# At least one test is outdated
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Container penetration toolkit";
|
||||
homepage = "https://github.com/cdk-team/CDK";
|
||||
license = with licenses; [ gpl2Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "cdk";
|
||||
};
|
||||
}
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8PX1jUbS5qf5KqeZXv3oijtZCPo5LsabqHSA3rsd3tQ=";
|
||||
sha256 = "sha256-sB/z7Z35SQt2D6YHgSJjXS/O9qbkqVrcl/OB+YhGhwQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bkk/gXMLiZGHebrIeDsj3OyiEcH4hriI4TFNdoh3SBk=";
|
||||
vendorSha256 = "sha256-/GC81ukWpC7h86noPv6zayS9fxWhJpWGXPM8u56F5c4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and multi-purpose HTTP toolkit";
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mongoaudit";
|
||||
version = "0.1.1";
|
||||
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stampery";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17k4vw5d3kr961axl49ywid4cf3n7zxvm885c4lv15w7s2al1425";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pymongo
|
||||
setuptools
|
||||
urwid
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mongoaudit"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MongoDB auditing and pentesting tool";
|
||||
homepage = "https://github.com/stampery/mongoaudit";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -29,5 +29,6 @@ stdenv.mkDerivation {
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
mainProgram = "sed";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ mic92 ];
|
||||
mainProgram = "sed";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1373,6 +1373,8 @@ with pkgs;
|
||||
|
||||
ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { };
|
||||
|
||||
ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { };
|
||||
|
||||
ec2-utils = callPackage ../tools/virtualization/ec2-utils { };
|
||||
|
||||
exoscale-cli = callPackage ../tools/admin/exoscale-cli { };
|
||||
@@ -2279,6 +2281,8 @@ with pkgs;
|
||||
|
||||
calendar-cli = callPackage ../tools/networking/calendar-cli { };
|
||||
|
||||
cameradar = callPackage ../tools/security/cameradar { };
|
||||
|
||||
candle = libsForQt5.callPackage ../applications/misc/candle { };
|
||||
|
||||
capstone = callPackage ../development/libraries/capstone { };
|
||||
@@ -2599,6 +2603,8 @@ with pkgs;
|
||||
|
||||
dialog = callPackage ../tools/misc/dialog { };
|
||||
|
||||
dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { };
|
||||
|
||||
dibbler = callPackage ../tools/networking/dibbler { };
|
||||
|
||||
diesel-cli = callPackage ../development/tools/diesel-cli {
|
||||
@@ -3526,6 +3532,8 @@ with pkgs;
|
||||
|
||||
mcrypt = callPackage ../tools/misc/mcrypt { };
|
||||
|
||||
mongoaudit = callPackage ../tools/security/mongoaudit { };
|
||||
|
||||
mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
|
||||
|
||||
mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
|
||||
@@ -15495,6 +15503,8 @@ with pkgs;
|
||||
|
||||
cdk = callPackage ../development/libraries/cdk {};
|
||||
|
||||
cdk-go = callPackage ../tools/security/cdk-go {};
|
||||
|
||||
cdo = callPackage ../development/libraries/cdo { };
|
||||
|
||||
cimg = callPackage ../development/libraries/cimg { };
|
||||
@@ -22783,6 +22793,8 @@ with pkgs;
|
||||
|
||||
ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { };
|
||||
|
||||
i-dot-ming = callPackage ../data/fonts/i-dot-ming { };
|
||||
|
||||
ibm-plex = callPackage ../data/fonts/ibm-plex { };
|
||||
|
||||
iconpack-jade = callPackage ../data/icons/iconpack-jade { };
|
||||
@@ -23586,6 +23598,8 @@ with pkgs;
|
||||
|
||||
av-98 = callPackage ../applications/networking/browsers/av-98 { };
|
||||
|
||||
avizo = callPackage ../applications/misc/avizo { };
|
||||
|
||||
avocode = callPackage ../applications/graphics/avocode {};
|
||||
|
||||
azpainter = callPackage ../applications/graphics/azpainter { };
|
||||
@@ -25275,6 +25289,8 @@ with pkgs;
|
||||
|
||||
go-org = callPackage ../applications/misc/go-org { };
|
||||
|
||||
hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { };
|
||||
|
||||
hydrogen = qt5.callPackage ../applications/audio/hydrogen { };
|
||||
hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit.
|
||||
|
||||
|
||||
@@ -159,6 +159,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
# or php.withExtensions to extend the functionality of the PHP
|
||||
# interpreter.
|
||||
extensions = {
|
||||
amqp = callPackage ../development/php-packages/amqp { };
|
||||
|
||||
apcu = callPackage ../development/php-packages/apcu { };
|
||||
|
||||
apcu_bc = callPackage ../development/php-packages/apcu_bc { };
|
||||
|
||||
Reference in New Issue
Block a user