Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-06-05 18:30:28 +00:00 committed by GitHub
commit d9d6f71e43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 1121 additions and 385 deletions

View file

@ -23,7 +23,7 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [21.11 Release Notes](./CONTRIBUTING.md#generating-2111-release-notes)
- [21.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#generating-2111-release-notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module

View file

@ -183,9 +183,6 @@
- Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.
- The top-level `lib` must be used in the master and 21.05 branch over its alias `stdenv.lib` as it now causes evaluation errors when aliases are disabled which is the case for ofborg.
`lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing locally to avoid having to modify the function inputs just to test something out.
## Package naming {#sec-package-naming}
The key words _must_, _must not_, _required_, _shall_, _shall not_, _should_, _should not_, _recommended_, _may_, and _optional_ in this section are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119). Only _emphasized_ words are to be interpreted in this way.

View file

@ -300,6 +300,12 @@
githubId = 335271;
name = "James Alexander Feldman-Crough";
};
afontain = {
email = "antoine.fontaine@epfl.ch";
github = "necessarily-equal";
githubId = 59283660;
name = "Antoine Fontaine";
};
aforemny = {
email = "aforemny@posteo.de";
github = "aforemny";
@ -8431,6 +8437,12 @@
githubId = 1891350;
name = "Michael Raskin";
};
ratsclub = {
email = "victor@freire.dev.br";
github = "ratsclub";
githubId = 25647735;
name = "Victor Freire";
};
ravloony = {
email = "ravloony@gmail.com";
name = "Tom Macdonald";
@ -8643,6 +8655,12 @@
githubId = 449990;
name = "Cedric Cellier";
};
rkitover = {
email = "rkitover@gmail.com";
github = "rkitover";
githubId = 77611;
name = "Rafael Kitover";
};
rkoe = {
email = "rk@simple-is-better.org";
github = "rkoe";

View file

@ -6,28 +6,33 @@ let
im = config.i18n.inputMethod;
cfg = im.fcitx5;
fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
in
{
options = {
i18n.inputMethod.fcitx5 = {
addons = mkOption {
type = with types; listOf package;
default = [];
example = with pkgs; [ fcitx5-rime ];
description = ''
Enabled Fcitx5 addons.
'';
};
in {
options = {
i18n.inputMethod.fcitx5 = {
addons = mkOption {
type = with types; listOf package;
default = [];
example = with pkgs; [ fcitx5-rime ];
description = ''
Enabled Fcitx5 addons.
'';
};
};
};
config = mkIf (im.enabled == "fcitx5") {
i18n.inputMethod.package = fcitx5Package;
config = mkIf (im.enabled == "fcitx5") {
i18n.inputMethod.package = fcitx5Package;
environment.variables = {
GTK_IM_MODULE = "fcitx";
QT_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx";
};
environment.variables = {
GTK_IM_MODULE = "fcitx";
QT_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx";
};
}
systemd.user.services.fcitx5-daemon = {
enable = true;
script = "${fcitx5Package}/bin/fcitx5";
wantedBy = [ "graphical-session.target" ];
};
};
}

View file

@ -4,7 +4,7 @@ with lib;
let
inherit (pkgs) mysql gzip;
inherit (pkgs) mariadb gzip;
cfg = config.services.mysqlBackup;
defaultUser = "mysqlbackup";
@ -20,7 +20,7 @@ let
'';
backupDatabaseScript = db: ''
dest="${cfg.location}/${db}.gz"
if ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
if ${mariadb}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
mv $dest.tmp $dest
echo "Backed up to $dest"
else

View file

@ -34,7 +34,7 @@ in
package = mkOption {
type = types.package;
example = literalExample "pkgs.mysql";
example = literalExample "pkgs.mariadb";
description = "
Which MySQL derivation to use. MariaDB packages are supported too.
";

View file

@ -7,7 +7,7 @@ let
fpm = config.services.phpfpm.pools.roundcube;
localDB = cfg.database.host == "localhost";
user = cfg.database.username;
phpWithPspell = pkgs.php.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);
phpWithPspell = pkgs.php74.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);
in
{
options.services.roundcube = {

View file

@ -27,7 +27,7 @@ let
# NOTE: Use password authentication, since mysqljs does not yet support auth_socket
if [ ! -e /var/lib/epgstation/db-created ]; then
${pkgs.mysql}/bin/mysql -e \
${pkgs.mariadb}/bin/mysql -e \
"GRANT ALL ON \`${cfg.database.name}\`.* TO '${username}'@'localhost' IDENTIFIED by '$DB_PASSWORD';"
touch /var/lib/epgstation/db-created
fi
@ -224,7 +224,7 @@ in
services.mysql = {
enable = mkDefault true;
package = mkDefault pkgs.mysql;
package = mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.name ];
# FIXME: enable once mysqljs supports auth_socket
# ensureUsers = [ {

View file

@ -728,7 +728,7 @@ in
services.postgresql.enable = lib.mkDefault createLocalPostgreSQL;
services.mysql.enable = lib.mkDefault createLocalMySQL;
services.mysql.package = lib.mkIf createLocalMySQL pkgs.mysql;
services.mysql.package = lib.mkIf createLocalMySQL pkgs.mariadb;
};
meta.doc = ./keycloak.xml;

View file

@ -644,7 +644,7 @@ let
services.mysql = mkIf mysqlLocal {
enable = true;
package = mkDefault pkgs.mysql;
package = mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.name ];
ensureUsers = [
{

View file

@ -42,7 +42,7 @@ let
GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost';
FLUSH PRIVILEGES;
'';
package = pkgs.mysql;
package = pkgs.mariadb;
};
services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";

View file

@ -18,7 +18,7 @@ let
};
services.mysql = {
enable = true;
package = pkgs.mysql;
package = pkgs.mariadb;
};
services.nginx.enable = true;
};

View file

@ -8,7 +8,7 @@ import ./../make-test-python.nix ({ pkgs, lib, ... }:
{ pkgs, ... }:
{
services.mysql.enable = true;
services.mysql.package = pkgs.mysql;
services.mysql.package = pkgs.mariadb;
services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
services.automysqlbackup.enable = true;

View file

@ -10,7 +10,7 @@ import ./../make-test-python.nix ({ pkgs, ... } : {
services.mysql = {
enable = true;
initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
package = pkgs.mysql;
package = pkgs.mariadb;
};
services.mysqlBackup = {

View file

@ -17,7 +17,7 @@ in
{
services.mysql.enable = true;
services.mysql.package = pkgs.mysql;
services.mysql.package = pkgs.mariadb;
services.mysql.replication.role = "master";
services.mysql.replication.slaveHost = "%";
services.mysql.replication.masterUser = replicateUser;
@ -31,7 +31,7 @@ in
{
services.mysql.enable = true;
services.mysql.package = pkgs.mysql;
services.mysql.package = pkgs.mariadb;
services.mysql.replication.role = "slave";
services.mysql.replication.serverId = 2;
services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
@ -44,7 +44,7 @@ in
{
services.mysql.enable = true;
services.mysql.package = pkgs.mysql;
services.mysql.package = pkgs.mariadb;
services.mysql.replication.role = "slave";
services.mysql.replication.serverId = 3;
services.mysql.replication.masterHost = nodes.master.config.networking.hostName;

View file

@ -10,7 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
services.mysql = {
enable = true;
package = pkgs.mysql;
package = pkgs.mariadb;
ensureDatabases = [ "sogo" ];
ensureUsers = [{
name = "sogo";

View file

@ -0,0 +1,28 @@
{ stdenv, lib, fetchFromGitHub, xorg, cairo, lv2, libsndfile, pkg-config }:
stdenv.mkDerivation rec {
pname = "boops";
version = "1.4.0";
src = fetchFromGitHub {
owner = "sjaehn";
repo = "BOops";
rev = version;
sha256 = "1kkp6s431pjb1qrg1dq8ak3lj0ksqnxsij9jg6biscpfgbmaqdcq";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorg.libX11 cairo lv2 libsndfile
];
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://github.com/sjaehn/BOops";
description = "Sound glitch effect sequencer LV2 plugin";
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
license = licenses.gpl3Plus;
};
}

View file

@ -0,0 +1,76 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, libjack2, alsaLib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor
}:
let
# Derived from subprojects/function2.wrap
function2 = rec {
version = "4.1.0";
src = fetchFromGitHub {
owner = "Naios";
repo = "function2";
rev = version;
hash = "sha256-JceZU8ZvtYhFheh8BjMvjjZty4hcYxHEK+IIo5X4eSk=";
};
};
juce = rec {
version = "unstable-2021-04-07";
src = fetchFromGitHub {
owner = "juce-framework";
repo = "JUCE";
rev = "1a5fb5992a1a4e28e998708ed8dce2cc864a30d7";
sha256= "1ri7w4sz3sy5xilibg53ls9526fx7jwbv8rc54ccrqfhxqyin308";
};
};
in stdenv.mkDerivation rec {
pname = "diopser";
version = "unstable-2021-5-13";
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = pname;
fetchSubmodules = true;
rev = "d5fdc92f1caf5a828e071dac99e106e58f06d84d";
sha256 = "06y1h895yxh44gp4vxzrna59lf7nlfw7aacd3kk4l1g56jhy9pdx";
};
postUnpack = ''
(
cd "$sourceRoot"
cp -R --no-preserve=mode,ownership ${function2.src} function2
cp -R --no-preserve=mode,ownership ${juce.src} JUCE
sed -i 's@CPMAddPackage("gh:juce-framework/JUCE.*@add_subdirectory(JUCE)@g' CMakeLists.txt
sed -i 's@CPMAddPackage("gh:Naios/function2.*@add_subdirectory(function2)@g' CMakeLists.txt
patchShebangs .
)
'';
installPhase = ''
mkdir -p $out/lib/vst3
cp -r Diopser_artefacts/Release/VST3/Diopser.vst3 $out/lib/vst3
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext
libXcursor
];
cmakeFlags = [
"-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar"
"-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib"
];
meta = with lib; {
description = "A totally original phase rotation plugin";
homepage = "https://github.com/robbert-vdh/diopser";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ magnetophon ];
platforms = platforms.all;
};
}

View file

@ -20,13 +20,13 @@ with lib.strings;
let
version = "unstable-2020-08-27";
version = "2.30.5";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e";
sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb";
rev = version;
sha256 = "0cs52w4rwaj5d8pjak4cxsg02sxvx4y07592nc3ck81clqjmszmm";
fetchSubmodules = true;
};

View file

@ -1,22 +1,24 @@
{ lib, stdenv, fetchFromGitHub
, llvm, qt48Full, qrencode, libmicrohttpd_0_9_70, libjack2, alsaLib, faust, curl
, bc, coreutils, which, libsndfile, pkg-config
, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
, bc, coreutils, which, libsndfile, pkg-config, libxcb
}:
stdenv.mkDerivation rec {
pname = "faustlive";
version = "unstable-dev-2020-08-03";
version = "2.5.5";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faustlive";
rev = "c16565dc1b616ac0aad7c303c1997fa9e57177ab";
sha256 = "1ys661lp1xwz21vy12kwkg248jvjq1z9w433knkh0ldyy2igvmd5";
rev = version;
sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9";
fetchSubmodules = true;
};
nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ];
buildInputs = [
llvm qt48Full qrencode libmicrohttpd_0_9_70 libjack2 alsaLib faust curl
bc coreutils which libsndfile pkg-config
llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsaLib faust curl
bc coreutils which libsndfile libxcb
];
makeFlags = [ "PREFIX=$(out)" ];
@ -39,5 +41,6 @@ stdenv.mkDerivation rec {
'';
homepage = "https://faust.grame.fr/";
license = licenses.gpl3;
maintainers = with maintainers; [ magnetophon ];
};
}

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "gwc";
version = "0.22-04";
version = "0.22-05";
src = fetchFromGitHub {
owner = "AlisterH";
repo = pname;
rev = version;
sha256 = "0xvfra32dchnnyf9kj5s5xmqhln8jdrc9f0040hjr2dsb58y206p";
sha256 = "sha256-FHKu5qAyRyMxXdWYTCeAc6Q4J+NOaU1SGgoTbe0PiFE=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,35 @@
{ lib
, rustPlatform
, fetchFromGitHub
, gtk3
, openssl
, alsaLib
, pkg-config
, ffmpeg
}:
rustPlatform.buildRustPackage rec {
pname = "songrec";
version = "0.1.8";
src = fetchFromGitHub {
owner = "marin-m";
repo = pname;
rev = version;
sha256 = "sha256-6siGLegNgvLdP7engwpKmhzWYqBXcMsfaXhJJ1tIqJg=";
};
cargoSha256 = "sha256-H4qJYcFjip71EVTGw50goj0HjKN9fmjQZqQDhaSKlaQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsaLib gtk3 openssl ffmpeg ];
meta = with lib; {
description = "An open-source Shazam client for Linux, written in Rust";
homepage = "https://github.com/marin-m/SongRec";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ tcbravo ];
};
}

View file

@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
# this is what upstream calls the package, see:
# https://github.com/ryukau/LV2Plugins#uhhyou-plugins-lv2
pname = "uhhyou.lv2";
version = "unstable-2020-07-31";
version = "unstable-2021-02-08";
src = fetchFromGitHub {
owner = "ryukau";
repo = "LV2Plugins";
rev = "6189be67acaeb95452f8adab73a731d94a7b6f47";
rev = "df67460fc344f94db4306d4ee21e4207e657bbee";
fetchSubmodules = true;
sha256 = "049gigx2s89z8vf17gscs00c150lmcdwya311nbrwa18fz4bx242";
sha256 = "1a23av35cw26zgq93yzmmw35084hsj29cb7sb04j2silv5qisila";
};
nativeBuildInputs = [ pkg-config python3 ];
@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
prePatch = ''
patchShebangs generate-ttl.sh
cp patch/NanoVG.cpp lib/DPF/dgl/src/NanoVG.cpp
patchShebangs generate-ttl.sh patch.sh patch/apply.sh
'';
enableParallelBuilding = true;
@ -41,6 +40,7 @@ stdenv.mkDerivation rec {
description = "Audio plugins for Linux";
longDescription = ''
Plugin List:
- CollidingCombSynth
- CubicPadSynth
- EnvelopedSine
- EsPhaser

View file

@ -0,0 +1,39 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
version = "0.1.2";
src = fetchFromGitHub {
owner = "accumulator";
repo = pname;
rev = "v${version}";
sha256 = "1m1ic69aj2vlnjlp4ckan8n67r01nfysvq4w6nny32wjkr0zvphr";
};
propagatedBuildInputs = with python3Packages; [
aiorpcx
colorama
googleapis-common-protos
grpcio
protobuf
six
termcolor
];
postInstall = ''
install README.md charge.config.example -Dt $out/share/doc/charge-lnd
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/charge-lnd --help > /dev/null
'';
meta = with lib; {
description = "Simple policy-based fee manager for lightning network daemon";
homepage = "https://github.com/accumulator/charge-lnd";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ mmilata ];
};
}

View file

@ -0,0 +1,26 @@
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "avell-unofficial-control-center";
version = "1.0.4";
src = fetchFromGitHub {
owner = "rodgomesc";
repo = "avell-unofficial-control-center";
# https://github.com/rodgomesc/avell-unofficial-control-center/issues/58
rev = "e32e243e31223682a95a719bc58141990eef35e6";
sha256 = "1qz1kv7p09nxffndzz9jlkzpfx26ppz66f8603zyamjq9dqdmdin";
};
# No tests included
doCheck = false;
propagatedBuildInputs = with python3Packages; [ pyusb elevate ];
meta = with lib; {
homepage = "https://github.com/rodgomesc/avell-unofficial-control-center";
description = "Software for controlling RGB keyboard lights on some gaming laptops that use ITE Device(8291) Rev 0.03";
license = licenses.mit;
maintainers = with maintainers; [ rkitover ];
};
}

View file

@ -0,0 +1,34 @@
{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline }:
stdenv.mkDerivation rec {
pname = "clifm";
version = "1.1";
src = fetchFromGitHub {
owner = "leo-arch";
repo = pname;
rev = "v${version}";
sha256 = "0mf9lrq0l532vyf4ycsikrw8imn4gkavyn3cr42nhjsr1drygrp8";
};
buildInputs = [ libcap acl file readline ];
makeFlags = [
"INSTALLPREFIX=${placeholder "out"}/bin"
"DESKTOPPREFIX=${placeholder "out"}/share"
];
preInstall = ''
mkdir -p $out/bin $out/share
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://github.com/leo-arch/clifm";
description = "CliFM is a CLI-based, shell-like, and non-curses terminal file manager written in C: simple, fast, extensible, and lightweight as hell";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ vonfry ];
platforms = platforms.unix;
};
}

View file

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config }:
{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils }:
mkDerivation rec {
pname = "openrgb";
@ -15,11 +15,18 @@ mkDerivation rec {
buildInputs = [ libusb1 hidapi ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp openrgb $out/bin
substituteInPlace 60-openrgb.rules \
--replace /bin/chmod "${coreutils}/bin/chmod"
mkdir -p $out/etc/udev/rules.d
cp 60-openrgb.rules $out/etc/udev/rules.d
runHook postInstall
'';
doInstallCheck = true;
@ -27,13 +34,11 @@ mkDerivation rec {
HOME=$TMPDIR $out/bin/openrgb --help > /dev/null
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Open source RGB lighting control";
homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB";
maintainers = with maintainers; [ jonringer ];
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,27 @@
{ lib, stdenv, fetchFromGitHub, conf ? null }:
stdenv.mkDerivation rec {
pname = "sfm";
version = "0.1";
src = fetchFromGitHub {
owner = "afify";
repo = pname;
rev = "v${version}";
hash = "sha256-i4WzYaJKityIt+LPWCbd6UsPBaYoaS397l5BInOXQQA=";
};
configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf);
postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h";
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Simple file manager";
homepage = "https://github.com/afify/sfm";
license = licenses.isc;
platforms = platforms.unix;
maintainers = with maintainers; [ sikmir ];
};
}

View file

@ -3,7 +3,7 @@
, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
}:
@ -23,6 +23,7 @@ in stdenv.mkDerivation rec {
libXScrnSaver
libXtst
libxcb
libxshmfence
mesa
nss
wrapGAppsHook

View file

@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.123";
version = "0.0.124";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch";
sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91";
};
};
}.${branch}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "matrix-commander";
version = "unstable-2021-04-18";
version = "unstable-2021-05-26";
src = fetchFromGitHub {
owner = "8go";
repo = "matrix-commander";
rev = "3e89a5f4c98dd191880ae371cc63eb9282d7d91f";
sha256 = "08nwwszp1kv5b7bgf6mmfn42slxkyhy98x18xbn4pglc4bj32iql";
rev = "06b4738bc74ee86fb3ac88c04b8230abf82e7421";
sha256 = "1skpq3xfnz11m298qnsw68xv391p5qg47flagzsk86pnzi841vc1";
};
buildInputs = [
@ -35,7 +35,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Simple but convenient CLI-based Matrix client app for sending and receiving";
homepage = "https://github.com/8go/matrix-commander";
license = licenses.gpl3Only;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.seb314 ];
};

View file

@ -0,0 +1,37 @@
{ lib, buildGoModule, fetchFromSourcehut, installShellFiles, scdoc }:
buildGoModule rec {
pname = "senpai";
version = "unstable-2021-05-27";
src = fetchFromSourcehut {
owner = "~taiite";
repo = "senpai";
rev = "6be718329175c6d11e359f1a366ab6ab22b101d2";
sha256 = "sha256-hW6DHJlDBYEqK8zj5PvGKU54sbeXjx1tdqwKXPXlKHc=";
};
vendorSha256 = "sha256-OLi5y1hrYK6+l5WB1SX85QU4y3KjFyGaEzgbE6lnW2k=";
subPackages = [
"cmd/senpai"
];
nativeBuildInputs = [
scdoc
installShellFiles
];
postInstall = ''
scdoc < doc/senpai.1.scd > doc/senpai.1
scdoc < doc/senpai.5.scd > doc/senpai.5
installManPage doc/senpai.*
'';
meta = with lib; {
description = "Your everyday IRC student";
homepage = "https://ellidri.org/senpai";
license = licenses.isc;
maintainers = with maintainers; [ malvo ];
};
}

View file

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "2.36";
version = "2.50";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
sha256 = "sha256-BVn+mV5SjyODcT+O8LXfGA42/Si5+GrdkjP0tAPiuTM=";
sha256 = "sha256-ai8/XryFw/7GYuWAmLkqHzK97QgTBPyE6m3dflck94w=";
};
vendorSha256 = "sha256-qdgnoh+53o3idCfpkEFGK88aUVb2F6oHlSRZncs2hyY=";
vendorSha256 = "sha256-gJQDcACMWZWS4CgS2NDALoBzxu7Hh4ZW3f0gUFUALCM=";
subPackages = [ "weed" ];
@ -26,7 +26,7 @@ buildGoModule rec {
meta = with lib; {
description = "Simple and highly scalable distributed file system";
homepage = "https://github.com/chrislusf/seaweedfs";
maintainers = [ maintainers.raboof ];
maintainers = with maintainers; [ cmacrae raboof ];
license = licenses.asl20;
};
}

View file

@ -1,5 +1,5 @@
diff --git a/src/services/log.js b/src/services/log.js
index b4c39e99..4c249154 100644
index 1345ce39..a9770516 100644
--- a/src/services/log.js
+++ b/src/services/log.js
@@ -1,14 +1,5 @@
@ -17,7 +17,7 @@ index b4c39e99..4c249154 100644
const SECOND = 1000;
const MINUTE = 60 * SECOND;
const HOUR = 60 * MINUTE;
@@ -16,41 +7,7 @@ const DAY = 24 * HOUR;
@@ -16,45 +7,7 @@ const DAY = 24 * HOUR;
const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n';
@ -46,16 +46,19 @@ index b4c39e99..4c249154 100644
-function checkDate(millisSinceMidnight) {
- if (millisSinceMidnight >= DAY) {
- initLogFile();
-
- millisSinceMidnight =- DAY;
- }
-
- return millisSinceMidnight;
-}
-
function log(str) {
- const millisSinceMidnight = Date.now() - todaysMidnight.getTime();
- let millisSinceMidnight = Date.now() - todaysMidnight.getTime();
-
- checkDate(millisSinceMidnight);
- millisSinceMidnight = checkDate(millisSinceMidnight);
-
- logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE);
-
console.log(str);
}

View file

@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
version = "0.47.3";
version = "0.47.4";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
sha256 = "05l8yiqbqh2yr4cfbivpmj5q3jyzqz86wni36wcjlcg3rccms0hc";
sha256 = "0hvp6rpvgda12ficzqkj7kllgmpzc8n4rvpgv0zi6fa5alkr944x";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
sha256 = "03nsvalaa0rch9i1kh6p5ynnsdmidm5zrw42klj70bamviklzsnh";
sha256 = "01bbg7ssszrq27zk7xzil2mawk1659h1hw68yvk8lbgc4n9phkqk";
};
in {

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "verilator";
version = "4.110";
version = "4.202";
src = fetchurl {
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
sha256 = "sha256-Rxb+AFhmGinWtZyvjnRxsu3b3tbtRO3njcHGUJTs/sw=";
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
sha256 = "0ydn4304pminzq8zc1hsrb2fjrfqnb6akr45ky43jd29c4jgznnq";
};
enableParallelBuilding = true;

View file

@ -0,0 +1,33 @@
{ stdenv, lib, cmake, fetchFromGitHub
, wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects
}:
stdenv.mkDerivation rec {
pname = "graphia";
version = "2.2";
src = fetchFromGitHub {
owner = "graphia-app";
repo = "graphia";
rev = version;
sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [
qtbase
qtquickcontrols2
qtgraphicaleffects
];
meta = with lib; {
description = "A visualisation tool for the creation and analysis of graphs.";
homepage = "https://graphia.app";
license = licenses.gpl3Only;
maintainers = [ maintainers.bgamari ];
platforms = platforms.all;
};
}

View file

@ -2,6 +2,7 @@
, rustPlatform
, lib
, fetchFromGitHub
, ncurses
, pkg-config
, fontconfig
, python3
@ -68,6 +69,8 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
outputs = [ "out" "terminfo" ];
postPatch = ''
echo ${version} > .tag
'';
@ -78,10 +81,17 @@ rustPlatform.buildRustPackage rec {
pkg-config
python3
perl
ncurses
];
buildInputs = runtimeDeps;
postInstall = ''
mkdir -p $terminfo/share/terminfo/w $out/nix-support
tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
'';
preFixup = lib.optionalString stdenv.isLinux ''
for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do
patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU
, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev
, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev, libjack2
}:
let
fullPath = lib.makeLibraryPath [
@ -18,6 +18,7 @@ let
openssl
libuuid
alsaLib
libjack2
udev
];

View file

@ -0,0 +1,39 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, oscSupport ? false
}:
stdenvNoCC.mkDerivation rec {
pname = "mpv-playlistmanager";
version = "unstable-2020-02-11";
src = fetchFromGitHub {
owner = "jgreco";
repo = "mpv-youtube-quality";
rev = "1f8c31457459ffc28cd1c3f3c2235a53efad7148";
sha256 = "voNP8tCwCv8QnAZOPC9gqHRV/7jgCAE63VKBd/1s5ic=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/mpv/scripts
cp youtube-quality.lua $out/share/mpv/scripts
'' + lib.optionalString oscSupport ''
cp youtube-quality-osc.lua $out/share/mpv/scripts
'' + ''
runHook postInstall
'';
passthru.scriptName = "youtube-quality.lua";
meta = with lib; {
description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";
homepage = "https://github.com/jgreco/mpv-youtube-quality";
license = licenses.unfree;
platforms = platforms.all;
maintainers = with maintainers; [ lunik1 ];
};
}

View file

@ -43,7 +43,6 @@ const gchar *create_tmpdir() {
void pivot_host(const gchar *guest) {
g_autofree gchar *point = g_build_filename(guest, "host", NULL);
fail_if(g_mkdir(point, 0755));
fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0));
fail_if(pivot_root(guest, point));
}
@ -122,6 +121,9 @@ int main(gint argc, gchar **argv) {
fail("unshare", unshare_errno);
}
// hide all mounts we do from the parent
fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0));
if (uid != 0) {
spit("/proc/self/setgroups", "deny");
spit("/proc/self/uid_map", "%d %d 1", uid, uid);

View file

@ -12,6 +12,8 @@
, mimeType ? null
, categories ? null
, startupNotify ? null
, noDisplay ? null
, prefersNonDefaultGPU ? null
, extraDesktopEntries ? { } # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values
, extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections
, fileValidation ? true # whether to validate resulting desktop file.
@ -35,6 +37,8 @@ let
"MimeType" = nullableToString mimeType;
"Categories" = nullableToString categories;
"StartupNotify" = nullableToString startupNotify;
"NoDisplay" = nullableToString noDisplay;
"PrefersNonDefaultGPU" = nullableToString prefersNonDefaultGPU;
} // extraDesktopEntries;
# Map all entries to a list of lines

View file

@ -49,6 +49,7 @@
, webkitgtk
, vte
, glib-networking
, qemu-utils
}:
stdenv.mkDerivation rec {
@ -120,7 +121,7 @@ stdenv.mkDerivation rec {
];
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio ]}")
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}")
'';
postPatch = ''

View file

@ -147,6 +147,10 @@ stdenv.mkDerivation rec {
mkdir -p $out/nix-support
echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
# Set the host compiler to be used by nvcc for CMake-based projects:
# https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
echo "cmakeFlags+=' -DCUDA_HOST_COMPILER=${gcc}/bin'" >> $out/nix-support/setup-hook
# Move some libraries to the lib output so that programs that
# depend on them don't pull in this entire monstrosity.
mkdir -p $lib/lib

View file

@ -0,0 +1,22 @@
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "passerine";
version = "0.9.2";
src = fetchFromGitHub {
owner = "vrtbl";
repo = "passerine";
rev = "dd8a6f5efc5dcb03d45b102f61cc8a50d46e8e98";
sha256 = "sha256-/QzqKLkxAVqvTY4Uft1qk7nJat6nozykB/4X1YGqu/I=";
};
cargoSha256 = "sha256-8WiiDLIJ/abXELF8S+4s+BPA/Lr/rpKmC1NWPCLzQWA=";
meta = with lib; {
description = "A small extensible programming language designed for concise expression with little code";
homepage = "https://github.com/vrtbl/passerine";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
};
}

View file

@ -1,25 +1,36 @@
{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls
, libgcrypt, libtasn1, glib, libplist, libusbmuxd }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, libtool
, pkg-config
, gnutls
, libgcrypt
, libtasn1
, glib
, libplist
, libusbmuxd
}:
stdenv.mkDerivation rec {
pname = "libimobiledevice";
version = "1.3.0";
version = "unstable-2021-06-02";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "1jkq3hpg4n5a6s1k618ib0s80pwf00nlfcby7xckysq8mnd2pp39";
rev = "ca324155f8b33babf907704828c7903608db0aa2";
sha256 = "sha256-Q7THwld1+elMJQ14kRnlIJDohFt7MW7JeyIUGC0k52I=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
autoconf
automake
autoreconfHook
libtool
pkg-config
];
propagatedBuildInputs = [
glib
gnutls
@ -29,12 +40,7 @@ stdenv.mkDerivation rec {
libusbmuxd
];
preConfigure = "NOCONFIGURE=1 ./autogen.sh";
configureFlags = [
"--disable-openssl"
"--without-cython"
];
configureFlags = [ "--disable-openssl" "--without-cython" ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/libimobiledevice";

View file

@ -173,7 +173,7 @@ with super;
MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql";
};
buildInputs = [
pkgs.mysql.client
pkgs.mariadb.client
pkgs.libmysqlclient
];
});

View file

@ -0,0 +1,35 @@
{ lib, fetchPypi, buildPythonPackage, fetchpatch, setuptools-scm }:
buildPythonPackage rec {
pname = "elevate";
version = "0.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "53ad19fa1de301fb1de3f8768fb3a5894215716fd96a475690c4d0ff3b1de209";
};
patches = [
(fetchpatch {
# This is for not calling shell wrappers through Python, which fails.
url = "https://github.com/rkitover/elevate/commit/148b2bf698203ea39c9fe5d635ecd03cd94051af.patch";
sha256 = "1ky3z1jxl1g28wbwbx8qq8jgx8sa8pr8s3fdcpdhdx1blw28cv61";
})
];
nativeBuildInputs = [
setuptools-scm
];
# No tests included
doCheck = false;
pythonImportsCheck = [ "elevate" ];
meta = with lib; {
description = "Python module for re-launching the current process as super-user";
homepage = "https://github.com/barneygale/elevate";
license = licenses.mit;
maintainers = with maintainers; [ rkitover ];
};
}

View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "haversine";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "mapado";
repo = pname;
rev = "v${version}";
sha256 = "1c3yf9162b2b7l1lsw3ffd1linnc542qvljpgwxp6y5arrmljqnv";
sha256 = "sha256-1PXPsZd/4pN42TU0lhXWsmyX7uGP1n/xna2cVZPczB4=";
};
checkInputs = [

View file

@ -14,22 +14,16 @@
buildPythonPackage rec {
pname = "influxdb-client";
version = "1.15.0";
disabled = pythonOlder "3.6"; # requires python version >=3.6
version = "1.17.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
sha256 = "1b2xh78v965rgafyj7cdbjm2p96d74f7ifsqllc7242n9wv3k53q";
sha256 = "1xxg8z9zambbhr7nmxhmvmiwkd4578zxr6rl2vhdh2w77idsw29z";
};
# makes test not reproducible
postPatch = ''
sed -i -e '/randomize/d' test-requirements.txt
'';
propagatedBuildInputs = [
rx
certifi
@ -44,6 +38,8 @@ buildPythonPackage rec {
# requires influxdb server
doCheck = false;
pythonImportsCheck = [ "influxdb_client" ];
meta = with lib; {
description = "InfluxDB 2.0 Python client library";
homepage = "https://github.com/influxdata/influxdb-client-python";

View file

@ -1,29 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, isPy3k
, pythonOlder
, setuptools
, aenum
, pytest
, pytestcov
, pytest
}:
buildPythonPackage rec {
pname = "pglast";
version = "1.17";
version = "3.0";
src = fetchPypi {
inherit pname version;
sha256 = "2979b38ca5f72cfa0a5db78af2f62d04db6a7647ee7f03eac7a67f9e86e3f5f9";
# PyPI tarball does not include all the required files
src = fetchFromGitHub {
owner = "lelit";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0yi24wj19rzw5dvppm8g3hnfskyzbrqw14q8x9f2q5zi8g6xnnrd";
};
disabled = !isPy3k;
propagatedBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.6") [ aenum ];
propagatedBuildInputs = [ setuptools ];
checkInputs = [ pytest pytestcov ];
pythonImportsCheck = [ "pglast" ];
checkPhase = ''
pytest
'';
@ -31,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/lelit/pglast";
description = "PostgreSQL Languages AST and statements prettifier";
changelog = "https://github.com/lelit/pglast/raw/v${version}/CHANGES.rst";
license = licenses.gpl3Plus;
maintainers = [ maintainers.marsam ];
};

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "userpath";
version = "1.5.0";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
sha256="0fj2lj9vcns5sxv72v3ggrszcl7j1jd9a6ycnsl00218nycliy31";
sha256="1xpgdmdvhmmmdlivsqlzx1xvyj0gcnfp0j2ba5izmv3q2k5abfdj";
};
propagatedBuildInputs = [ click ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
version = "0.28.1";
version = "0.29.0";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "0bx6y1y6cfqz77m23w4ab1j2i7s83kv301razv9rkkyxpnpb16hi";
sha256 = "1ciwr2bwbxnw8366wvgl5ga3y2qj46i0h3yp3av1x9n2r8rddrlh";
};
vendorSha256 = "0rfbjhi78qcaghn9xw658xcxl2x4ln4gnnyi9hsf3wz4cbybird7";
vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk";
doCheck = false;
@ -20,7 +20,7 @@ buildGoModule rec {
meta = with lib; {
description = "Terraform linter focused on possible errors, best practices, and so on";
homepage = "https://github.com/terraform-linters/tflint";
changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/terraform-linters/tflint/raw/v${version}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = [ maintainers.marsam ];
};

View file

@ -13,6 +13,19 @@ buildGoModule rec {
vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g=";
buildFlagsArray = ''
-ldflags=
-s -w
-X main.Version=v${version}
-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}
-extldflags -static
'';
BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork";
preBuild = ''
makeFlagsArray+=(BUILD_TAGS="${BUILDTAGS}")
'';
postInstall = ''
mv $out/bin/debugger $out/bin/earthly-debugger
mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater

View file

@ -0,0 +1,191 @@
{ lib, stdenv, fetchzip, fetchurl, fetchFromGitHub, buildFHSUserEnv
, runCommandNoCC, makeDesktopItem, copyDesktopItems, gcc, cmake, gmp
, libGL, zlib, ncurses, geoip, lua5, nettle, curl, SDL2, freetype, glew
, openal, libopus, opusfile, libogg, libvorbis, libjpeg, libwebp, libpng
, cacert, aria2 # to download assets
}:
let
version = "0.52.0";
binary-deps-version = "5";
src = fetchFromGitHub {
owner = "Unvanquished";
repo = "Unvanquished";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1acda1559q6zwmhg3x00nai88hy83i5hcfli2bqfab7slr95lm27";
};
unvanquished-binary-deps = stdenv.mkDerivation rec {
# DISCLAIMER: this is selected binary crap from the NaCl SDK
name = "unvanquished-binary-deps";
version = binary-deps-version;
src = fetchzip {
url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2";
sha256 = "08bpyavbh5lmyprvqqi59gnm8s1fjmlk9f1785wlv7f52d9f9z1p";
};
dontPatchELF = true;
preFixup = ''
# We are not using the autoPatchelfHook, because it would make
# nacl_bootstrap_helper unable to load nacl_loader:
# "nacl_loader: ELF file has unreasonable e_phnum=13"
interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")"
for f in pnacl/bin/*; do
if [ -f "$f" && -x "$f" ]; then
echo "Patching $f"
patchelf --set-interpreter "$interpreter" "$f"
fi
done
'';
preCheck = "pnacl/bin/clang -v"; # check it links correctly
installPhase = ''
runHook preInstall
mkdir -p $out
cp -R ./* $out/
runHook postInstall
'';
};
libstdcpp-preload-for-unvanquished-nacl = stdenv.mkDerivation {
name = "libstdcpp-preload-for-unvanquished-nacl";
buildCommand = ''
mkdir $out/etc -p
echo ${gcc.cc.lib}/lib/libstdc++.so.6 > $out/etc/ld-nix.so.preload
'';
propagatedBuildInputs = [ gcc.cc.lib ];
};
fhsEnv = buildFHSUserEnv {
name = "unvanquished-fhs-wrapper";
targetPkgs = pkgs: [ libstdcpp-preload-for-unvanquished-nacl ];
};
wrapBinary = binary: wrappername: ''
cat > $out/lib/${binary}-wrapper <<-EOT
#!/bin/sh
exec $out/lib/${binary} -pakpath ${unvanquished-assets} "\$@"
EOT
chmod +x $out/lib/${binary}-wrapper
cat > $out/bin/${wrappername} <<-EOT
#!/bin/sh
exec ${fhsEnv}/bin/unvanquished-fhs-wrapper $out/lib/${binary}-wrapper "\$@"
EOT
chmod +x $out/bin/${wrappername}
'';
unvanquished-assets = stdenv.mkDerivation {
pname = "unvanquished-assets";
inherit version src;
outputHash = "sha256:1fy85cjnjk9rrqkhgx5701inff2yv14hnxglzx3209c553gn31n7";
outputHashMode = "recursive";
nativeBuildInputs = [ aria2 cacert ];
buildCommand = "bash $src/download-paks $out";
};
# this really is the daemon game engine, the game itself is in the assets
in stdenv.mkDerivation rec {
pname = "unvanquished";
inherit version src binary-deps-version;
preConfigure = ''
mkdir daemon/external_deps/linux64-${binary-deps-version}/
cp -r ${unvanquished-binary-deps}/* daemon/external_deps/linux64-${binary-deps-version}/
chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/
'';
nativeBuildInputs = [ cmake unvanquished-binary-deps copyDesktopItems ];
buildInputs = [
gmp
libGL
zlib
ncurses
geoip
lua5
nettle
curl
SDL2
freetype
glew
openal
libopus
opusfile
libogg
libvorbis
libjpeg
libwebp
libpng
];
cmakeFlags = [
"-DBUILD_CGAME=NO"
"-DBUILD_SGAME=NO"
"-DUSE_HARDENING=TRUE"
"-DUSE_LTO=TRUE"
];
desktopItems = [
(makeDesktopItem {
name = "net.unvanquished.Unvanquished.desktop";
desktopName = "Unvanquished";
comment = "FPS/RTS Game - Aliens vs. Humans";
icon = "unvanquished";
terminal = false;
exec = "unvanquished";
categories = "Game;ActionGame;StrategyGame;";
# May or may not work
prefersNonDefaultGPU = true;
fileValidation = false; # it doesn't like PrefersNonDefaultGPU
# yes, PrefersNonDefaultGPU is standard:
# https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
})
(makeDesktopItem {
name = "net.unvanquished.UnvanquishedProtocolHandler.desktop";
desktopName = "Unvanquished (protocol handler)";
noDisplay = true;
terminal = false;
exec = "unvanquished -connect %u";
mimeType = "x-scheme-handler/unv";
# May or may not work
prefersNonDefaultGPU = true;
fileValidation = false; # it doesn't like PrefersNonDefaultGPU
})
];
installPhase = ''
runHook preInstall
for f in daemon daemon-tty daemonded nacl_loader nacl_helper_bootstrap; do
install -Dm0755 -t $out/lib/ $f
done
install -Dm0644 -t $out/lib/ irt_core-x86_64.nexe
mkdir $out/bin/
${wrapBinary "daemon" "unvanquished"}
${wrapBinary "daemon-tty" "unvanquished-tty"}
${wrapBinary "daemonded" "unvanquished-server"}
for d in ${src}/dist/icons/*; do
install -Dm0644 -t $out/share/icons/hicolor/$(basename $d)/apps/ $d/unvanquished.png
done
runHook postInstall
'';
meta = {
platforms = [ "x86_64-linux" ];
homepage = "https://unvanquished.net/";
downloadPage = "https://unvanquished.net/download/";
description = "A fast paced, first person strategy game";
maintainers = with lib.maintainers; [ afontain ];
# don't replace the following lib.licenses.zlib with just "zlib",
# or you would end up with the package instead
license = with lib.licenses; [
mit gpl3Only lib.licenses.zlib cc-by-sa-25
];
};
}

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "betterlockscreen";
version = "3.1.1";
version = "3.2.0";
src = fetchFromGitHub {
owner = "pavanjadhaw";
repo = "betterlockscreen";
rev = version;
sha256 = "sha256-TA4YSd/elFuLU1ZMu+dqIOt6hK9pnzgoJudaMpIwh+U=";
sha256 = "sha256-UOMCTHtw1C+MiJL6AQ+8gqmmbqrs1QTzEi1Ar03PyMs=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -0,0 +1,27 @@
{ lib, stdenv, fetchFromGitHub, pciutils, cmake }:
stdenv.mkDerivation rec {
pname = "ryzenadj";
version = "0.8.2";
src = fetchFromGitHub {
owner = "FlyGoat";
repo = "RyzenAdj";
rev = "v${version}";
sha256 = "182l9nchlpl4yr568n86086glkr607rif92wnwc7v3aym62ch6ld";
};
nativeBuildInputs = [ pciutils cmake ];
installPhase = ''
install -D libryzenadj.so $out/lib/libryzenadj.so
install -D ryzenadj $out/bin/ryzenadj
'';
meta = with lib; {
description = "Adjust power management settings for Ryzen Mobile Processors.";
homepage = "https://github.com/FlyGoat/RyzenAdj";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ asbachb ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
version = "0.18.225";
version = "0.18.231";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "sha256-EvFu+v1Ltot5zuDWcuG8Z00NHjWjZTrI0JKv+rgVB7U=";
sha256 = "sha256-fl0M4Emstp21CrrE4Znzwi1XvTzx6TpPnNKYM65aoN4=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -46,8 +46,13 @@ import ./versions.nix ({ version, sha256 }:
'';
installPhase = ''
mkdir -p $out/sbin
install -Dm0644 src/go/conf/zabbix_agent2.conf $out/etc/zabbix_agent2.conf
install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2
# create a symlink which is compatible with the zabbixAgent module
ln -s $out/bin/zabbix_agent2 $out/sbin/zabbix_agentd
'';
meta = with lib; {

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "unpackerr";
version = "0.9.4";
version = "0.9.6";
src = fetchFromGitHub {
owner = "davidnewhall";
repo = "unpackerr";
rev = "v${version}";
sha256 = "0ss12i8bclz1q9jgr54shvs8zgcs6jrwdm1vj9gvycyd5sx4717s";
sha256 = "1jyqrfik6fy7d4lr1y0ryp4iz8yn898ksyxwaryvrhykznqivp0y";
};
vendorSha256 = "1j79vmf0mkwkqrg5j6fm2b8y3a23y039kbiqkiwb56724bmd27dd";
vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];

View file

@ -159,13 +159,6 @@ let
inherit lib config stdenv;
}) mkDerivation;
# Slated for removal in 21.11
lib = if config.allowAliases or true then builtins.trace
( "Warning: `stdenv.lib` is deprecated and will be removed in the next release."
+ " Please use `lib` instead."
+ " For more information see https://github.com/NixOS/nixpkgs/issues/108938")
lib else throw "`stdenv.lib` is a deprecated alias for `lib`";
inherit fetchurlBoot;
inherit overrides;

View file

@ -2,23 +2,19 @@
python3Packages.buildPythonApplication rec {
pname = "borgmatic";
version = "1.5.12";
version = "1.5.13";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "sha256-XLbBJvNRmH8W9SnOjF7zUbazRYFCMW6SEO2wKN/2VTY=";
sha256 = "12390ffdg30ncc5k92pvagwbvnsh42xl35a3nagbskznyfd23mw3";
};
checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];
# - test_borgmatic_version_matches_news_version
# The file NEWS not available on the pypi source, and this test is useless
# - test_collect_configuration_run_summary_logs_outputs_merged_json_results
# Upstream fixed in the next version, see
# https://github.com/witten/borgmatic/commit/ea6cd53067435365a96786b006aec391714501c4
disabledTests = [
"test_borgmatic_version_matches_news_version"
"test_collect_configuration_run_summary_logs_outputs_merged_json_results"
];
propagatedBuildInputs = with python3Packages; [

View file

@ -0,0 +1,48 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, bash
, makeWrapper
, bc
, jq
, wimlib
, file
, syslinux
, busybox
, gnugrep # We can't use busybox's 'grep' as it doesn't support perl '-P' expressions.
}:
stdenvNoCC.mkDerivation rec {
pname = "bootiso";
version = "4.2.0";
src = fetchFromGitHub {
owner = "jsamr";
repo = pname;
rev = "v${version}";
sha256 = "1l09d543b73r0wbpsj5m6kski8nq48lbraq1myxhidkgl3mm3d5i";
};
strictDeps = true;
buildInputs = [ bash ];
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
patchShebangs --host bootiso
'';
makeFlags = [ "prefix=${placeholder "out"}" ];
postInstall = ''
wrapProgram $out/bin/bootiso \
--prefix PATH : ${lib.makeBinPath [ bc jq wimlib file syslinux gnugrep busybox ]} \
--prefix BOOTISO_SYSLINUX_LIB_ROOT : ${syslinux}/share/syslinux
'';
meta = with lib; {
description = "Script for securely creating a bootable USB device from one image file";
homepage = "https://github.com/jsamr/bootiso";
license = licenses.gpl3;
maintainers = with maintainers; [ musfay ];
platforms = platforms.all;
};
}

View file

@ -31,13 +31,13 @@ with rec {
gccStdenv.mkDerivation rec {
pname = "astc-encoder";
version = "2.5";
version = "3.0";
src = fetchFromGitHub {
owner = "ARM-software";
repo = "astc-encoder";
rev = version;
sha256 = "0ff5jh40w942dz7hmgvznmpa9yhr1j4i9qqj5wy6icm2jb9j4pak";
sha256 = "sha256-+vYEO2zS144ZuVN8b4/EpvTcakC9U0uc/eV4pB7lHiY=";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,7 +1,6 @@
{
lib,
stdenv,
clangStdenv,
fetchFromGitHub,
opencl-headers,
cmake,
@ -17,13 +16,9 @@
openssl,
pkg-config,
cli11
}@args:
}:
# Note that this requires clang < 9.0 to build, and currently
# clangStdenv provides clang 7.1 which satisfies the requirement.
let stdenv = if cudaSupport then clangStdenv else args.stdenv;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "ethminer";
version = "0.19.0";
@ -43,9 +38,11 @@ in stdenv.mkDerivation rec {
"-DAPICORE=ON"
"-DETHDBUS=OFF"
"-DCMAKE_BUILD_TYPE=Release"
] ++ lib.optionals (!cudaSupport) [
] ++ (if cudaSupport then [
"-DCUDA_PROPAGATE_HOST_FLAGS=off"
] else [
"-DETHASHCUDA=OFF" # on by default
];
]);
nativeBuildInputs = [
cmake
@ -81,6 +78,5 @@ in stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ atemu ];
license = licenses.gpl3Only;
broken = cudaSupport;
};
}

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "mmv";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "rrthomas";
repo = "mmv";
rev = "v${version}";
sha256 = "sha256-MmxDk3PBtvK/thrh6x67M+nMdCDlOQQHkREqLmzF2Mk=";
sha256 = "sha256-3XWXOp30P/bOd+c7PC8duidewX8h0hk9VsEUw05dAE4=";
fetchSubmodules = true;
};

View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }:
let
version = "1.2021.6";
version = "1.2021.7";
src = fetchFromGitHub {
owner = "plantuml";
repo = "plantuml-server";
rev = "v${version}";
sha256 = "sha256:1v69vabdq9pv75wzb6n5s198iy5ijfcx6lgjqwxz7n5ns3blf6sz";
sha256 = "sha256-kY7b3ocm1zudGIf72MNMZDUG2t2FFqucRr3kRaFv7mo=";
};
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central
@ -28,7 +28,7 @@ let
installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256:1fvir7yvg4a4dc4kiv2d5q081cygj7s2lmxj90j8zzkggyq7v8zh";
outputHash = "sha256-HzT5rBycrd48KskWKAGtkMKdCDQ8NPYADVWZh8K0ll4=";
};
in

View file

@ -1,12 +1,14 @@
{ lib, fetchurl, perlPackages, iproute2, perl }:
{ lib, fetchFromGitHub, perlPackages, iproute2, perl }:
perlPackages.buildPerlPackage rec {
pname = "ddclient";
version = "3.9.1";
src = fetchurl {
url = "mirror://sourceforge/ddclient/${pname}-${version}.tar.gz";
sha256 = "0w14qnn72j333i3j7flxkw6bzcg4n31d8jfnvhmwa7s9rharx5p4";
src = fetchFromGitHub {
owner = "ddclient";
repo = "ddclient";
rev = "v${version}";
sha256 = "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w";
};
# perl packages by default get devdoc which isn't present
@ -38,9 +40,10 @@ perlPackages.buildPerlPackage rec {
meta = with lib; {
description = "Client for updating dynamic DNS service entries";
homepage = "https://sourceforge.net/p/ddclient/wiki/Home/";
license = licenses.gpl2Plus;
homepage = "https://ddclient.net/";
license = licenses.gpl2Plus;
# Mostly since `iproute` is Linux only.
platforms = platforms.linux;
platforms = platforms.linux;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -1,19 +1,26 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoPackage rec {
buildGoModule rec {
pname = "subfinder";
version = "2.3.0";
goPackagePath = "github.com/projectdiscovery/subfinder";
version = "2.4.8";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "1vjxi2h4njakyqkfzwwaacy37kqx66j2y3k5l752z9va73gv7xv1";
sha256 = "1g1j3il1a595g7z8blhvyd5l03h6kccl7mzrx51c33jz74cms5kn";
};
goDeps = ./deps.nix;
vendorSha256 = "1jmik0zmfy1n3g4yjkskiqzd28dpywf0hw6adgz2jshlhka58iw0";
modRoot = "./v2";
subPackages = [
"cmd/subfinder/"
];
meta = with lib; {
description = "Subdomain discovery tool";

View file

@ -1,165 +0,0 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/json-iterator/go";
fetch = {
type = "git";
url = "https://github.com/json-iterator/go";
rev = "03217c3e97663914aec3faafde50d081f197a0a2";
sha256 = "1kbp9fj6fxfql0ir59zb6v68l4bpwlmk76xm8vaikw1hp6y9bcss";
};
}
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
type = "git";
url = "https://github.com/konsorten/go-windows-terminal-sequences";
rev = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e";
sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
};
}
{
goPackagePath = "github.com/logrusorgru/aurora";
fetch = {
type = "git";
url = "https://github.com/logrusorgru/aurora";
rev = "21d75270181e0436fee7bd58b991c212cf309068";
sha256 = "0vc9qdl6jzq7vazfqgz628gcgsvir56bdi2bkhl54pi92cz9cw0p";
};
}
{
goPackagePath = "github.com/m-mizutani/urlscan-go";
fetch = {
type = "git";
url = "https://github.com/m-mizutani/urlscan-go";
rev = "21d37c8d3d34d514f2ef49db9b59cc94f335e9c3";
sha256 = "1hpymd4ncp78hgpksnw8k27rp0lh832x1pyk3bhj5dm6xmh79g4c";
};
}
{
goPackagePath = "github.com/miekg/dns";
fetch = {
type = "git";
url = "https://github.com/miekg/dns";
rev = "1e224ff5dead8366ed6fcdcb832794be42e73f0e";
sha256 = "1iv9jznakz8f5swiir0z4zilr9ypavnsc0g4zi1r0vad6npy7zfl";
};
}
{
goPackagePath = "github.com/modern-go/concurrent";
fetch = {
type = "git";
url = "https://github.com/modern-go/concurrent";
rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
};
}
{
goPackagePath = "github.com/modern-go/reflect2";
fetch = {
type = "git";
url = "https://github.com/modern-go/reflect2";
rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/rs/xid";
fetch = {
type = "git";
url = "https://github.com/rs/xid";
rev = "15d26544def341f036c5f8dca987a4cbe575032c";
sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "839c75faf7f98a33d445d181f3018b5c3409a45e";
sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "221dbe5ed46703ee255b1da0dec05086f5035f62";
sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "86a70503ff7e82ffc18c7b0de83db35da4791e6a";
sha256 = "0w7ih86lmll9gs2j0z3nmmy148i2yism9z53yp58zwa6d5pjahfn";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "5ee1b9f4859acd2e99987ef94ec7a58427c53bef";
sha256 = "0jvzqv6phv64rw4pj86x3j9kp5yx9p34fd38r46rb9464h69ba29";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "ce4227a45e2eb77e5c847278dcc6a626742e2945";
sha256 = "1s43wvqfml6ml5ks7iv2bis9d664g77mq86v7mfmjhn56x856g35";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "1f64d6156d11335c3f22d9330b0ad14fc1e789ce";
sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj";
};
}
{
goPackagePath = "gopkg.in/yaml.v3";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "4206685974f28e3178b35fa198a59899aa4dee3a";
sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g";
};
}
]

View file

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.46"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.47"

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 7be6da5afc39bb736c0fb5c6c6ba245e98c0efe0
ref: refs/tags/6.0.46
revision: 6416bc1a2867938dd39705a3daef25bc5dedfd16
ref: refs/tags/6.0.47
specs:
metasploit-framework (6.0.46)
metasploit-framework (6.0.47)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@ -125,22 +125,22 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.464.0)
aws-sdk-core (3.114.0)
aws-partitions (1.465.0)
aws-sdk-core (3.114.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.239.0)
aws-sdk-ec2 (1.240.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.54.0)
aws-sdk-iam (1.55.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.43.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.95.1)
aws-sdk-s3 (1.96.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@ -149,7 +149,7 @@ GEM
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
bindata (2.4.10)
bson (4.12.0)
bson (4.12.1)
builder (3.2.4)
concurrent-ruby (1.0.5)
cookiejar (0.3.3)
@ -239,7 +239,7 @@ GEM
webrick
metasploit_payloads-mettle (1.0.9)
method_source (1.0.0)
mini_portile2 (2.5.1)
mini_portile2 (2.5.3)
minitest (5.14.4)
mqtt (0.5.0)
msgpack (1.4.2)
@ -252,7 +252,7 @@ GEM
network_interface (0.0.2)
nexpose (7.3.0)
nio4r (2.5.7)
nokogiri (1.11.6)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.21.0)
@ -352,7 +352,7 @@ GEM
ruby-macho (2.5.1)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.4)
ruby_smb (2.0.9)
ruby_smb (2.0.10)
bindata
openssl-ccm
openssl-cmac

View file

@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.46";
version = "6.0.47";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-NZksDvlcSts1u66yhJ4BpZu5lvzp5eQxV4MscU7wQ/8=";
sha256 = "sha256-lK8FtHc4VLvp6bEYAw7cqHgbjQP2RS5+XxtjaVMiVWg=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -114,40 +114,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mh8kpwwlc0s5k8yjjn6bvrrv0sqxnwpqsjsfljkjszbv1vcwksc";
sha256 = "0fs3fy6k4wmzh0z6c4rl313f5px81pj0viqxj1prksza4j7iymmi";
type = "gem";
};
version = "1.464.0";
version = "1.465.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09asbdcg96l165kq4hrks0hsk4hwr16h1qx22az4m7ld0ylvz3jc";
sha256 = "09ksnsj7jqb339fy4nh6v8zn9gy77vbyjpsiv33r35q82ivi32z2";
type = "gem";
};
version = "3.114.0";
version = "3.114.1";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0995qsi717fdvv2wkpbm0iaz666q370q1a37vn3bn6g66v20m6cy";
sha256 = "0wqrvs49nzr2n9ilbjz61ac61d4d8wwpmzfaawhhq7l4hmwm4pdr";
type = "gem";
};
version = "1.239.0";
version = "1.240.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mfs2vsiml42xskgslp4iissna5fmjacpvi6sbmlr1b5jh390f3m";
sha256 = "03vs5wf96qpjl309vnrnr4d8hy4l8bvnflgc806bm9n130cyvs9m";
type = "gem";
};
version = "1.54.0";
version = "1.55.0";
};
aws-sdk-kms = {
groups = ["default"];
@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mm96blh0515lymkwamcnv5jih36v0yykcqx4fr0wwvwmyh637zv";
sha256 = "1g46v19n6pxa60x7fih2y9zc18q23kdjkb1p2qr33zmi6cz76cc4";
type = "gem";
};
version = "1.95.1";
version = "1.96.0";
};
aws-sigv4 = {
groups = ["default"];
@ -214,10 +214,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gny4n34gwfc6x04x7vli5my6cdl90n4i0wsxm758q81hfmkqxd7";
sha256 = "0pnr0b7phdzhkw9xqhmqnw5673ndi13ks3dqwqmbxq6v0rsxiapc";
type = "gem";
};
version = "4.12.0";
version = "4.12.1";
};
builder = {
groups = ["default"];
@ -574,12 +574,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "7be6da5afc39bb736c0fb5c6c6ba245e98c0efe0";
sha256 = "1zs3y1772b43awqy9rg9zjbbk6x506g89cmfpcsxnjjwz472r69m";
rev = "6416bc1a2867938dd39705a3daef25bc5dedfd16";
sha256 = "0s2m499njqqvbxz2wign0f6iny58vh70665ix7lvnm1qfys0bbwl";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.46";
version = "6.0.47";
};
metasploit-model = {
groups = ["default"];
@ -636,10 +636,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";
type = "gem";
};
version = "2.5.1";
version = "2.5.3";
};
minitest = {
groups = ["default"];
@ -756,10 +756,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z";
sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
type = "gem";
};
version = "1.11.6";
version = "1.11.7";
};
octokit = {
groups = ["default"];
@ -1226,10 +1226,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nvvy2kq26r313ybj5sjr9mpwc1sy535kmmbi8r80kvqfkmd43nv";
sha256 = "1h8p6ksfr9xhpj9p38b4mjj76zm4d0dg06hhp00ii9hh7vy6mryd";
type = "gem";
};
version = "2.0.9";
version = "2.0.10";
};
rubyntlm = {
groups = ["default"];

View file

@ -7,15 +7,17 @@ let
in stdenv.mkDerivation rec {
pname = "oath-toolkit";
version = "2.6.6";
version = "2.6.7";
src = fetchurl {
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "0v4lrgip08b8xlivsfn3mwql3nv8hmcpzrn6pi3xp88vqwav6s7x";
sha256 = "1aa620k05lsw3l3slkp2mzma40q3p9wginspn9zk8digiz7dzv9n";
};
buildInputs = [ securityDependency ];
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Components for building one-time password authentication systems";
homepage = "https://www.nongnu.org/oath-toolkit/";

View file

@ -0,0 +1,50 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl git gnugrep nix
set -euo pipefail
nixfile='default.nix'
release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'
attr='oathToolkit'
command='oathtool --version'
color() {
printf '%s: \033[%sm%s\033[39m\n' "$0" "$1" "$2" >&2 || true
}
color 32 "downloading $release_url..."
if ! release_page=$(curl -Lf "$release_url"); then
color 31 "cannot download release page"
exit 1
fi
tarball_name=$(printf '%s\n' "$release_page" \
| grep -Po '(?<=href=").*?\.tar\.gz(?=")' \
| sort -n | tail -n1)
tarball_version="${tarball_name%.tar.*}"
tarball_version="${tarball_version##*-}"
tarball_url="mirror://savannah${release_url#https://*/releases}$tarball_name"
color 32 "nix-prefetch-url $tarball_url..."
if ! tarball_sha256=$(nix-prefetch-url --type sha256 "$tarball_url"); then
color 31 "cannot prefetch $tarball_url"
exit 1
fi
old_version=$(grep -Pom1 '(?<=version = ").*?(?=";)' "$nixfile")
version=$(printf 'version = "%s";\n' "$tarball_version")
sha256=$(printf 'sha256 = "%s";\n' "$tarball_sha256")
sed -e "s,version = .*,$version," -e "s,sha256 = .*,$sha256," -i "$nixfile"
if git diff --exit-code "$nixfile" > /dev/stderr; then
printf '\n' >&2 || true
color 32 "$tarball_version is up to date"
else
color 32 "running '$command' with nix-shell..."
nix-shell -p "callPackage ./$nixfile {}" --run "$command"
msg="$attr: $old_version -> $tarball_version"
printf '\n' >&2 || true
color 31 "$msg"
git commit -m "$msg" "$nixfile"
fi

View file

@ -3,20 +3,23 @@
mkDerivation rec {
pname = "qdigidoc";
version = "4.2.3";
version = "4.2.8";
src = fetchgit {
url = "https://github.com/open-eid/DigiDoc4-Client";
rev = "v${version}";
sha256 = "1hj49vvg8vrayr9kpz73fafa7k298hmiamkyd8c3ipy6s51xh6q4";
sha256 = "02k2s6l79ssvrksa0midm7bq856llrmq0n40yxwm3j011nvc8vsm";
fetchSubmodules = true;
};
tsl = fetchurl {
url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14";
sha256 = "0klz9blrp0jjhlr9k1i266afp44pqmii1x0y8prk0417ia3fxpli";
};
# Adds explicit imports for QPainterPath, fixed in upstream (https://github.com/open-eid/DigiDoc4-Client/pull/914)
patches = [ ./qt5.15.patch ];
nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];
postPatch = ''

View file

@ -0,0 +1,39 @@
From 1aa314f5433b9b3e89a1c05b5c465fb477435e23 Mon Sep 17 00:00:00 2001
From: Dmitri Smirnov <dmitri@smirnov.ee>
Date: Mon, 8 Mar 2021 14:15:27 +0100
Subject: [PATCH] =?UTF-8?q?Added=20explicit=20imports=20for=20QPainterPath?=
=?UTF-8?q?=20to=20fix=20builds=20with=20Qt=20=E2=89=A5=205.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Dmitri Smirnov <dmitri@smirnov.ee>
---
client/widgets/CheckBox.cpp | 1 +
client/widgets/MainAction.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/client/widgets/CheckBox.cpp b/client/widgets/CheckBox.cpp
index a03b56e5d..725d585b7 100644
--- a/client/widgets/CheckBox.cpp
+++ b/client/widgets/CheckBox.cpp
@@ -22,6 +22,7 @@
#include <QBrush>
#include <QPaintEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleOptionButton>
CheckBox::CheckBox(QWidget *parent)
diff --git a/client/widgets/MainAction.cpp b/client/widgets/MainAction.cpp
index 4cf4bb1cf..a46c193e3 100644
--- a/client/widgets/MainAction.cpp
+++ b/client/widgets/MainAction.cpp
@@ -24,6 +24,7 @@
#include <QtCore/QSettings>
#include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
#include <QtGui/QPaintEvent>
using namespace ria::qdigidoc4;

View file

@ -241,6 +241,8 @@ in
chrysalis = callPackage ../applications/misc/chrysalis { };
clifm = callPackage ../applications/misc/clifm { };
clj-kondo = callPackage ../development/tools/clj-kondo { };
cmark = callPackage ../development/libraries/cmark { };
@ -1417,6 +1419,8 @@ in
dfmt = callPackage ../tools/text/dfmt { };
diopser = callPackage ../applications/audio/diopser { };
diskonaut = callPackage ../tools/misc/diskonaut { };
diskus = callPackage ../tools/misc/diskus {
@ -1900,6 +1904,8 @@ in
blur-effect = callPackage ../tools/graphics/blur-effect { };
bootiso = callPackage ../tools/cd-dvd/bootiso { };
butane = callPackage ../development/tools/butane { };
charles = charles4;
@ -7260,6 +7266,8 @@ in
nnn = callPackage ../applications/misc/nnn { };
sfm = callPackage ../applications/misc/sfm { };
shfm = callPackage ../applications/misc/shfm { };
noise-repellent = callPackage ../applications/audio/noise-repellent { };
@ -8500,6 +8508,8 @@ in
sdl-jstest = callPackage ../tools/misc/sdl-jstest { };
senpai = callPackage ../applications/networking/irc/senpai { };
skim = callPackage ../tools/misc/skim { };
seaweedfs = callPackage ../applications/networking/seaweedfs { };
@ -9382,6 +9392,8 @@ in
untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { };
unvanquished = callPackage ../games/unvanquished { };
up = callPackage ../tools/misc/up { };
upterm = callPackage ../tools/misc/upterm { };
@ -11643,6 +11655,8 @@ in
open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { };
passerine = callPackage ../development/compilers/passerine { };
pforth = callPackage ../development/compilers/pforth {};
picat = callPackage ../development/compilers/picat { };
@ -14974,6 +14988,8 @@ in
ghcid = haskellPackages.ghcid.bin;
graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };
icon-lang = callPackage ../development/interpreters/icon-lang { };
libgit2 = callPackage ../development/libraries/git2 {
@ -22910,6 +22926,8 @@ in
bookworm = callPackage ../applications/office/bookworm { };
boops = callPackage ../applications/audio/boops { };
CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { };
chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
@ -25318,6 +25336,7 @@ in
simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {};
sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};
thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };
youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { };
};
mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
@ -25518,6 +25537,8 @@ in
softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {};
songrec = callPackage ../applications/audio/songrec {};
spacegun = callPackage ../applications/networking/cluster/spacegun {};
stride = callPackage ../applications/networking/instant-messengers/stride { };
@ -27960,6 +27981,8 @@ in
btcpayserver = callPackage ../applications/blockchains/btcpayserver { };
charge-lnd = callPackage ../applications/blockchains/charge-lnd { };
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
dashpay = callPackage ../applications/blockchains/dashpay.nix { };
@ -30215,6 +30238,8 @@ in
autotiling = python3Packages.callPackage ../misc/autotiling { };
avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { };
beep = callPackage ../misc/beep { };
bees = callPackage ../tools/filesystems/bees { };
@ -31736,6 +31761,8 @@ in
zenstates = callPackage ../os-specific/linux/zenstates {};
ryzenadj = callPackage ../os-specific/linux/ryzenadj {};
vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {};
gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };

View file

@ -33,10 +33,17 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
Fantomas = fetchNuGet {
baseName = "Fantomas";
version = "1.6.0";
sha256 = "1b9rd3i76b5xzv0j62dvfr1ksdwvb59vxw6jhzpi018axjn6757q";
version = "4.4.0";
sha256 = "cYz0ewJdK9nRlMKmigk3IENfOXvJRhXJfLXshaqgZ6o=";
outputFiles = [ "lib/*" ];
dllFiles = [ "Fantomas*.dll" ];
meta = with lib; {
description = "FSharp source code formatter";
homepage = "https://github.com/fsprojects/fantomas";
license = licenses.asl20;
maintainers = [ maintainers.ratsclub ];
};
};
FSharpCompilerCodeDom = fetchNuGet {

View file

@ -2195,6 +2195,8 @@ in {
elementpath = callPackage ../development/python-modules/elementpath { };
elevate = callPackage ../development/python-modules/elevate { };
eliot = callPackage ../development/python-modules/eliot { };
elmax = callPackage ../development/python-modules/elmax { };