Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a407424e1f
|
|
@ -30,7 +30,7 @@ let
|
|||
}
|
||||
trap 'on_exit' INT TERM QUIT EXIT
|
||||
|
||||
archiveName="${cfg.archiveBaseName}-$(date ${cfg.dateFormat})"
|
||||
archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})"
|
||||
archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"
|
||||
${cfg.preHook}
|
||||
'' + optionalString cfg.doInit ''
|
||||
|
|
@ -60,7 +60,7 @@ let
|
|||
'' + optionalString (cfg.prune.keep != { }) ''
|
||||
borg prune $extraArgs \
|
||||
${mkKeepArgs cfg} \
|
||||
--prefix ${escapeShellArg cfg.prune.prefix} \
|
||||
${optionalString (cfg.prune.prefix != null) "--prefix ${escapeShellArg cfg.prune.prefix} \\"}
|
||||
$extraPruneArgs
|
||||
${cfg.postPrune}
|
||||
'';
|
||||
|
|
@ -284,7 +284,7 @@ in {
|
|||
};
|
||||
|
||||
archiveBaseName = mkOption {
|
||||
type = types.strMatching "[^/{}]+";
|
||||
type = types.nullOr (types.strMatching "[^/{}]+");
|
||||
default = "${globalConfig.networking.hostName}-${name}";
|
||||
defaultText = literalExpression ''"''${config.networking.hostName}-<name>"'';
|
||||
description = ''
|
||||
|
|
@ -292,6 +292,7 @@ in {
|
|||
determined by <option>dateFormat</option>, will be appended. The full
|
||||
name can be modified at runtime (<literal>$archiveName</literal>).
|
||||
Placeholders like <literal>{hostname}</literal> must not be used.
|
||||
Use <literal>null</literal> for no base name.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -471,11 +472,11 @@ in {
|
|||
};
|
||||
|
||||
prune.prefix = mkOption {
|
||||
type = types.str;
|
||||
type = types.nullOr (types.str);
|
||||
description = ''
|
||||
Only consider archive names starting with this prefix for pruning.
|
||||
By default, only archives created by this job are considered.
|
||||
Use <literal>""</literal> to consider all archives.
|
||||
Use <literal>""</literal> or <literal>null</literal> to consider all archives.
|
||||
'';
|
||||
default = config.archiveBaseName;
|
||||
defaultText = literalExpression "archiveBaseName";
|
||||
|
|
|
|||
|
|
@ -21,12 +21,10 @@ in {
|
|||
|
||||
type = settingsFormat.type;
|
||||
|
||||
example = literalExample ''
|
||||
{
|
||||
secret = "mysecret";
|
||||
storeDir = "/srv/http/nginx/prosody-upload";
|
||||
}
|
||||
'';
|
||||
example = {
|
||||
secret = "mysecret";
|
||||
storeDir = "/srv/http/nginx/prosody-upload";
|
||||
};
|
||||
|
||||
defaultText = literalExpression ''
|
||||
{
|
||||
|
|
|
|||
|
|
@ -474,6 +474,7 @@ in
|
|||
taskserver = handleTest ./taskserver.nix {};
|
||||
telegraf = handleTest ./telegraf.nix {};
|
||||
teleport = handleTest ./teleport.nix {};
|
||||
thelounge = handleTest ./thelounge.nix {};
|
||||
tiddlywiki = handleTest ./tiddlywiki.nix {};
|
||||
tigervnc = handleTest ./tigervnc.nix {};
|
||||
timezone = handleTest ./timezone.nix {};
|
||||
|
|
|
|||
29
nixos/tests/thelounge.nix
Normal file
29
nixos/tests/thelounge.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
import ./make-test-python.nix {
|
||||
nodes = {
|
||||
private = { config, pkgs, ... }: {
|
||||
services.thelounge = {
|
||||
enable = true;
|
||||
plugins = [ pkgs.theLoungePlugins.themes.solarized ];
|
||||
};
|
||||
};
|
||||
|
||||
public = { config, pkgs, ... }: {
|
||||
services.thelounge = {
|
||||
enable = true;
|
||||
public = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
for machine in machines:
|
||||
machine.wait_for_unit("thelounge.service")
|
||||
machine.wait_for_open_port(9000)
|
||||
|
||||
private.wait_until_succeeds("journalctl -u thelounge.service | grep thelounge-theme-solarized")
|
||||
private.wait_until_succeeds("journalctl -u thelounge.service | grep 'in private mode'")
|
||||
public.wait_until_succeeds("journalctl -u thelounge.service | grep 'in public mode'")
|
||||
'';
|
||||
}
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ipfs-cluster";
|
||||
version = "0.14.1";
|
||||
version = "0.14.4";
|
||||
|
||||
vendorSha256 = "sha256-vDNWYgWlM3kJqlHW/6Bj6P+t6M61TvOVRJwDN2p0mi4=";
|
||||
vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs";
|
||||
repo = "ipfs-cluster";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GELCd12LhA4CBe9DRRBu4r+AwCksaRVIWcSAJScvnbk=";
|
||||
sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ipget";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs";
|
||||
repo = "ipget";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YD05HIVr99b8VmEJgzY2ClNv31I98d0NbfCk3XcB+xk=";
|
||||
sha256 = "sha256-qRPke8/CUmGX6v+8qv9JQCUC8T9pjwRRyGmBWvatsJ0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bymHVWskCt7bf02CveMXl1VhZYhRSEH7xIoESh31iGg=";
|
||||
vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg=";
|
||||
|
||||
postPatch = ''
|
||||
# main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport);
|
|||
|
||||
gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.15.2";
|
||||
version = "2.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gqrx-sdr";
|
||||
repo = "gqrx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LWuSJbzQKHoCbkyRQ7KqUxFXzA99kuafPibH8Xx7mXs=";
|
||||
sha256 = "sha256-iQlrnkc1EMR8sUUAHh+7RfS/05unrcDm/kJ/Q4Vst2Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
|
||||
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
|
||||
lcms2,
|
||||
librsync,
|
||||
installShellFiles,
|
||||
dbus,
|
||||
darwin,
|
||||
Cocoa,
|
||||
CoreGraphics,
|
||||
Foundation,
|
||||
|
|
@ -21,20 +23,21 @@
|
|||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.23.1";
|
||||
version = "0.24.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2RwDU6EOJWF0u2ikJFg9U2yqSXergDkJH3h2i+QJ7G4=";
|
||||
sha256 = "sha256-WPkyub7CwNXRksUmqiZeznnSqEPFpyHTeFLQ+D4Fb5c=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
harfbuzz
|
||||
ncurses
|
||||
lcms2
|
||||
librsync
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
CoreGraphics
|
||||
|
|
@ -45,6 +48,8 @@ buildPythonApplication rec {
|
|||
libpng
|
||||
python3
|
||||
zlib
|
||||
] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [
|
||||
darwin.apple_sdk.frameworks.UserNotifications
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
fontconfig libunistring libcanberra libX11
|
||||
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
|
||||
|
|
@ -67,26 +72,31 @@ buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = lib.optional stdenv.isLinux libGL;
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
outputs = [ "out" "terminfo" "shell_integration" ];
|
||||
|
||||
# Causes build failure due to warning
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
buildPhase = let
|
||||
commonOptions = ''
|
||||
--update-check-interval=0 \
|
||||
--shell-integration=enabled\ no-rc
|
||||
'';
|
||||
in ''
|
||||
runHook preBuild
|
||||
${if stdenv.isDarwin then ''
|
||||
${python.interpreter} setup.py kitty.app \
|
||||
--update-check-interval=0 \
|
||||
--disable-link-time-optimization
|
||||
--disable-link-time-optimization \
|
||||
${commonOptions}
|
||||
make man
|
||||
'' else ''
|
||||
${python.interpreter} setup.py linux-package \
|
||||
--update-check-interval=0 \
|
||||
--egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \
|
||||
--startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \
|
||||
--canberra-library='${libcanberra}/lib/libcanberra.so'
|
||||
--canberra-library='${libcanberra}/lib/libcanberra.so' \
|
||||
${commonOptions}
|
||||
''}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
@ -125,10 +135,7 @@ buildPythonApplication rec {
|
|||
--bash <("$out/bin/kitty" + complete setup bash) \
|
||||
--fish <("$out/bin/kitty" + complete setup fish) \
|
||||
--zsh <("$out/bin/kitty" + complete setup zsh)
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
terminfo_src=${if stdenv.isDarwin then
|
||||
''"$out/Applications/kitty.app/Contents/Resources/terminfo"''
|
||||
else
|
||||
|
|
@ -139,6 +146,10 @@ buildPythonApplication rec {
|
|||
|
||||
mkdir -p $out/nix-support
|
||||
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||
|
||||
cp -r 'shell-integration' "$shell_integration"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "yex-lang";
|
||||
version = "unstable-2021-12-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nonamesc";
|
||||
owner = "nonamescm";
|
||||
repo = "yex-lang";
|
||||
rev = "a97def1431b73b8693700f530ec023f1776eaf83";
|
||||
sha256 = "074x9j0ihjpaghnwywq5zyxfad2h6m57c2i58wkz6chma6vcjk08";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-CEzJtlEVMvMnRyUKdko1UDTluv8Fc88tfOpKGIFMnRw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "017nszw07gzd2awadasxqyzx4zpb3y6db1zykcixddqxlyg1wwwq";
|
||||
cargoSha256 = "sha256-mHMenqcdt9Yjm/6H1Ywf637Sv8ddq6a4Eu2/A/jX9gQ=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nonamesc/yex-lang";
|
||||
description = "A cool functional scripting language written in rust";
|
||||
homepage = "https://github.com/yex-lang/yex-lang";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isAarch64 && stdenv.isLinux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zita-alsa-pcmi";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";
|
||||
sha256 = "sha256-vYyfNg37VB+2DkinE7rx4i1BssdMGaD+ny005y9Q8cU=";
|
||||
};
|
||||
|
||||
buildInputs = [ alsa-lib ];
|
||||
|
|
|
|||
29
pkgs/development/libraries/nsync/default.nix
Normal file
29
pkgs/development/libraries/nsync/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nsync";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jQJtlBDR6efBe1tFOUOZ6awaMTT33qM/GbvbwiWTZxw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/google/nsync";
|
||||
description = "C library that exports various synchronization primitives";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ puffnfresh ];
|
||||
# On macOS we get an error for some reason:
|
||||
# > mkdir: cannot create directory 'build': File exists
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -25,6 +25,8 @@
|
|||
, elogind
|
||||
# needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222)
|
||||
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
# cross build fails on polkit-1-scan (https://github.com/NixOS/nixpkgs/pull/152704)
|
||||
, withGtkDoc ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
|
||||
# Not yet investigated; it may be due to the "Make netgroup support optional"
|
||||
# patch not updating the tests correctly yet, or doing something wrong,
|
||||
|
|
@ -119,7 +121,7 @@ stdenv.mkDerivation rec {
|
|||
"-Dos_type=redhat" # only affects PAM includes
|
||||
"-Dintrospection=${lib.boolToString withIntrospection}"
|
||||
"-Dtests=${lib.boolToString doCheck}"
|
||||
"-Dgtk_doc=${lib.boolToString true}"
|
||||
"-Dgtk_doc=${lib.boolToString withGtkDoc}"
|
||||
"-Dman=true"
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }:
|
||||
{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl, nixosTests }:
|
||||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
|
|
@ -442,6 +442,8 @@ let
|
|||
echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
|
||||
patch -d $out/lib/node_modules/thelounge -p1 < ${./thelounge-packages-path.patch}
|
||||
'';
|
||||
passthru.tests = { inherit (nixosTests) thelounge; };
|
||||
meta = super.thelounge.meta // { maintainers = with lib.maintainers; [ winter ]; };
|
||||
};
|
||||
|
||||
yaml-language-server = super.yaml-language-server.override {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiogithubapi";
|
||||
version = "21.11.0";
|
||||
version = "22.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -20,16 +21,9 @@ buildPythonPackage rec {
|
|||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sxWgLd+oQv9qNOpyAYXsBcqGbo/ugNXzGF5nbdcNLFw=";
|
||||
sha256 = "sha256-rzZtf3xrbNg9VaOAOM6ux1A9S1WqUKBMKxWfHDo7/VM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
|
||||
# are not in their focus
|
||||
substituteInPlace setup.py \
|
||||
--replace 'version="main",' 'version="${version}",'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
|
|
@ -42,7 +36,16 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiogithubapi" ];
|
||||
postPatch = ''
|
||||
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
|
||||
# are not in their focus
|
||||
substituteInPlace setup.py \
|
||||
--replace 'version="main",' 'version="${version}",'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiogithubapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for the GitHub API";
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
{ buildPythonPackage
|
||||
, isPy3k
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, z3
|
||||
, ply
|
||||
, igraph
|
||||
, oset
|
||||
, ordered-set
|
||||
, dictionaries
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "cozy";
|
||||
version = "2.0a1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
z3
|
||||
ply
|
||||
igraph
|
||||
oset
|
||||
ordered-set
|
||||
dictionaries
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CozySynthesizer";
|
||||
repo = "cozy";
|
||||
rev = "f553e9b";
|
||||
sha256 = "1jhr5gzihj8dkg0yc5dmi081v2isxharl0ph7v2grqj0bwqzl40j";
|
||||
};
|
||||
|
||||
# - yoink the Z3 dependency name, because our Z3 package doesn't provide it.
|
||||
# - remove "dictionaries" version bound
|
||||
# - patch igraph package name
|
||||
postPatch = ''
|
||||
sed -i -e '/z3-solver/d' \
|
||||
-e 's/^dictionaries.*$/dictionaries/' \
|
||||
-e 's/python-igraph/igraph/' \
|
||||
requirements.txt
|
||||
'';
|
||||
|
||||
# Tests are not correctly set up in the source tree.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "cozy" ];
|
||||
|
||||
# There is some first-time-run codegen that we will force to happen.
|
||||
postInstall = ''
|
||||
$out/bin/cozy --help
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "The collection synthesizer";
|
||||
homepage = "https://cozy.uwplse.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ MostAwesomeDude ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r7Ta/OumYdm+brM6UgAPTWvxODpex1Mg0Arq94tPdnM=";
|
||||
sha256 = "sha256-G819m1mMtk5v1paMf9vdK/m/gbq08NNHM1bfW7jb+JA=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nexia";
|
||||
version = "0.9.12";
|
||||
version = "0.9.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-YZHAWRTYquUm3Ymi/3mSQqxYZuoxsH5Q/LZOPDftEzU=";
|
||||
sha256 = "sha256-0VG8tSwbVTIIsQYAEwzQfXLTDy4df/nS/rbHjYo7xf0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -29,10 +31,13 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace '"pytest-runner",' ""
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner",' ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "nexia" ];
|
||||
pythonImportsCheck = [
|
||||
"nexia"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for Nexia thermostats";
|
||||
|
|
|
|||
|
|
@ -1,25 +1,42 @@
|
|||
{ lib, python, buildPythonPackage, fetchPypi }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pony";
|
||||
version = "0.7.14";
|
||||
version = "0.7.15rc1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2f01e84e79ea7a14040225cb6c079bb266e7ba147346356c266490b18c77ce82";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponyorm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EoMpVvPCwxJbNPoeF73djcaQ4lY9jRx5nJYR2A2LXoQ=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# stripping the tests
|
||||
postInstall = ''
|
||||
rm -rf $out/${python.sitePackages}/pony/orm/tests
|
||||
'';
|
||||
disabledTests = [
|
||||
# Tests are outdated
|
||||
"test_exception_msg"
|
||||
"test_method"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pony"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pony is a Python ORM with beautiful query syntax";
|
||||
description = "Library for advanced object-relational mapping";
|
||||
homepage = "https://ponyorm.org/";
|
||||
maintainers = with maintainers; [ d-goldin xvapx ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ d-goldin xvapx ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pbr
|
||||
, cliff
|
||||
, jsonschema
|
||||
|
|
@ -20,7 +21,6 @@
|
|||
, prettytable
|
||||
, urllib3
|
||||
, debtcollector
|
||||
, unittest2
|
||||
, hacking
|
||||
, oslotest
|
||||
, bash
|
||||
|
|
@ -36,6 +36,14 @@ buildPythonApplication rec {
|
|||
sha256 = "0521d3042360c0fb469b16f99174a9abddbae8a2d2a81268cfc664f1ccfdd0f9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove need for unittest2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openstack/tempest/pull/32/commits/cd3745c27b7d8fcdaffc72b965a3d803d9ee12c2.patch";
|
||||
sha256 = "sha256-UwUmyFZokH66Xqfsj982MBHb0w7x6v4SAtXlqA5dpnk=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pbr
|
||||
cliff
|
||||
|
|
@ -56,7 +64,6 @@ buildPythonApplication rec {
|
|||
prettytable
|
||||
urllib3
|
||||
debtcollector
|
||||
unittest2
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oablQoumBiqDk7bz1BUpUWddxExoqOofrZzX7y618Hw=";
|
||||
sha256 = "sha256-5ZGj3ZS+KGtnlphyUF1xb9e2XuHa4qbOWWtyzZwP1RM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,19 +7,26 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twinkly-client";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "16jbm4ya4yk2nfswza1kpgks70rmy5lpsv9dv3hdjdnr1j44hr3i";
|
||||
sha256 = "sha256-F/N6yMOvLHIfXvPyR7z3P/Rlh79OvCbvEiNwClLSLl8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "twinkly_client" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"twinkly_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to communicate with Twinkly LED strings";
|
||||
|
|
|
|||
|
|
@ -2,21 +2,29 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, markupsafe
|
||||
, Babel
|
||||
, pytestCheckHook
|
||||
, email_validator
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.3.3";
|
||||
version = "3.0.1";
|
||||
pname = "WTForms";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c";
|
||||
sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ markupsafe ];
|
||||
propagatedBuildInputs = [ markupsafe Babel ];
|
||||
|
||||
# Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
email_validator
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "wtforms" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A flexible forms validation and rendering library for Python";
|
||||
|
|
|
|||
|
|
@ -1,35 +1,26 @@
|
|||
{lib, stdenv, fetchurl, ncurses}:
|
||||
let
|
||||
s =
|
||||
rec {
|
||||
baseName = "n2048";
|
||||
version = "0.1";
|
||||
name = "${baseName}-${version}";
|
||||
url = "http://www.dettus.net/n2048/${baseName}_v${version}.tar.gz";
|
||||
{ lib, stdenv, fetchurl, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "n2048";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "http://www.dettus.net/n2048/n2048_v${version}.tar.gz";
|
||||
sha256 = "184z2rr0rnj4p740qb4mzqr6kgd76ynb5gw9bj8hrfshcxdcg1kk";
|
||||
};
|
||||
buildInputs = [
|
||||
ncurses
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
];
|
||||
preInstall = ''
|
||||
mkdir -p "$out"/{share/man,bin}
|
||||
'';
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
meta = with lib; {
|
||||
description = "Console implementation of 2048 game";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "http://www.dettus.net/n2048/";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -871,7 +871,7 @@ self: super: {
|
|||
vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {
|
||||
pname = "vim-markdown-composer-bin";
|
||||
inherit (super.vim-markdown-composer) src version;
|
||||
cargoSha256 = "1cvnjsw5dd02wrm1q5xi8b033rsn44f7fkmw5j7lhskv5j286zrh";
|
||||
cargoSha256 = "03d7kap6vha1jmyfrjqaja5439x6mhnvjjbz3rmxb3x4dpppbpj1";
|
||||
};
|
||||
in
|
||||
super.vim-markdown-composer.overrideAttrs (oldAttrs: rec {
|
||||
|
|
|
|||
|
|
@ -9,21 +9,34 @@
|
|||
, enableWebDAV ? false, sqlite, libuuid
|
||||
, enableExtendedAttrs ? false, attr
|
||||
, perl
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lighttpd";
|
||||
version = "1.4.59";
|
||||
version = "1.4.63";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU=";
|
||||
sha256 = "1fgasvif13gvzz4rf5mjpy28cbw9fs4ymhx18494mxgb080pzvra";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-22707.patch";
|
||||
url = "https://github.com/lighttpd/lighttpd1.4/commit/8c62a890e23f5853b1a562b03fe3e1bccc6e7664.patch";
|
||||
sha256 = "0zm2khgllsd1ivh9m7sisfsyrdfz45zsmiwl963wf0gn8m100gzk";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs tests
|
||||
# Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests
|
||||
sed -ire '/[$]self->{HOSTNAME} *=/i if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm
|
||||
# it's difficult to prevent this test from trying to use /var/tmp (which
|
||||
# the sandbox doesn't have) so until libredirect has support for mkstemp
|
||||
# calls it's easiest to disable it
|
||||
sed -i '/test_mod_ssi/d' src/t/test_mod.c
|
||||
'';
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-facebook";
|
||||
version = "0.3.2";
|
||||
version = "2022-01-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "facebook";
|
||||
rev = "v${version}";
|
||||
sha256 = "1n7gshm2nir6vgjkj36lq9m2bclkgy0y236xi8zvdlvfcb2m596f";
|
||||
rev = "eebfbe49fc699806e1d71becf261ba0995c91f60";
|
||||
hash = "sha256-zfsuoPySIRAAmsSL0NUUVH7k+xV7rZOHOkIvBQdVe0A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -30,9 +30,13 @@ python3.pkgs.buildPythonPackage rec {
|
|||
ruamel-yaml
|
||||
unpaddedbase64
|
||||
yarl
|
||||
zstandard
|
||||
] ++ lib.optional enableSystemd systemd;
|
||||
|
||||
doCheck = false;
|
||||
postPatch = ''
|
||||
# Drop version limiting so that every dependency update doesn't break this package.
|
||||
sed -i -e 's/,<.*//' requirements.txt
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
|
|
@ -44,6 +48,10 @@ python3.pkgs.buildPythonPackage rec {
|
|||
chmod +x $out/bin/mautrix-facebook
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
$out/bin/mautrix-facebook --help
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mautrix/facebook";
|
||||
description = "A Matrix-Facebook Messenger puppeting bridge";
|
||||
|
|
|
|||
|
|
@ -1,38 +1,27 @@
|
|||
{lib, stdenv, fetchurl, java, makeWrapper}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena";
|
||||
version = "4.3.2";
|
||||
name="${baseName}-${version}";
|
||||
url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
{ lib, stdenv, fetchurl, java, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-jena";
|
||||
version = "4.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y=";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
installPhase = ''
|
||||
cp -r . "$out"
|
||||
for i in "$out"/bin/*; do
|
||||
wrapProgram "$i" --prefix "PATH" : "${java}/bin/"
|
||||
done
|
||||
'';
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
meta = with lib; {
|
||||
description = "RDF database";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://jena.apache.org";
|
||||
downloadPage = "https://archive.apache.org/dist/jena/binaries/";
|
||||
updateWalker = true;
|
||||
downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,15 @@
|
|||
{lib, stdenv, fetchurl, java, makeWrapper}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="apache-jena-fuseki";
|
||||
version = "4.3.1";
|
||||
name="${baseName}-${version}";
|
||||
url="https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
{ lib, stdenv, fetchurl, java, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-jena-fuseki";
|
||||
version = "4.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx";
|
||||
};
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
installPhase = ''
|
||||
cp -r . "$out"
|
||||
chmod +x $out/fuseki
|
||||
|
|
@ -29,14 +21,12 @@ stdenv.mkDerivation {
|
|||
;
|
||||
done
|
||||
'';
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
meta = with lib; {
|
||||
description = "SPARQL server";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://jena.apache.org";
|
||||
downloadPage = "https://archive.apache.org/dist/jena/binaries/";
|
||||
downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "lemmy-ui",
|
||||
"description": "An isomorphic UI for lemmy",
|
||||
"version": "0.14.0",
|
||||
"version": "0.15.1",
|
||||
"author": "Dessalines <tyhou13@gmx.com>",
|
||||
"license": "AGPL-3.0",
|
||||
"scripts": {
|
||||
|
|
@ -17,13 +17,14 @@
|
|||
},
|
||||
"repository": "https://github.com/LemmyNet/lemmy-ui",
|
||||
"dependencies": {
|
||||
"@typescript-eslint/parser": "^5.4.0",
|
||||
"@typescript-eslint/parser": "^5.6.0",
|
||||
"autosize": "^5.0.1",
|
||||
"check-password-strength": "^2.0.3",
|
||||
"choices.js": "^9.0.1",
|
||||
"choices.js": "^10.0.0",
|
||||
"classnames": "^2.3.1",
|
||||
"emoji-short-name": "^1.0.0",
|
||||
"express": "~4.17.1",
|
||||
"i18next": "^21.5.0",
|
||||
"i18next": "^21.5.4",
|
||||
"inferno": "^7.4.11",
|
||||
"inferno-create-element": "^7.4.11",
|
||||
"inferno-helmet": "^5.2.1",
|
||||
|
|
@ -39,46 +40,45 @@
|
|||
"markdown-it-sub": "^1.0.0",
|
||||
"markdown-it-sup": "^1.0.0",
|
||||
"moment": "^2.29.1",
|
||||
"reconnecting-websocket": "^4.4.0",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"rxjs": "^7.4.0",
|
||||
"sass": "^1.47.0",
|
||||
"serialize-javascript": "^6.0.0",
|
||||
"tippy.js": "^6.3.7",
|
||||
"toastify-js": "^1.11.2",
|
||||
"tributejs": "^5.1.3",
|
||||
"ws": "^8.2.3"
|
||||
"websocket-ts": "^1.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.16.0",
|
||||
"@babel/plugin-transform-runtime": "^7.16.0",
|
||||
"@babel/plugin-transform-runtime": "^7.16.4",
|
||||
"@babel/plugin-transform-typescript": "^7.16.1",
|
||||
"@babel/preset-env": "7.16.0",
|
||||
"@babel/preset-env": "7.16.8",
|
||||
"@babel/preset-typescript": "^7.16.0",
|
||||
"@babel/runtime": "^7.16.3",
|
||||
"@types/autosize": "^4.0.0",
|
||||
"@types/express": "^4.17.13",
|
||||
"@types/node": "^16.11.7",
|
||||
"@types/node": "^17.0.8",
|
||||
"@types/node-fetch": "^2.5.11",
|
||||
"@types/serialize-javascript": "^5.0.1",
|
||||
"@typescript-eslint/eslint-plugin": "^5.4.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.6.0",
|
||||
"babel-loader": "^8.2.3",
|
||||
"babel-plugin-inferno": "^6.3.0",
|
||||
"bootstrap": "^5.1.3",
|
||||
"bootswatch": "^5.1.3",
|
||||
"clean-webpack-plugin": "^4.0.0",
|
||||
"copy-webpack-plugin": "^9.1.0",
|
||||
"copy-webpack-plugin": "^10.0.0",
|
||||
"css-loader": "^6.5.1",
|
||||
"eslint": "^8.2.0",
|
||||
"eslint": "^8.4.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"husky": "^7.0.4",
|
||||
"import-sort-style-module": "^6.0.0",
|
||||
"iso-639-1": "^2.1.10",
|
||||
"lemmy-js-client": "0.14.0-rc.1",
|
||||
"lint-staged": "^11.2.6",
|
||||
"mini-css-extract-plugin": "^2.4.4",
|
||||
"lemmy-js-client": "0.15.0",
|
||||
"lint-staged": "^12.1.2",
|
||||
"mini-css-extract-plugin": "^2.4.5",
|
||||
"node-fetch": "^2.6.1",
|
||||
"node-sass": "^6.0.1",
|
||||
"prettier": "^2.4.1",
|
||||
"prettier": "^2.5.1",
|
||||
"prettier-plugin-import-sort": "^0.0.7",
|
||||
"prettier-plugin-organize-imports": "^2.3.4",
|
||||
"prettier-plugin-packagejson": "^2.2.15",
|
||||
|
|
@ -88,10 +88,10 @@
|
|||
"sortpack": "^2.2.0",
|
||||
"style-loader": "^3.3.1",
|
||||
"terser": "^5.10.0",
|
||||
"typescript": "^4.4.4",
|
||||
"webpack": "5.64.1",
|
||||
"typescript": "^4.5.2",
|
||||
"webpack": "5.66.0",
|
||||
"webpack-cli": "^4.9.1",
|
||||
"webpack-dev-server": "4.5.0",
|
||||
"webpack-dev-server": "4.7.3",
|
||||
"webpack-node-externals": "^3.0.0"
|
||||
},
|
||||
"engines": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "0.14.0",
|
||||
"serverSha256": "sha256-rrLOWoy4GkVtfIPpyR0Zwvnqq39CoZRDaVPNSpeJpkA=",
|
||||
"serverCargoSha256": "sha256-6HrsMwzcmNw8udsCdvn8zgIWN0N3Vvsn9bFk+5tBOds=",
|
||||
"uiSha256": "sha256-e+ajyUc2P5eK1dH7qQsC9BmZgT3NCGLbbzbUE3i2rXY=",
|
||||
"uiYarnDepsSha256": "sha256-g3jCc98ftFyvZGD2bESY1eIsLZyQxZpDxgHdRGu78vs="
|
||||
"version": "0.15.1",
|
||||
"serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=",
|
||||
"serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=",
|
||||
"uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=",
|
||||
"uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, postgresql
|
||||
, libiconv
|
||||
, Security
|
||||
, protobuf
|
||||
}:
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
|
|
@ -34,6 +35,10 @@ rustPlatform.buildRustPackage rec {
|
|||
OPENSSL_LIB_DIR = "${openssl.out}/lib";
|
||||
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
|
||||
|
||||
PROTOC = "${protobuf}/bin/protoc";
|
||||
PROTOC_INCLUDE = "${protobuf}/include";
|
||||
nativeBuildInputs = [ protobuf ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.99";
|
||||
|
|
@ -7,6 +7,14 @@ stdenv.mkDerivation rec {
|
|||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
|
||||
};
|
||||
patches = [
|
||||
# Pull upstream patch for -fno-common toolchains.
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "http://git.savannah.gnu.org/cgit/barcode.git/patch/?id=4654f68706a459c9602d9932b56a56e8930f7d53";
|
||||
sha256 = "15kclzcwlh0ymr7m48vc0m8z98q0wf4xbfcky4g1y8yvvpvvrfgc";
|
||||
})
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,20 +2,22 @@
|
|||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, installShellFiles
|
||||
, testVersion
|
||||
, lsd
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lsd";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Peltoche";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-r/Rllu+tgKqz+vkxA8BSN+3V0lUUd6dEATfickQp4+s=";
|
||||
sha256 = "sha256-4pa8yJjUTO5MUDuljfU9Vo2ZjbsIwWJsJj6VVNfN25A=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-O8P29eYlHgmmAADZ/DgTBmj0ZOa+4u/Oee+TMF+/4Ro=";
|
||||
cargoSha256 = "sha256-P0HJVp2ReJuLSZrArw/EAfLFDOZqswI0nD1SCHwegoE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
|
|
@ -25,18 +27,9 @@ rustPlatform.buildRustPackage rec {
|
|||
# Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
testFile=$(mktemp /tmp/lsd-test.XXXX)
|
||||
echo 'abc' > $testFile
|
||||
$out/bin/lsd --classic --blocks "size,name" -l $testFile | grep "4 B $testFile"
|
||||
$out/bin/lsd --version | grep "${version}"
|
||||
rm $testFile
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
passthru.tests.version = testVersion {
|
||||
package = lsd;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Peltoche/lsd";
|
||||
|
|
|
|||
|
|
@ -3488,6 +3488,8 @@ with pkgs;
|
|||
|
||||
nrsc5 = callPackage ../applications/misc/nrsc5 { };
|
||||
|
||||
nsync = callPackage ../development/libraries/nsync { };
|
||||
|
||||
nwipe = callPackage ../tools/security/nwipe { };
|
||||
|
||||
nx2elf = callPackage ../tools/compression/nx2elf { };
|
||||
|
|
@ -17286,7 +17288,9 @@ with pkgs;
|
|||
llvmPackages = llvmPackages_11;
|
||||
};
|
||||
|
||||
isso = callPackage ../servers/isso { };
|
||||
isso = callPackage ../servers/isso {
|
||||
nodejs = nodejs-14_x;
|
||||
};
|
||||
|
||||
itk4 = callPackage ../development/libraries/itk/4.x.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ mapAliases ({
|
|||
bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27
|
||||
class-registry = phx-class-registry; # added 2021-10-05
|
||||
ConfigArgParse = configargparse; # added 2021-03-18
|
||||
cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
|
||||
dateutil = python-dateutil; # added 2021-07-03
|
||||
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
|
||||
dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04
|
||||
|
|
|
|||
|
|
@ -1825,8 +1825,6 @@ in {
|
|||
|
||||
coveralls = callPackage ../development/python-modules/coveralls { };
|
||||
|
||||
cozy = callPackage ../development/python-modules/cozy { };
|
||||
|
||||
cppe = callPackage ../development/python-modules/cppe {
|
||||
cppe = pkgs.cppe;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue