mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
23dcd1620e
@ -3294,6 +3294,15 @@
|
||||
fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000";
|
||||
}];
|
||||
};
|
||||
deejayem = {
|
||||
email = "nixpkgs.bu5hq@simplelogin.com";
|
||||
github = "deejayem";
|
||||
githubId = 2564003;
|
||||
name = "David Morgan";
|
||||
keys = [{
|
||||
fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2";
|
||||
}];
|
||||
};
|
||||
deepfire = {
|
||||
email = "_deepfire@feelingofgreen.ru";
|
||||
github = "deepfire";
|
||||
@ -9674,6 +9683,15 @@
|
||||
githubId = 6783654;
|
||||
name = "Nadrieril Feneanar";
|
||||
};
|
||||
nagy = {
|
||||
email = "danielnagy@posteo.de";
|
||||
github = "nagy";
|
||||
githubId = 692274;
|
||||
name = "Daniel Nagy";
|
||||
keys = [{
|
||||
fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671";
|
||||
}];
|
||||
};
|
||||
nalbyuites = {
|
||||
email = "ashijit007@gmail.com";
|
||||
github = "nalbyuites";
|
||||
|
||||
@ -141,7 +141,7 @@
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
PHP 8.2.0 RC 6 is available.
|
||||
PHP 8.2.0 RC 7 is available.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
||||
@ -57,7 +57,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
`mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a
|
||||
common practice for a long time in other distributions.
|
||||
|
||||
- PHP 8.2.0 RC 6 is available.
|
||||
- PHP 8.2.0 RC 7 is available.
|
||||
|
||||
- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it.
|
||||
|
||||
@ -484,12 +484,12 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||
|
||||
- Add udev rules for the Teensy family of microcontrollers.
|
||||
|
||||
- The Qt QML disk cache is now disabled by default. This fixes a
|
||||
long-standing issue where updating Qt/KDE apps would sometimes cause
|
||||
them to crash or behave strangely without explanation. Those concerned
|
||||
about the small (~10%) performance hit to application startup can
|
||||
re-enable the cache (and expose themselves to gremlins) by setting the
|
||||
envrionment variable `QML_FORCE_DISK_CACHE` to `1` using e.g. the
|
||||
- The Qt QML disk cache is now disabled by default. This fixes a
|
||||
long-standing issue where updating Qt/KDE apps would sometimes cause
|
||||
them to crash or behave strangely without explanation. Those concerned
|
||||
about the small (~10%) performance hit to application startup can
|
||||
re-enable the cache (and expose themselves to gremlins) by setting the
|
||||
envrionment variable `QML_FORCE_DISK_CACHE` to `1` using e.g. the
|
||||
`environment.sessionVariables` NixOS option.
|
||||
|
||||
- systemd-oomd is enabled by default. Depending on which systemd units have
|
||||
|
||||
@ -33,7 +33,7 @@ let
|
||||
mountPoint = mkOption {
|
||||
example = "/mnt/usb";
|
||||
type = nonEmptyWithoutTrailingSlash;
|
||||
description = lib.mdDoc "Location of the mounted the file system.";
|
||||
description = lib.mdDoc "Location of the mounted file system.";
|
||||
};
|
||||
|
||||
device = mkOption {
|
||||
|
||||
@ -586,6 +586,7 @@ in {
|
||||
sourcehut = handleTest ./sourcehut.nix {};
|
||||
spacecookie = handleTest ./spacecookie.nix {};
|
||||
spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};
|
||||
sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {};
|
||||
sslh = handleTest ./sslh.nix {};
|
||||
sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
|
||||
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
|
||||
|
||||
65
nixos/tests/sqlite3-to-mysql.nix
Normal file
65
nixos/tests/sqlite3-to-mysql.nix
Normal file
@ -0,0 +1,65 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
/*
|
||||
This test suite replaces the typical pytestCheckHook function in
|
||||
sqlite3-to-mysql due to the need of a running mysql instance.
|
||||
*/
|
||||
|
||||
{
|
||||
name = "sqlite3-to-mysql";
|
||||
meta.maintainers = with lib.maintainers; [ gador ];
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
sqlite3-to-mysql
|
||||
# create one coherent python environment
|
||||
(python3.withPackages
|
||||
(ps: sqlite3-to-mysql.propagatedBuildInputs ++
|
||||
[
|
||||
python3Packages.pytest
|
||||
python3Packages.pytest-mock
|
||||
python3Packages.pytest-timeout
|
||||
python3Packages.factory_boy
|
||||
python3Packages.docker # only needed so import does not fail
|
||||
sqlite3-to-mysql
|
||||
])
|
||||
)
|
||||
];
|
||||
services.mysql = {
|
||||
package = pkgs.mariadb;
|
||||
enable = true;
|
||||
# from https://github.com/techouse/sqlite3-to-mysql/blob/master/tests/conftest.py
|
||||
# and https://github.com/techouse/sqlite3-to-mysql/blob/master/.github/workflows/test.yml
|
||||
initialScript = pkgs.writeText "mysql-init.sql" ''
|
||||
create database test_db DEFAULT CHARACTER SET utf8mb4;
|
||||
create user tester identified by 'testpass';
|
||||
grant all on test_db.* to tester;
|
||||
create user tester@localhost identified by 'testpass';
|
||||
grant all on test_db.* to tester@localhost;
|
||||
'';
|
||||
settings = {
|
||||
mysqld = {
|
||||
character-set-server = "utf8mb4";
|
||||
collation-server = "utf8mb4_unicode_ci";
|
||||
log_warnings = 1;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("mysql")
|
||||
|
||||
machine.succeed(
|
||||
"sqlite3mysql --version | grep ${pkgs.sqlite3-to-mysql.version}"
|
||||
)
|
||||
|
||||
# invalid_database_name: assert '1045 (28000): Access denied' in "1044 (42000): Access denied [...]
|
||||
# invalid_database_user: does not return non-zero exit for some reason
|
||||
# test_version: has problems importing sqlite3_to_mysql and determining the version
|
||||
machine.succeed(
|
||||
"cd ${pkgs.sqlite3-to-mysql.src} \
|
||||
&& pytest -v --no-docker -k \"not test_invalid_database_name and not test_invalid_database_user and not test_version\""
|
||||
)
|
||||
'';
|
||||
})
|
||||
56
pkgs/applications/audio/aaxtomp3/default.nix
Normal file
56
pkgs/applications/audio/aaxtomp3/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ coreutils
|
||||
, fetchFromGitHub
|
||||
, ffmpeg
|
||||
, findutils
|
||||
, gnugrep
|
||||
, gnused
|
||||
, jq
|
||||
, lame
|
||||
, lib
|
||||
, makeWrapper
|
||||
, mediainfo
|
||||
, mp4v2
|
||||
, stdenv
|
||||
}:
|
||||
let
|
||||
runtimeInputs = [
|
||||
coreutils
|
||||
ffmpeg
|
||||
findutils
|
||||
gnugrep
|
||||
gnused
|
||||
jq
|
||||
lame
|
||||
mediainfo
|
||||
mp4v2
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aaxtomp3";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krumpetpirate";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg=";
|
||||
};
|
||||
|
||||
dontBuild = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 AAXtoMP3 $out/bin/aaxtomp3
|
||||
wrapProgram $out/bin/aaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs}
|
||||
install -Dm755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3
|
||||
wrapProgram $out/bin/interactiveaaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS";
|
||||
homepage = "https://krumpetpirate.github.io/AAXtoMP3";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
@ -1301,6 +1301,7 @@ self: super: {
|
||||
"coc-jest"
|
||||
"coc-json"
|
||||
"coc-lists"
|
||||
"coc-ltex"
|
||||
"coc-markdownlint"
|
||||
"coc-metals"
|
||||
"coc-pairs"
|
||||
|
||||
@ -874,8 +874,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitlens";
|
||||
publisher = "eamodio";
|
||||
version = "12.1.2";
|
||||
sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9";
|
||||
version = "2022.11.2204";
|
||||
sha256 = "0npr9fymfjnrq7xvfj6fdc04lysz28qncf9r8syv0w9873f3695h";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
@ -1322,8 +1322,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "todo-tree";
|
||||
publisher = "Gruntfuggly";
|
||||
version = "0.0.215";
|
||||
sha256 = "sha256-WK9J6TvmMCLoqeKWh5FVp1mNAXPWVmRvi/iFuLWMylM=";
|
||||
version = "0.0.220";
|
||||
sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
@ -1502,8 +1502,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "svg";
|
||||
publisher = "jock";
|
||||
version = "1.4.19";
|
||||
sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq";
|
||||
version = "1.4.23";
|
||||
sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
@ -1514,8 +1514,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-peacock";
|
||||
publisher = "johnpapa";
|
||||
version = "4.0.1";
|
||||
sha256 = "sha256-oYXYOamwacgRqv3+ZREJ1vqRlwMz8LpO+wa6CVEEdbI=";
|
||||
version = "4.2.2";
|
||||
sha256 = "1z9crpz025ha9hgc9mxxg3vyrsfpf9d16zm1vrf4q592j9156d2m";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
@ -1812,8 +1812,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-docker";
|
||||
publisher = "ms-azuretools";
|
||||
version = "1.22.1";
|
||||
sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52";
|
||||
version = "1.22.2";
|
||||
sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -1876,8 +1876,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "PowerShell";
|
||||
publisher = "ms-vscode";
|
||||
version = "2022.7.2";
|
||||
sha256 = "sha256-YL90dRmOvfbizT+hfkNu267JtG122LTMS9MHCfaMzkk=";
|
||||
version = "2022.11.0";
|
||||
sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "A Visual Studio Code extension for PowerShell language support";
|
||||
@ -2117,8 +2117,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-yaml";
|
||||
publisher = "redhat";
|
||||
version = "1.9.1";
|
||||
sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w";
|
||||
version = "1.11.10112022";
|
||||
sha256 = "0i53n9whcfpds9496r4pa27j3zmd4jc1kpkf4m4rfxzswwngg47x";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -2173,8 +2173,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "material-icon-theme";
|
||||
publisher = "PKief";
|
||||
version = "4.19.0";
|
||||
sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4";
|
||||
version = "4.22.0";
|
||||
sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@ -123,13 +123,13 @@ rec {
|
||||
|
||||
gammastep = mkRedshift rec {
|
||||
pname = "gammastep";
|
||||
version = "2.0.8";
|
||||
version = "2.0.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "chinstrap";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "071f3iqdbblb3awnx48j19kspk6l2g3658za80i2mf4gacgq9fm1";
|
||||
sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU=";
|
||||
};
|
||||
|
||||
meta = redshift.meta // {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tut";
|
||||
version = "1.0.19";
|
||||
version = "1.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RasmusLindroth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-lT/3KXxrZYOK/oGrlorQUIv8J7tAfME0hRb1bwN+nXA=";
|
||||
sha256 = "sha256-wFK5dFGD25KtBn4gujgvDu8zZWQ8XH1peEbpLa+6n8A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-O7tre7eSGlB9mnf/9aNbe/Ji0ecmJyuLuaWKARskCjI=";
|
||||
vendorSha256 = "sha256-HZrchLQ1861MYWDiiegXLNMDsDUzRNzLA7MoULBai+4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI for Mastodon with vim inspired keys";
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.6.1";
|
||||
version = "unstable-2022-05-16";
|
||||
pname = "xygrib";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opengribs";
|
||||
repo = "XyGrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia";
|
||||
rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310";
|
||||
sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
|
||||
@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ j03 SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ j03 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -295,7 +295,14 @@ let
|
||||
chrome_pgo_phase = 0;
|
||||
clang_base_path = "${llvmPackages.clang}";
|
||||
use_qt = false;
|
||||
} // optionalAttrs (!chromiumVersionAtLeast "108") {
|
||||
use_system_libwayland_server = true;
|
||||
} // optionalAttrs (chromiumVersionAtLeast "108") {
|
||||
# The default has changed to false. We'll build with libwayland from
|
||||
# Nixpkgs for now but might want to eventually use the bundled libwayland
|
||||
# as well to avoid incompatibilities (if this continues to be a problem
|
||||
# from time to time):
|
||||
use_system_libwayland = true;
|
||||
} // optionalAttrs proprietaryCodecs {
|
||||
# enable support for the H.264 codec
|
||||
proprietary_codecs = true;
|
||||
|
||||
@ -16,7 +16,6 @@ let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
noPhoningHome = {
|
||||
disable_guests = true; # disable automatic guest account registration at matrix.org
|
||||
piwik = false; # disable analytics
|
||||
};
|
||||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
|
||||
@ -1,72 +1,64 @@
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }:
|
||||
{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll }:
|
||||
|
||||
let
|
||||
freenet_ext = fetchurl {
|
||||
url = "https://downloads.freenetproject.org/latest/freenet-ext.jar";
|
||||
sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij";
|
||||
version = "build01494";
|
||||
jna = fetchurl {
|
||||
url = "https://github.com/freenet/fred/releases/download/${version}/jna-4.5.2.jar";
|
||||
sha256 = "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=";
|
||||
};
|
||||
jna_platform = fetchurl {
|
||||
url = "https://github.com/freenet/fred/releases/download/${version}/jna-platform-4.5.2.jar";
|
||||
sha256 = "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=";
|
||||
};
|
||||
freenet_ext = fetchurl {
|
||||
url = "https://github.com/freenet/fred/releases/download/${version}/freenet-ext.jar";
|
||||
sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=";
|
||||
};
|
||||
|
||||
bcprov_version = "jdk15on-154";
|
||||
bcprov = fetchurl {
|
||||
url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar";
|
||||
sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk";
|
||||
url = "https://github.com/freenet/fred/releases/download/${version}/bcprov-jdk15on-1.59.jar";
|
||||
sha256 = "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=";
|
||||
};
|
||||
seednodes = fetchurl {
|
||||
url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref";
|
||||
sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv";
|
||||
};
|
||||
version = "build01480";
|
||||
|
||||
freenet-jars = stdenv.mkDerivation {
|
||||
pname = "freenet-jars";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freenet";
|
||||
repo = "fred";
|
||||
rev = version;
|
||||
sha256 = "0wddkfyhsgs7bcq9svicz6l0a35yv82yqzmji3c345hg4hbch3kb";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/freenet/fred/releases/download/${version}/freenet.jar";
|
||||
sha256 = "sha256-1Pjc8Ob4EN7N05QkGTMKBn7z3myTDaQ98N48nNSLstg=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
cp ${freenet_ext} lib/freenet/freenet-ext.jar
|
||||
cp ${bcprov} lib/bcprov-${bcprov_version}.jar
|
||||
|
||||
sed '/antcall.*-ext/d' -i build.xml
|
||||
sed 's/@unknown@/${version}/g' -i build-clean.xml
|
||||
'';
|
||||
|
||||
buildInputs = [ ant jdk ];
|
||||
|
||||
buildPhase = "ant package-only";
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/freenet
|
||||
cp lib/bcprov-${bcprov_version}.jar $out/share/freenet
|
||||
cp lib/freenet/freenet-ext.jar $out/share/freenet
|
||||
cp dist/freenet.jar $out/share/freenet
|
||||
ln -s ${bcprov} $out/share/freenet/bcprov.jar
|
||||
ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar
|
||||
ln -s ${jna_platform} $out/share/freenet/jna_platform.jar
|
||||
ln -s ${jna} $out/share/freenet/jna.jar
|
||||
ln -s $src $out/share/freenet/freenet.jar
|
||||
'';
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "freenet-${version}";
|
||||
pname = "freenet";
|
||||
inherit version;
|
||||
|
||||
src = substituteAll {
|
||||
src = ./freenetWrapper;
|
||||
inherit bash coreutils seednodes bcprov_version;
|
||||
inherit bash coreutils jdk seednodes;
|
||||
freenet = freenet-jars;
|
||||
jre = jdk.jre;
|
||||
};
|
||||
|
||||
jars = freenet-jars;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp $src $out/bin/freenet
|
||||
chmod +x $out/bin/freenet
|
||||
install -Dm555 $src $out/bin/freenet
|
||||
ln -s ${freenet-jars}/share $out/share
|
||||
'';
|
||||
|
||||
@ -75,7 +67,7 @@ in stdenv.mkDerivation {
|
||||
homepage = "https://freenetproject.org/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ nagy ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,18 +1,17 @@
|
||||
#! @bash@/bin/bash
|
||||
|
||||
set -eo pipefail
|
||||
PATH=@coreutils@/bin:$PATH
|
||||
export CLASSPATH=@freenet@/share/freenet/bcprov.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/jna_platform.jar:@freenet@/share/freenet/jna.jar:@freenet@/share/freenet/freenet.jar
|
||||
|
||||
export FREENET_HOME="$HOME/.local/share/freenet"
|
||||
if [ -n "$XDG_DATA_HOME" ]
|
||||
then export FREENET_HOME="$XDG_DATA_HOME/freenet"
|
||||
if [ -n "$XDG_DATA_HOME" ] ; then
|
||||
FREENET_HOME="$XDG_DATA_HOME/freenet"
|
||||
fi
|
||||
|
||||
if [ ! -d $FREENET_HOME ]; then
|
||||
mkdir -p $FREENET_HOME
|
||||
fi
|
||||
mkdir -p -- $FREENET_HOME
|
||||
|
||||
cp -u @seednodes@ $FREENET_HOME/seednodes.fref
|
||||
chmod u+rw $FREENET_HOME/seednodes.fref
|
||||
cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref
|
||||
chmod u+rw -- $FREENET_HOME/seednodes.fref
|
||||
|
||||
cd $FREENET_HOME
|
||||
@jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter
|
||||
cd -- $FREENET_HOME
|
||||
exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
|
||||
{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cb2bib";
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h";
|
||||
};
|
||||
buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
|
||||
nativeBuildInputs = [ qmake ];
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files";
|
||||
homepage = "http://www.molspaces.com/d_cb2bib-overview.php";
|
||||
|
||||
@ -1,41 +1,41 @@
|
||||
{
|
||||
# Nix
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
fetchPypi,
|
||||
|
||||
# Build inputs
|
||||
altair,
|
||||
blinker,
|
||||
click,
|
||||
cachetools,
|
||||
GitPython,
|
||||
importlib-metadata,
|
||||
jinja2,
|
||||
pillow,
|
||||
pyarrow,
|
||||
pydeck,
|
||||
pympler,
|
||||
protobuf,
|
||||
requests,
|
||||
rich,
|
||||
semver,
|
||||
setuptools,
|
||||
toml,
|
||||
tornado,
|
||||
tzlocal,
|
||||
validators,
|
||||
watchdog,
|
||||
lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, # Build inputs
|
||||
altair
|
||||
, blinker
|
||||
, click
|
||||
, cachetools
|
||||
, GitPython
|
||||
, importlib-metadata
|
||||
, jinja2
|
||||
, pillow
|
||||
, pyarrow
|
||||
, pydeck
|
||||
, pympler
|
||||
, protobuf3
|
||||
, requests
|
||||
, rich
|
||||
, semver
|
||||
, setuptools
|
||||
, toml
|
||||
, tornado
|
||||
, tzlocal
|
||||
, validators
|
||||
, watchdog
|
||||
,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "streamlit";
|
||||
version = "1.13.0";
|
||||
format = "wheel"; # source currently requires pipenv
|
||||
version = "1.15.0";
|
||||
format = "wheel"; # source currently requires pipenv
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-MjGm9CT4p/Nl3J5G1Pu2ajY0/VcMdHabimn3ktkoXTo=";
|
||||
hash = "sha256-QtBr3INWBwCBab+FzmvzrjGjwVVHC8NCET9wtRVeVbc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -47,7 +47,7 @@ buildPythonApplication rec {
|
||||
importlib-metadata
|
||||
jinja2
|
||||
pillow
|
||||
protobuf
|
||||
protobuf3
|
||||
pyarrow
|
||||
pydeck
|
||||
pympler
|
||||
@ -63,7 +63,7 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/streamlit.cmd # remove windows helper
|
||||
rm $out/bin/streamlit.cmd # remove windows helper
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-gmp=${lib.getDev gmp}"
|
||||
"--with-readline=${lib.getDev readline}"
|
||||
]
|
||||
++ lib.optional stdenv.isDarwin "--host=x86_64-darwin"
|
||||
++ lib.optional stdenv.isDarwin "--host=${stdenv.system}"
|
||||
++ lib.optional withThread "--mt=pthread";
|
||||
|
||||
preConfigure = ''
|
||||
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
echo 'echo x86_64-darwin' > config/arch-osname
|
||||
echo 'echo ${stdenv.system}' > config/arch-osname
|
||||
'';
|
||||
|
||||
makeFlags = [ "all" ];
|
||||
@ -83,7 +83,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ertes ] ++ teams.sage.members;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
mainProgram = "gp";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,24 +5,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaylock";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "swaylock";
|
||||
rev = version;
|
||||
sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY=";
|
||||
hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove once when updating to 1.7
|
||||
# https://github.com/swaywm/swaylock/pull/235
|
||||
(fetchpatch {
|
||||
url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff";
|
||||
sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.0.25";
|
||||
hash = "sha256-CdcWvOtbPbdtkCOxDBaB674EDlH0wY39Nfn/i3O7z4w=";
|
||||
version = "8.0.26";
|
||||
hash = "sha256-bfh6+W8nWnWIns5uP+ShOr2Tp2epmShjvcDpDx6Ifuc=";
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.12";
|
||||
hash = "sha256-+H1z6Rf6z3jee83lP8L6pNTb4Eh6lAbhq2jIro8z6wM=";
|
||||
version = "8.1.13";
|
||||
hash = "sha256-k/z9+qo9CUoP2xjOCNIPINUm7j8HoUaoqOyCzgCyN8o=";
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ callPackage, lib, stdenv, fetchurl, ... }@_args:
|
||||
|
||||
let
|
||||
hash = "sha256-sbT8sIwle3OugXxqLZO3jKXlrOQsX1iH7WRH8G+nv8Y=";
|
||||
hash = "sha256-MSBENMUl+F5k9manZvYjRDY3YWsYToZSQU9hmhJ8Xvc=";
|
||||
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.0";
|
||||
phpAttrsOverrides = attrs: attrs // {
|
||||
src = fetchurl {
|
||||
url = "https://downloads.php.net/~sergey/php-8.2.0RC6.tar.xz";
|
||||
url = "https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz";
|
||||
inherit hash;
|
||||
};
|
||||
};
|
||||
|
||||
@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
] ++ lib.optionals (!stdenv.isLinux || stdenv.hostPlatform.isMusl) [
|
||||
"-Dprofiler=disabled"
|
||||
];
|
||||
|
||||
@ -88,6 +88,9 @@ in stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
patchShebangs build/choose-tests-locale.sh
|
||||
substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console
|
||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
substituteInPlace installed-tests/js/meson.build \
|
||||
--replace "'Encoding'," "#'Encoding',"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.2";
|
||||
version = "6.6.1";
|
||||
pname = "commons-bcel";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz";
|
||||
sha256 = "13ppnd6afljdjq21jpn4ik2h1yxq8k2kg21ghi0lyb1yap1rd7k6";
|
||||
url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz";
|
||||
sha256 = "sha256-bwbERZqnmXD2LzGilDZYsr7BPQoTeZDwDU/8/AjAdP4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
tar xf ${src}
|
||||
mkdir -p $out/share/java
|
||||
cp bcel-5.2.jar $out/share/java/
|
||||
cp bcel-${version}.jar $out/share/java/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://savannah.gnu.org/patch/download.php?file_id=52179";
|
||||
sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb";
|
||||
})
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
(fetchpatch {
|
||||
name = "musl-realpath-test.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/libcdio/disable-broken-test.patch?id=058a8695c12ae13b40c981ee98809352490b6155";
|
||||
includes = [ "test/driver/realpath.c" ];
|
||||
sha256 = "sha256-6j2bjMed2l+TFZ5emjCcozzF/kkGA8FVifJB8U7QceU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
26
pkgs/development/libraries/speedtest-exporter/default.nix
Normal file
26
pkgs/development/libraries/speedtest-exporter/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "speedtest-exporter";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlamirault";
|
||||
repo = "speedtest_exporter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WIMDv63sHyZVw3Ct5LFXCIufj7sU2H81n+hT/NiPMeQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lm73pZzdNZv7J+vKrtQXxm4HiAuB9lugKT/oanmD0HM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prometheus exporter for Speedtest metrics";
|
||||
homepage = "https://github.com/nlamirault/speedtest_exporter";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
mainProgram = "speedtest_exporter";
|
||||
};
|
||||
}
|
||||
@ -137,6 +137,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dpolkit=disabled"
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
"-Dlibcap-ng=disabled"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"-Dcoroutine=gthread" # Fixes "Function missing:makecontext"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,25 +2,22 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "exif";
|
||||
version = "1.2.0";
|
||||
version = "1.3.5";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "TNThieding";
|
||||
repo = "exif";
|
||||
rev = "686857c677f489759db90b1ad61fa1cc1cac5f9a";
|
||||
sha256 = "0z2if23kmi0iyxviz32mlqs997i3dqpqfz6nznlwkhkkb6rkwwnh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XSORawioXo8oPVZ3Jnxqa6GFIxnQZMT0vJitdmpBj0E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ plum-py ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "plum-py==0.3.1" "plum-py>=0.3.1"
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook baseline ];
|
||||
|
||||
pythonImportsCheck = [ "exif" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Read and modify image EXIF metadata using Python";
|
||||
homepage = "https://gitlab.com/TNThieding/exif";
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mastodon-py";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halcy";
|
||||
repo = "Mastodon.py";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-bzacM5bJa936sBW+hgm9GOezW8cVY2oPaWApqjDYLSo=";
|
||||
sha256 = "sha256-QavgCWWiGmGnNoEX7pxzUyujEQObXhkaucv4FduZ/Vg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,20 +2,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plum-py";
|
||||
version = "0.4.0";
|
||||
version = "0.8.5";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "dangass";
|
||||
repo = "plum";
|
||||
rev = "6a9ff863c0e9fa21f7b2230d25402155a5522e4b";
|
||||
sha256 = "1iv62yb704c61b0dvsmyp3j6xpbmay532g9ny4pw4zbg3l69vd5j";
|
||||
rev = version;
|
||||
sha256 = "sha256-jCZUNT1HpSr0khHsjnxEzN2LCzcDV6W27PjVkwFJHUg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/plum/int/flag/_flag.py \
|
||||
--replace 'if sys.version_info < (3, 7):' 'if True:'
|
||||
'';
|
||||
pythonImportsCheck = [ "plum" ];
|
||||
|
||||
checkInputs = [ pytest baseline ];
|
||||
checkPhase = "pytest tests";
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, requests
|
||||
, fastapi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
@ -21,6 +22,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
requests
|
||||
fastapi
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, tox
|
||||
, pytest
|
||||
, coverage
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -18,16 +15,9 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
tox
|
||||
pytest
|
||||
coverage
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Textwrap from Python 3.6 backport plus a few tweaks";
|
||||
homepage = "https://github.com/jonathaneunice/textwrap3";
|
||||
|
||||
28
pkgs/development/tools/misc/strace-analyzer/default.nix
Normal file
28
pkgs/development/tools/misc/strace-analyzer/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, strace
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "strace-analyzer";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wookietreiber";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ICUXedWg7ZT2Uzk7ZLpFqoEXiG4AzvkwCndR2aHKjVI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-p/HYG/KaHtvgvAd+eg1fKmDnLoWCL+XiT66jRBU2xRE=";
|
||||
|
||||
checkInputs = [ strace ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Analyzes strace output";
|
||||
homepage = "https://github.com/wookietreiber/strace-analyzer";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hack";
|
||||
version = "0.5.22";
|
||||
version = "0.5.23";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TuHCKitlCCV//VBi514IMdcscsBc4yibfdsCO/nmisU=";
|
||||
sha256 = "sha256-5iFc8wEejCuD8HbaJv2XuZ/LP7aPtGJk+gXTJqAr8aM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2tF6553SGbBrGkTznk3zWMweQjks+Z699HE1l0DVYec=";
|
||||
cargoSha256 = "sha256-U6F/5VeALxs8YysU4VOLBUCu8d0Iaf3VRE7g2zRTAkg=";
|
||||
|
||||
# some necessary files are absent in the crate version
|
||||
doCheck = false;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vendir";
|
||||
version = "0.32.0";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-vendir";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VuOf+8PgscoHNVPO8gDoFGGPSBxO5BNLpmUJnYL898s=";
|
||||
sha256 = "sha256-IgPUqIR9xuLEglVqVHz2KvqqCHpCPYv8TX+Z6q5xCNA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
|
||||
{ lib, stdenv, fetchurl, love, makeWrapper, makeDesktopItem, copyDesktopItems }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sienna";
|
||||
version = "1.0c";
|
||||
version = "1.0d";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love";
|
||||
sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6";
|
||||
sha256 = "sha256-1bFjhN7jL/PMYMJH1ete6uyHTYsTGgoP60sf/sJTLlU=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "12q2rhk39dmb6ir50zafn8dylaad5gns8z3y21mfjabc5l5g02nn";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
name = "sienna";
|
||||
exec = pname;
|
||||
icon = icon;
|
||||
@ -21,33 +22,29 @@ stdenv.mkDerivation rec {
|
||||
desktopName = "Sienna";
|
||||
genericName = "sienna";
|
||||
categories = [ "Game" ];
|
||||
};
|
||||
}) ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ lua love ];
|
||||
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase =
|
||||
''
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/games/lovegames
|
||||
|
||||
cp -v $src $out/share/games/lovegames/${pname}.love
|
||||
|
||||
makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
|
||||
|
||||
chmod +x $out/bin/${pname}
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast-paced one button platformer";
|
||||
homepage = "https://tangramgames.dk/games/sienna";
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.free;
|
||||
downloadPage = "http://tangramgames.dk/games/sienna";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isMusl [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch";
|
||||
sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid";
|
||||
})
|
||||
# http://openwall.com/lists/musl/2015/08/18/10
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/musl-getservbyport.patch";
|
||||
|
||||
35
pkgs/shells/zsh/zsh-forgit/default.nix
Normal file
35
pkgs/shells/zsh/zsh-forgit/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ stdenv, lib, fetchFromGitHub, git, fzf }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zsh-forgit";
|
||||
version = "22.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = version;
|
||||
sha256 = "ca7EM/F0Spsdr3MbjIVwbjLVXg6/qWGczBQHLCcpU5A=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace forgit.plugin.zsh \
|
||||
--replace "fzf " "${fzf}/bin/fzf " \
|
||||
--replace "git " "${git}/bin/git "
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/wfxr/forgit";
|
||||
description = "A utility tool powered by fzf for using git interactively";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ deejayem ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, ucl, zlib, perl }:
|
||||
{ lib, stdenv, fetchurl, ucl, zlib, perl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upx";
|
||||
@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ ucl zlib perl ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/upx/upx/commit/13bc031163863cb3866aa6cdc018dff0697aa5d4.patch";
|
||||
sha256 = "sha256-7uazgx1lOgHh2J7yn3yb1q9lTJsv4BbexdGlWRiAG/M=";
|
||||
name = "CVE-2021-20285.patch";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export UPX_UCLDIR=${ucl}
|
||||
'';
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, catch2
|
||||
, clasp
|
||||
, cmake
|
||||
, gringo
|
||||
, clingo
|
||||
, re2c
|
||||
}:
|
||||
|
||||
@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost clasp gringo re2c ];
|
||||
buildInputs = [ boost clasp clingo re2c ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo"
|
||||
"-DASPCUD_GRINGO_PATH=${clingo}/bin/gringo"
|
||||
"-DASPCUD_CLASP_PATH=${clasp}/bin/clasp"
|
||||
];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, platformio
|
||||
, esptool
|
||||
, esptool_3
|
||||
, git
|
||||
}:
|
||||
|
||||
@ -66,7 +66,7 @@ with python.pkgs; buildPythonApplication rec {
|
||||
# platformio is used in esphomeyaml/platformio_api.py
|
||||
# esptool is used in esphomeyaml/__main__.py
|
||||
# git is used in esphomeyaml/writer.py
|
||||
"--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}"
|
||||
"--prefix PATH : ${lib.makeBinPath [ platformio esptool_3 git ]}"
|
||||
"--set ESPHOME_USE_SUBPROCESS ''"
|
||||
];
|
||||
|
||||
|
||||
63
pkgs/tools/misc/esptool/3.nix
Normal file
63
pkgs/tools/misc/esptool/3.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ lib, fetchFromGitHub, python3, openssl }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "esptool";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "espressif";
|
||||
repo = "esptool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hpPL9KNPA+S57SJoKnQewBCOybDbKep0t5RKw9a9GjM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace test/test_imagegen.py \
|
||||
--replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
bitstring
|
||||
cryptography
|
||||
ecdsa
|
||||
pyserial
|
||||
reedsolo
|
||||
];
|
||||
|
||||
# wrapPythonPrograms will overwrite esptool.py with a bash script,
|
||||
# but espefuse.py tries to import it. Since we don't add any binary paths,
|
||||
# use patchPythonScript directly.
|
||||
dontWrapPythonPrograms = true;
|
||||
postFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
for f in $out/bin/*.py; do
|
||||
echo "Patching $f"
|
||||
patchPythonScript "$f"
|
||||
done
|
||||
'';
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pyelftools
|
||||
];
|
||||
|
||||
# tests mentioned in `.github/workflows/test_esptool.yml`
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
export ESPTOOL_PY=$out/bin/esptool.py
|
||||
${python3.interpreter} test/test_imagegen.py
|
||||
${python3.interpreter} test/test_espsecure.py
|
||||
${python3.interpreter} test/test_merge_bin.py
|
||||
${python3.interpreter} test/test_modules.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "ESP8266 and ESP32 serial bootloader utility";
|
||||
homepage = "https://github.com/espressif/esptool";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,20 +1,22 @@
|
||||
{ lib, fetchFromGitHub, python3, openssl }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "esptool";
|
||||
version = "3.3.1";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "espressif";
|
||||
repo = "esptool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9WmiLji7Zoad5WIzgkpvkI9t96sfdkCtFh6zqVxF7qo=";
|
||||
hash = "sha256-haLwf3loOvqdqQN/iuVBciQ6nCnuc9AqqOGKvDwLBHE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace test/test_imagegen.py \
|
||||
--replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY"
|
||||
'';
|
||||
patches = [
|
||||
./test-call-bin-directly.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
bitstring
|
||||
@ -24,26 +26,16 @@ python3.pkgs.buildPythonApplication rec {
|
||||
reedsolo
|
||||
];
|
||||
|
||||
# wrapPythonPrograms will overwrite esptool.py with a bash script,
|
||||
# but espefuse.py tries to import it. Since we don't add any binary paths,
|
||||
# use patchPythonScript directly.
|
||||
dontWrapPythonPrograms = true;
|
||||
postFixup = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
for f in $out/bin/*.py; do
|
||||
echo "Patching $f"
|
||||
patchPythonScript "$f"
|
||||
done
|
||||
'';
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pyelftools
|
||||
pytest
|
||||
];
|
||||
|
||||
# tests mentioned in `.github/workflows/test_esptool.yml`
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
export ESPSECURE_PY=$out/bin/espsecure.py
|
||||
export ESPTOOL_PY=$out/bin/esptool.py
|
||||
${python3.interpreter} test/test_imagegen.py
|
||||
${python3.interpreter} test/test_espsecure.py
|
||||
|
||||
89
pkgs/tools/misc/esptool/test-call-bin-directly.patch
Normal file
89
pkgs/tools/misc/esptool/test-call-bin-directly.patch
Normal file
@ -0,0 +1,89 @@
|
||||
diff --git a/test/test_espsecure.py b/test/test_espsecure.py
|
||||
index 25b0b87..627005c 100755
|
||||
--- a/test/test_espsecure.py
|
||||
+++ b/test/test_espsecure.py
|
||||
@@ -35,7 +35,7 @@ class EspSecureTestCase:
|
||||
Returns output as a string if there is any,
|
||||
raises an exception if espsecure.py fails
|
||||
"""
|
||||
- cmd = [sys.executable, ESPSECURE_PY] + args.split(" ")
|
||||
+ cmd = [ESPSECURE_PY] + args.split(" ")
|
||||
print("\nExecuting {}...".format(" ".join(cmd)))
|
||||
|
||||
try:
|
||||
diff --git a/test/test_esptool.py b/test/test_esptool.py
|
||||
index 042a1ce..b294e26 100755
|
||||
--- a/test/test_esptool.py
|
||||
+++ b/test/test_esptool.py
|
||||
@@ -57,7 +57,10 @@ try:
|
||||
ESPTOOL_PY = os.environ["ESPTOOL_PY"]
|
||||
except KeyError:
|
||||
ESPTOOL_PY = os.path.join(TEST_DIR, "..", "esptool/__init__.py")
|
||||
-ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py")
|
||||
+try:
|
||||
+ ESPSECURE_PY = os.environ["ESPSECURE_PY"]
|
||||
+except KeyError:
|
||||
+ ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py")
|
||||
ESPRFC2217SERVER_PY = os.path.join(TEST_DIR, "..", "esp_rfc2217_server.py")
|
||||
|
||||
RETURN_CODE_FATAL_ERROR = 2
|
||||
@@ -74,7 +77,6 @@ class ESPRFC2217Server(object):
|
||||
def __init__(self, rfc2217_port=None):
|
||||
self.port = rfc2217_port or self.get_free_port()
|
||||
self.cmd = [
|
||||
- sys.executable,
|
||||
ESPRFC2217SERVER_PY,
|
||||
"-p",
|
||||
str(self.port),
|
||||
@@ -130,7 +132,7 @@ class ESPRFC2217Server(object):
|
||||
class EsptoolTestCase:
|
||||
def run_espsecure(self, args):
|
||||
|
||||
- cmd = [sys.executable, ESPSECURE_PY] + args.split(" ")
|
||||
+ cmd = [ESPSECURE_PY] + args.split(" ")
|
||||
print("\nExecuting {}...".format(" ".join(cmd)))
|
||||
try:
|
||||
output = subprocess.check_output(
|
||||
@@ -155,7 +157,7 @@ class EsptoolTestCase:
|
||||
Raises an exception if esptool.py fails.
|
||||
"""
|
||||
trace_args = ["--trace"] if arg_trace else []
|
||||
- cmd = [sys.executable, ESPTOOL_PY] + trace_args
|
||||
+ cmd = [ESPTOOL_PY] + trace_args
|
||||
if chip_name or arg_chip is not None and chip_name != "auto":
|
||||
cmd += ["--chip", chip_name or arg_chip]
|
||||
if rfc2217_port or arg_port is not None:
|
||||
diff --git a/test/test_imagegen.py b/test/test_imagegen.py
|
||||
index a1feec2..01bd59c 100755
|
||||
--- a/test/test_imagegen.py
|
||||
+++ b/test/test_imagegen.py
|
||||
@@ -108,7 +108,7 @@ class BaseTestCase:
|
||||
Run esptool.py image_info on a binary file,
|
||||
assert no red flags about contents.
|
||||
"""
|
||||
- cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "image_info", binpath]
|
||||
+ cmd = [ESPTOOL_PY, "--chip", chip, "image_info", binpath]
|
||||
try:
|
||||
output = subprocess.check_output(cmd)
|
||||
output = output.decode("utf-8")
|
||||
@@ -123,7 +123,7 @@ class BaseTestCase:
|
||||
|
||||
def run_elf2image(self, chip, elf_path, version=None, extra_args=[]):
|
||||
"""Run elf2image on elf_path"""
|
||||
- cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "elf2image"]
|
||||
+ cmd = [ESPTOOL_PY, "--chip", chip, "elf2image"]
|
||||
if version is not None:
|
||||
cmd += ["--version", str(version)]
|
||||
cmd += [elf_path] + extra_args
|
||||
diff --git a/test/test_merge_bin.py b/test/test_merge_bin.py
|
||||
index 8230069..2df5f8c 100755
|
||||
--- a/test/test_merge_bin.py
|
||||
+++ b/test/test_merge_bin.py
|
||||
@@ -39,7 +39,6 @@ class TestMergeBin:
|
||||
output_file.close()
|
||||
|
||||
cmd = [
|
||||
- sys.executable,
|
||||
ESPTOOL_PY,
|
||||
"--chip",
|
||||
chip,
|
||||
@ -1,57 +0,0 @@
|
||||
{ lib, stdenv, fetchurl,
|
||||
bison, re2c, sconsPackages,
|
||||
libcxx, libcxxabi
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gringo";
|
||||
version = "4.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";
|
||||
sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41";
|
||||
};
|
||||
|
||||
buildInputs = [ bison re2c sconsPackages.scons_3_1_2 ];
|
||||
|
||||
patches = [
|
||||
./gringo-4.5.4-cmath.patch
|
||||
./gringo-4.5.4-to_string.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace ./SConstruct \
|
||||
--replace \
|
||||
"env['CXX'] = 'g++'" \
|
||||
"env['CXX'] = '$CXX'"
|
||||
|
||||
substituteInPlace ./SConstruct \
|
||||
--replace \
|
||||
"env['CPPPATH'] = []" \
|
||||
"env['CPPPATH'] = ['${lib.getDev libcxx}/include/c++/v1']"
|
||||
|
||||
substituteInPlace ./SConstruct \
|
||||
--replace \
|
||||
"env['LIBPATH'] = []" \
|
||||
"env['LIBPATH'] = ['${lib.getLib libcxx}/lib', '${lib.getLib libcxxabi}/lib']"
|
||||
'' + ''
|
||||
sed '1i#include <limits>' -i libgringo/gringo/{control,term}.hh
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
scons WITH_PYTHON= --build-dir=release
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp build/release/gringo $out/bin/gringo
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Converts input programs with first-order variables to equivalent ground programs";
|
||||
homepage = "http://potassco.sourceforge.net/";
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.hakuch ];
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400
|
||||
+++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400
|
||||
@@ -22,6 +22,8 @@
|
||||
#include "gringo/logger.hh"
|
||||
#include "gringo/graph.hh"
|
||||
|
||||
+#include <cmath>
|
||||
+
|
||||
namespace Gringo {
|
||||
|
||||
// {{{ definition of Defines
|
||||
@ -1,11 +0,0 @@
|
||||
--- gringo/libgringo/gringo/bug.hh~ 2014-03-10 12:19:26.000000000 -0400
|
||||
+++ gringo/libgringo/gringo/bug.hh 2016-11-12 07:51:55.288563663 -0500
|
||||
@@ -32,7 +32,7 @@
|
||||
#define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter)
|
||||
#define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) std::make_move_iterator(_Iter)
|
||||
|
||||
-#ifdef MISSING_STD_TO_STRING
|
||||
+#if 0
|
||||
|
||||
#include <sstream>
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "moar";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cFXUspVSCUy0q5CW8K+YL/LBpK87qlPys8hg6AYvg5M=";
|
||||
sha256 = "sha256-I/VN2KCI38uADLpLAJbkhTU3AG40ECYVMAqLVajhsw0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-RfkY66879Us0UudplMzW8xEC1zs+2OXwyB+nBim3I0I=";
|
||||
@ -19,6 +19,11 @@ buildGoModule rec {
|
||||
installManPage ./moar.1
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X" "main.versionString=v${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nice-to-use pager for humans";
|
||||
homepage = "https://github.com/walles/moar";
|
||||
|
||||
50
pkgs/tools/misc/sqlite3-to-mysql/default.nix
Normal file
50
pkgs/tools/misc/sqlite3-to-mysql/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite3-to-mysql";
|
||||
version = "1.4.16";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "techouse";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Fxt1zOyEnBuMkCLCABfijo0514NbFocdsjrQU43qVhY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click
|
||||
mysql-connector
|
||||
pytimeparse
|
||||
pymysql
|
||||
pymysqlsa
|
||||
six
|
||||
simplejson
|
||||
sqlalchemy
|
||||
sqlalchemy-utils
|
||||
tqdm
|
||||
tabulate
|
||||
unidecode
|
||||
packaging
|
||||
];
|
||||
|
||||
# tests require a mysql server instance
|
||||
doCheck = false;
|
||||
|
||||
# run package tests as a seperate nixos test
|
||||
passthru.tests = {
|
||||
nixosTest = nixosTests.sqlite3-to-mysql;
|
||||
};
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple Python tool to transfer data from SQLite 3 to MySQL";
|
||||
homepage = "https://github.com/techouse/sqlite3-to-mysql";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
# Fixes "Fatal: buffer too small" error
|
||||
./0001-Increase-imap_vprintf-buffer-size.patch
|
||||
# Fix #202595: SSL error "Socket error: ... unexpected eof while reading"
|
||||
# Source: https://sourceforge.net/p/isync/isync/ci/b6c36624f04cd388873785c0631df3f2f9ac4bf0/
|
||||
./work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config perl ];
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001
|
||||
From: Oswald Buddenhagen <ossi@users.sf.net>
|
||||
Date: Mon, 6 Jun 2022 11:55:37 +0200
|
||||
Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL
|
||||
connections
|
||||
|
||||
gmail apparently doesn't send a close notification (SSL_shutdown())
|
||||
before closing the TCP socket.
|
||||
---
|
||||
src/drv_imap.c | 7 +++++--
|
||||
src/socket.c | 9 +++++++++
|
||||
src/socket.h | 1 +
|
||||
3 files changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/drv_imap.c b/src/drv_imap.c
|
||||
index fb8d165..6286045 100644
|
||||
--- a/src/drv_imap.c
|
||||
+++ b/src/drv_imap.c
|
||||
@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux )
|
||||
error( "IMAP error: unexpected BYE response: %s\n", cmd );
|
||||
/* We just wait for the server to close the connection now. */
|
||||
ctx->expectEOF = 1;
|
||||
+ socket_expect_eof( &ctx->conn );
|
||||
} else {
|
||||
/* We still need to wait for the LOGOUT's tagged OK. */
|
||||
}
|
||||
@@ -1882,10 +1883,12 @@ static void
|
||||
imap_cleanup_p2( imap_store_t *ctx,
|
||||
imap_cmd_t *cmd ATTR_UNUSED, int response )
|
||||
{
|
||||
- if (response == RESP_NO)
|
||||
+ if (response == RESP_NO) {
|
||||
imap_cancel_store( &ctx->gen );
|
||||
- else if (response == RESP_OK)
|
||||
+ } else if (response == RESP_OK) {
|
||||
ctx->expectEOF = 1;
|
||||
+ socket_expect_eof( &ctx->conn );
|
||||
+ }
|
||||
}
|
||||
|
||||
/******************* imap_open_store *******************/
|
||||
diff --git a/src/socket.c b/src/socket.c
|
||||
index ac3c847..892cece 100644
|
||||
--- a/src/socket.c
|
||||
+++ b/src/socket.c
|
||||
@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect )
|
||||
conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 );
|
||||
}
|
||||
|
||||
+void
|
||||
+socket_expect_eof( conn_t *sock )
|
||||
+{
|
||||
+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL
|
||||
+ if (sock->ssl)
|
||||
+ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF );
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
int
|
||||
socket_read( conn_t *conn, char *buf, uint len )
|
||||
{
|
||||
diff --git a/src/socket.h b/src/socket.h
|
||||
index 5b1edd0..af679aa 100644
|
||||
--- a/src/socket.h
|
||||
+++ b/src/socket.h
|
||||
@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) );
|
||||
void socket_start_deflate( conn_t *conn );
|
||||
void socket_close( conn_t *sock );
|
||||
void socket_expect_activity( conn_t *sock, int expect );
|
||||
+void socket_expect_eof( conn_t *sock );
|
||||
int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */
|
||||
char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */
|
||||
typedef enum { KeepOwn = 0, GiveOwn } ownership_t;
|
||||
--
|
||||
2.38.0
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
mtl,
|
||||
nix-derivation,
|
||||
optics,
|
||||
process,
|
||||
random,
|
||||
relude,
|
||||
safe,
|
||||
@ -39,10 +38,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "nix-output-monitor";
|
||||
version = "2.0.0.4";
|
||||
version = "2.0.0.5";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.4.tar.gz";
|
||||
sha256 = "1pgrynsjjry253fqpmm3yr4k9xcvqffnbs4p8i1nlfi9l821wj8c";
|
||||
url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.5.tar.gz";
|
||||
sha256 = "02xrbf2nr64yfny3idkjb1xbd97wl8m5viifrwjf4hi6ivs5bl18";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
@ -126,7 +125,6 @@ mkDerivation {
|
||||
mtl
|
||||
nix-derivation
|
||||
optics
|
||||
process
|
||||
random
|
||||
relude
|
||||
safe
|
||||
@ -137,6 +135,7 @@ mkDerivation {
|
||||
terminal-size
|
||||
text
|
||||
time
|
||||
typed-process
|
||||
wcwidth
|
||||
word8
|
||||
];
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "nix-update";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wivScgtcdapf5bfXR1sjuBIPQEgi6QGH/f+Aucc3CEQ=";
|
||||
sha256 = "sha256-BChN92gZ1Ga7hIPWmdzkrg31S0iqWwXGkWb3mmRugY8=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, perl
|
||||
, libiconv
|
||||
, openssl
|
||||
, rustPlatform
|
||||
@ -21,6 +22,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "sha256-dv04AXOnzizjq/qx3qy524ylQHgE4gIBgeYI+2IRTug=";
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
buildInputs = [ libiconv openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
|
||||
@ -5,20 +5,21 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "webanalyze";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rverton";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-W7NgV50r/MNSF6+e0IR9C1dcg/k0w67GcTs0NTbhKBc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1z4hi9a/OzBXIMBk1f0JpPMV/kRgBnTQAEygIZqV+1w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0=";
|
||||
vendorHash = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to uncover technologies used on websites";
|
||||
homepage = "https://github.com/rverton/webanalyze";
|
||||
changelog = "https://github.com/rverton/webanalyze/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goawk";
|
||||
version = "1.20.0";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benhoyt";
|
||||
repo = "goawk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-omUtMNB8VBTbihy+VksCduvOENhtPApPBwUIxjVL9fI=";
|
||||
sha256 = "sha256-I6KmNPFD8kkYDyek8lR1ZS7biPA/LYGwJqMoA2fG7Wg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
||||
43
pkgs/tools/virtualization/dockstarter/default.nix
Normal file
43
pkgs/tools/virtualization/dockstarter/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ bash
|
||||
, coreutils
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, lib
|
||||
, makeWrapper
|
||||
, ncurses
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dockstarter";
|
||||
version = "unstable-2022-10-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostwriters";
|
||||
repo = pname;
|
||||
rev = "a1b6b6e29aa135c2a61ea67ca05e9e034856ca08";
|
||||
hash = "sha256-G26DFme6YaizdE5oHBo/IqV+1quu07Bp+IykXtO/GgA=";
|
||||
};
|
||||
|
||||
dontBuild = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 main.sh $out/bin/ds
|
||||
wrapProgram $out/bin/ds --prefix PATH : ${lib.makeBinPath [
|
||||
bash
|
||||
coreutils
|
||||
git
|
||||
ncurses
|
||||
]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "DockSTARTer helps you get started with running apps in Docker.";
|
||||
homepage = "https://dockstarter.com";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
mainProgram = "ds";
|
||||
};
|
||||
}
|
||||
41
pkgs/tools/virtualization/onmetal-image/default.nix
Normal file
41
pkgs/tools/virtualization/onmetal-image/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "onmetal-image";
|
||||
version = "unstable-2022-09-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onmetal";
|
||||
repo = "onmetal-image";
|
||||
rev = "26f6ac2607e1cac19c35fac94aa8cd963b19628a";
|
||||
sha256 = "sha256-ITUm7CEaz8X7LhArGJXk4YKQcX+kOvju6Go+fGfFOcw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ISDNqXoJEYy6kfCZGqHoie0jMOw9bgjYGHqBGx6mymc=";
|
||||
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cmd $out/bin/onmetal-image
|
||||
|
||||
installShellCompletion --cmd onmetal-image \
|
||||
--bash <($out/bin/onmetal-image completion bash) \
|
||||
--fish <($out/bin/onmetal-image completion fish) \
|
||||
--zsh <($out/bin/onmetal-image completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Onmetal OCI Image Specification, Library and Tooling";
|
||||
homepage = "https://github.com/onmetal/onmetal-image";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
@ -584,6 +584,7 @@ mapAliases ({
|
||||
grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
|
||||
gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
|
||||
grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05
|
||||
gringo = clingo; # added 2022-11-27
|
||||
gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16
|
||||
gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
|
||||
gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
|
||||
|
||||
@ -608,8 +608,7 @@ with pkgs;
|
||||
|
||||
archiver = callPackage ../applications/misc/archiver { };
|
||||
|
||||
# It segfaults if it uses qt5.15
|
||||
digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox {
|
||||
digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
@ -2290,7 +2289,7 @@ with pkgs;
|
||||
|
||||
brakeman = callPackage ../development/tools/analysis/brakeman { };
|
||||
|
||||
brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;
|
||||
brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
|
||||
|
||||
# Derivation's result is not used by nixpkgs. Useful for validation for
|
||||
# regressions of bootstrapTools on hydra and on ofborg. Example:
|
||||
@ -3988,6 +3987,8 @@ with pkgs;
|
||||
|
||||
esptool = callPackage ../tools/misc/esptool { };
|
||||
|
||||
esptool_3 = callPackage ../tools/misc/esptool/3.nix { };
|
||||
|
||||
esptool-ck = callPackage ../tools/misc/esptool-ck { };
|
||||
|
||||
ephemeralpg = callPackage ../development/tools/database/ephemeralpg {};
|
||||
@ -4281,8 +4282,6 @@ with pkgs;
|
||||
|
||||
grim = callPackage ../tools/graphics/grim { };
|
||||
|
||||
gringo = callPackage ../tools/misc/gringo { };
|
||||
|
||||
grit = callPackage ../tools/misc/grit { };
|
||||
|
||||
grobi = callPackage ../tools/X11/grobi { };
|
||||
@ -11083,7 +11082,7 @@ with pkgs;
|
||||
|
||||
rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { };
|
||||
|
||||
rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { };
|
||||
rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { };
|
||||
|
||||
rowhammer-test = callPackage ../tools/system/rowhammer-test { };
|
||||
|
||||
@ -11613,6 +11612,8 @@ with pkgs;
|
||||
|
||||
sqliteman = callPackage ../applications/misc/sqliteman { };
|
||||
|
||||
sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { };
|
||||
|
||||
sqls = callPackage ../applications/misc/sqls { };
|
||||
|
||||
stdman = callPackage ../data/documentation/stdman { };
|
||||
@ -12975,7 +12976,7 @@ with pkgs;
|
||||
|
||||
wireguard-go = callPackage ../tools/networking/wireguard-go { };
|
||||
|
||||
wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { };
|
||||
wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { };
|
||||
|
||||
wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin {
|
||||
libjpeg8 = libjpeg.override { enableJpeg8 = true; };
|
||||
@ -13266,6 +13267,8 @@ with pkgs;
|
||||
|
||||
zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
|
||||
|
||||
zsh-forgit = callPackage ../shells/zsh/zsh-forgit { };
|
||||
|
||||
zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { };
|
||||
|
||||
zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { };
|
||||
@ -17533,11 +17536,11 @@ with pkgs;
|
||||
patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then
|
||||
patchelf_0_13
|
||||
else
|
||||
patchelf_0_14;
|
||||
patchelfStable;
|
||||
patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix {
|
||||
patchelf = patchelf_0_14;
|
||||
patchelf = patchelfStable;
|
||||
};
|
||||
patchelf_0_14 = callPackage ../development/tools/misc/patchelf { };
|
||||
patchelfStable = callPackage ../development/tools/misc/patchelf { };
|
||||
|
||||
patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });
|
||||
|
||||
@ -17874,6 +17877,8 @@ with pkgs;
|
||||
|
||||
strace = callPackage ../development/tools/misc/strace { };
|
||||
|
||||
strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { };
|
||||
|
||||
stylua = callPackage ../development/tools/stylua { };
|
||||
|
||||
summon = callPackage ../development/tools/summon { };
|
||||
@ -22552,6 +22557,8 @@ with pkgs;
|
||||
|
||||
speech-tools = callPackage ../development/libraries/speech-tools {};
|
||||
|
||||
speedtest-exporter = callPackage ../development/libraries/speedtest-exporter {};
|
||||
|
||||
speex = callPackage ../development/libraries/speex {
|
||||
fftw = fftwFloat;
|
||||
};
|
||||
@ -27239,6 +27246,8 @@ with pkgs;
|
||||
|
||||
aacgain = callPackage ../applications/audio/aacgain { };
|
||||
|
||||
aaxtomp3 = callPackage ../applications/audio/aaxtomp3 {};
|
||||
|
||||
abcde = callPackage ../applications/audio/abcde {
|
||||
inherit (python3Packages) eyeD3;
|
||||
};
|
||||
@ -27715,7 +27724,7 @@ with pkgs;
|
||||
|
||||
cava = callPackage ../applications/audio/cava { };
|
||||
|
||||
cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { };
|
||||
cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
|
||||
|
||||
cbatticon = callPackage ../applications/misc/cbatticon { };
|
||||
|
||||
@ -28042,6 +28051,8 @@ with pkgs;
|
||||
|
||||
docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { };
|
||||
|
||||
dockstarter = callPackage ../tools/virtualization/dockstarter {};
|
||||
|
||||
doodle = callPackage ../applications/search/doodle { };
|
||||
|
||||
dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { };
|
||||
@ -28840,9 +28851,7 @@ with pkgs;
|
||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
|
||||
freenet = callPackage ../applications/networking/p2p/freenet {
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
freenet = callPackage ../applications/networking/p2p/freenet { };
|
||||
|
||||
freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {};
|
||||
|
||||
@ -29686,7 +29695,7 @@ with pkgs;
|
||||
lua = lua5_1;
|
||||
};
|
||||
|
||||
ipe = libsForQt514.callPackage ../applications/graphics/ipe {
|
||||
ipe = libsForQt5.callPackage ../applications/graphics/ipe {
|
||||
ghostscript = ghostscriptX;
|
||||
texlive = texlive.combine { inherit (texlive) scheme-small; };
|
||||
lua5 = lua5_3;
|
||||
@ -30753,6 +30762,8 @@ with pkgs;
|
||||
|
||||
onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { };
|
||||
|
||||
onmetal-image = callPackage ../tools/virtualization/onmetal-image { };
|
||||
|
||||
opcr-policy = callPackage ../development/tools/opcr-policy { };
|
||||
|
||||
open-policy-agent = callPackage ../development/tools/open-policy-agent { };
|
||||
@ -33362,7 +33373,7 @@ with pkgs;
|
||||
|
||||
xnotify = callPackage ../tools/X11/xnotify { };
|
||||
|
||||
xygrib = libsForQt514.callPackage ../applications/misc/xygrib {};
|
||||
xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
|
||||
|
||||
xzgv = callPackage ../applications/graphics/xzgv { };
|
||||
|
||||
@ -34715,7 +34726,7 @@ with pkgs;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
||||
sienna = callPackage ../games/sienna { love = love_0_10; };
|
||||
sienna = callPackage ../games/sienna { };
|
||||
|
||||
sil = callPackage ../games/sil { };
|
||||
|
||||
@ -36360,7 +36371,7 @@ with pkgs;
|
||||
|
||||
### SCIENCE/ROBOTICS
|
||||
|
||||
apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { };
|
||||
apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
|
||||
|
||||
betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };
|
||||
|
||||
|
||||
@ -7354,11 +7354,17 @@ self: super: with self; {
|
||||
|
||||
proto-plus = callPackage ../development/python-modules/proto-plus { };
|
||||
|
||||
# Protobuf 4.x
|
||||
protobuf = callPackage ../development/python-modules/protobuf {
|
||||
# If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
|
||||
inherit (pkgs) protobuf;
|
||||
};
|
||||
|
||||
# Protobuf 3.x
|
||||
protobuf3 = callPackage ../development/python-modules/protobuf {
|
||||
protobuf = pkgs.protobuf3_20;
|
||||
};
|
||||
|
||||
protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
|
||||
|
||||
proton-client = callPackage ../development/python-modules/proton-client { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user