Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
@@ -7995,6 +7995,12 @@
|
||||
githubId = 19036;
|
||||
name = "Matthew Bauer";
|
||||
};
|
||||
matthiasbenaets = {
|
||||
email = "matthias.benaets@gmail.com";
|
||||
github = "MatthiasBenaets";
|
||||
githubId = 89214559;
|
||||
name = "Matthias Benaets";
|
||||
};
|
||||
matthiasbeyer = {
|
||||
email = "mail@beyermatthias.de";
|
||||
matrix = "@musicmatze:beyermatthi.as";
|
||||
@@ -10188,6 +10194,12 @@
|
||||
githubId = 10473184;
|
||||
name = "Jia Xiaodong";
|
||||
};
|
||||
polarmutex = {
|
||||
email = "brian@brianryall.xyz";
|
||||
github = "polarmutex";
|
||||
githubId = 115141;
|
||||
name = "Brian Ryall";
|
||||
};
|
||||
polendri = {
|
||||
email = "paul@ijj.li";
|
||||
github = "polendri";
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.hardware.new-lg4ff;
|
||||
in {
|
||||
options.hardware.new-lg4ff = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enables improved Linux module drivers for Logitech driving wheels.
|
||||
This will replace the existing in-kernel hid-logitech modules.
|
||||
Works most notably on the Logitech G25, G27, G29 and Driving Force (GT).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
boot = {
|
||||
extraModulePackages = [ pkgs.new-lg4ff ];
|
||||
kernelModules = [ "hid-logitech-new" ];
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ matthiasbenaets ];
|
||||
}
|
||||
@@ -66,6 +66,7 @@
|
||||
./hardware/network/ath-user-regd.nix
|
||||
./hardware/network/b43.nix
|
||||
./hardware/network/intel-2200bg.nix
|
||||
./hardware/new-lg4ff.nix
|
||||
./hardware/nitrokey.nix
|
||||
./hardware/opengl.nix
|
||||
./hardware/openrazer.nix
|
||||
|
||||
@@ -53,7 +53,10 @@ in
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
StateDirectory = "jellyfin";
|
||||
StateDirectoryMode = "0700";
|
||||
CacheDirectory = "jellyfin";
|
||||
CacheDirectoryMode = "0700";
|
||||
UMask = "0077";
|
||||
ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
|
||||
Restart = "on-failure";
|
||||
|
||||
|
||||
@@ -9,6 +9,12 @@ let
|
||||
};
|
||||
interfaceOptions = {
|
||||
options = {
|
||||
autoStart = mkOption {
|
||||
default = true;
|
||||
description = "Whether this VPN connection should be started automatically.";
|
||||
type = types.bool;
|
||||
};
|
||||
|
||||
gateway = mkOption {
|
||||
description = "Gateway server to connect to.";
|
||||
example = "gateway.example.com";
|
||||
@@ -95,7 +101,7 @@ let
|
||||
description = "OpenConnect Interface - ${name}";
|
||||
requires = [ "network-online.target" ];
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = optional icfg.autoStart "multi-user.target";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
|
||||
@@ -204,21 +204,6 @@ def get_profiles() -> List[str]:
|
||||
else:
|
||||
return []
|
||||
|
||||
def should_update(v_from: str, v_to: str) -> bool:
|
||||
# see https://github.com/systemd/systemd/blob/main/src/boot/bootctl.c compare_product function
|
||||
|
||||
len_from = len(v_from)
|
||||
len_to = len(v_to)
|
||||
|
||||
if len_from < len_to:
|
||||
return False
|
||||
|
||||
if len_from > len_to:
|
||||
return True
|
||||
|
||||
return v_from < v_to
|
||||
|
||||
|
||||
def main() -> None:
|
||||
parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files')
|
||||
parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
|
||||
@@ -276,7 +261,7 @@ def main() -> None:
|
||||
installed_version = installed_match.group(1)
|
||||
available_version = available_match.group(1)
|
||||
|
||||
if should_update(installed_version, available_version):
|
||||
if installed_version < available_version:
|
||||
print("updating systemd-boot from %s to %s" % (installed_version, available_version))
|
||||
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
|
||||
else:
|
||||
|
||||
@@ -2,16 +2,15 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.41.3";
|
||||
name = "${pname}-${version}";
|
||||
version = "2.42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-Bh3wB5AAgY6l1W3UtWUHW+lJgJ0w6gw23WvEe3/Xs1g=";
|
||||
hash = "sha256-LhpZ2aTPT3XJWeWsl7MCbFsgwSqTHfpdRJD9SveIqQg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
# Hotplug events from udevd are fired into the kernel, which then re-broadcasts them over a
|
||||
@@ -25,12 +24,12 @@ let
|
||||
});
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
inherit name src;
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: [ systemdPatched ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop
|
||||
install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png
|
||||
${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
@@ -19,20 +19,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-obfuscate";
|
||||
version = "0.0.4";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Obfuscate";
|
||||
rev = version;
|
||||
sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4=";
|
||||
sha256 = "sha256-jEMOg2yHi6K57XhA/7hkwwvedmikoB8pGV3ka+jixq8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U=";
|
||||
sha256 = "sha256-P04BeidLXouPLzT/vsa4VC5AOENF0W4gqXqzdmRFhmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.rust.rustc
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -23,16 +23,16 @@
|
||||
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
|
||||
}) rec {
|
||||
pname = "dbeaver";
|
||||
version = "22.0.2"; # When updating also update mvnSha256
|
||||
version = "22.0.5"; # When updating also update mvnSha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-3tIxHw4734ggIUDjZO2EGIMbyPNP3yvy9QgnMLw+/fc=";
|
||||
sha256 = "sha256-P+t1wtMTVKbfEXCFuz8zPNy3z4YysJRyOvTxiDFlp2c=";
|
||||
};
|
||||
|
||||
mvnSha256 = "os3eb+In8XreHwdZMacXafIVgOAeSSfCIkO5pwaO6MI=";
|
||||
mvnSha256 = "veclFlzLhTU+nT360qxRNut+yEi2dfTBxdQASyRMqhI=";
|
||||
mvnParameters = "-P desktop,all-platforms";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p2pool";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lJJZ0ZsPTPEaYyzi8chAPo1OlZQ6p9QVqwtSOyJD7W4=";
|
||||
sha256 = "sha256-cpBMzYLcU93GXYkBhUdoRovjQ2hd1+pAt6d9aAOaZT8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.23.5";
|
||||
version = "1.23.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LhJ3gThcsWnawSOmHSzWOG8tfODIPo4dJTMeLKmvMdM=";
|
||||
sha256 = "sha256-YHlcopB47HVLO/4QI8HxjMBzCpcHVnlAz3EOmZI+EG8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gmailctl";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrt";
|
||||
repo = "gmailctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NtmpXYC4JBbL5wW1yp5g7In8NZC4N6nvBaoUUcGs15Y=";
|
||||
sha256 = "sha256-tAYFuxB8LSyFHraAQxCj8Q09mS/9RYcinVm5whpRh04=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+4HBWMaENG1NgUsFzN1uxyDbWOOiFba/ybWV7152g84=";
|
||||
vendorSha256 = "sha256-IFxKczPrqCM9NOoOJayfbrsJIMf3eoI9zXSFns0/i8o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gurk-rs";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boxdot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4=";
|
||||
sha256 = "sha256-WZUoUvu7GaiBOaRAOGRCXrLe6u3DRbI6CDTAf5jryGc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY=";
|
||||
cargoHash = "sha256-81ZW61JX40W0D/cmYogR3RJH2dvEKW1K7sIsl2io/7E=";
|
||||
buildInputs = [ protobuf ];
|
||||
|
||||
PROTOC = "${protobuf}/bin/protoc";
|
||||
|
||||
@@ -26,12 +26,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "4.9";
|
||||
version = "4.10";
|
||||
|
||||
# raw source code doesn't work out of box; fetchFromGitHub not usable
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-mlUcMMG3EhmfwiJ6EJr7mE177xjhOBcLvHIlxsH6ty0=";
|
||||
hash = "sha256-f9S7kZ9uOTiKtHv6Ea9vo/Wem5vWlcfU6SCK+Fy5yTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -50,7 +50,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
homepage = "https://ledger-cli.org/";
|
||||
description = "A double-entry accounting system with a command-line reporting interface";
|
||||
license = licenses.bsd3;
|
||||
|
||||
@@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ];
|
||||
buildInputs = [ gmp git python3.pkgs.toml readline swig libantlr3c antlr3_4 boost jdk python3 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ cln ];
|
||||
configureFlags = [
|
||||
"--enable-language-bindings=c,c++,java"
|
||||
"--enable-gpl"
|
||||
"--with-cln"
|
||||
"--with-readline"
|
||||
"--with-boost=${boost.dev}"
|
||||
];
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [ "--with-cln" ];
|
||||
|
||||
prePatch = ''
|
||||
patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, gmp, mpfr, python3
|
||||
, jemalloc, ninja, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "lean2";
|
||||
version = "2018-10-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover";
|
||||
repo = "lean2";
|
||||
rev = "8072fdf9a0b31abb9d43ab894d7a858639e20ed7";
|
||||
sha256 = "12bscgihdgvaq5xi0hqf5r4w386zxm3nkx1n150lv5smhg8ga3gg";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/leanprover/lean2/pull/13
|
||||
(fetchpatch {
|
||||
name = "lean2-fix-compilation-error.patch";
|
||||
url = "https://github.com/collares/lean2/commit/09b316ce75fd330b3b140d138bcdae2b0e909234.patch";
|
||||
sha256 = "060mvqn9y8lsn4l20q9rhamkymzsgh0r1vzkjw78gnj8kjw67jl5";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ cmake makeWrapper ninja ];
|
||||
buildInputs = [ gmp mpfr python3 jemalloc ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs bin/leantags
|
||||
cd src
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-GNinja" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatic and interactive theorem prover (version with HoTT support)";
|
||||
homepage = "http://leanprover.github.io";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thoughtpolice gebner ];
|
||||
broken = stdenv.isAarch64;
|
||||
mainProgram = "lean";
|
||||
};
|
||||
}
|
||||
@@ -82,6 +82,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
mainProgram = "gp";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RYQVcbyKIv/FlrtROoQywWR+iF+4KYiYrrzErUrOCWM=";
|
||||
sha256 = "sha256-wL631cbA6ffXZomi6iDHk7XerRlpIL6T2qlEiQvFSJY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -78,23 +78,42 @@ buildPythonApplication rec {
|
||||
outputs = [ "out" "terminfo" "shell_integration" ];
|
||||
|
||||
patches = [
|
||||
# Required to get `test_ssh_env_vars` to pass.
|
||||
(fetchpatch {
|
||||
name = "increase-pty-lines.patch";
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/eb84990f5a8edc458e04d24cc1cda05316d74ceb.patch";
|
||||
sha256 = "sha256-eOANfhGPMoN4FqxtIGDBu5X0O3RPLABDnL+LKqSLROI=";
|
||||
})
|
||||
# Fix to ensure that files in tar files used by SSH kitten have write permissions.
|
||||
./tarball-restore-write-permissions.patch
|
||||
(fetchpatch {
|
||||
name = "fix-tarball-file-permissions.patch";
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/8540ca399053e8d42df27283bb5dd4af562ed29b.patch";
|
||||
sha256 = "sha256-y5w+ritkR+ZEfNSRDQW9r3BU2qt98UNK7vdEX/X+mKU=";
|
||||
})
|
||||
|
||||
# Remove upon next release. Needed because of a missing #define.
|
||||
(fetchpatch {
|
||||
name = "fontconfig-1.patch";
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/bec620a8d30c36453e471b140b07483c7f875bf4.patch";
|
||||
sha256 = "sha256-r1OTcXdO+RUAXmmIqI07m+z0zXq8DXCzgBRXPpnkGGM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fontconfig-2.patch";
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/1283a2b7e552d30cabce9345e5c13e5f9079183d.patch";
|
||||
sha256 = "sha256-UM/OsumnfVHuHTahpRwyWZOeu6L8WOwbBf3lcjwdTj8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fontconfig-3.patch";
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/5c4abe749b1f50ae556a711d24ac7f3e384fac4e.patch";
|
||||
sha256 = "sha256-amvyv5cZxHGPg7dZv649WjH4MNloFbmz5D4rhjKNzYA=";
|
||||
})
|
||||
|
||||
# Needed on darwin
|
||||
|
||||
# Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about
|
||||
# permissions.
|
||||
./zsh-compinit.patch
|
||||
# Skip `test_ssh_login_shell_detection` in some cases, build users have their shell set to
|
||||
# `/sbin/nologin` which causes issues.
|
||||
./disable-test_ssh_login_shell_detection.patch
|
||||
|
||||
# Skip login shell detection when login shell is set to nologin
|
||||
(fetchpatch {
|
||||
name = "skip-login-shell-detection-for-nologin.patch";
|
||||
url = "https://github.com/kovidgoyal/kitty/commit/27906ea853ce7862bcb83e324ef80f6337b5d846.patch";
|
||||
sha256 = "sha256-Zg6uWkiWvb45i4xcp9k6jy0R2IQMT4PXr7BenzZ/md8=";
|
||||
})
|
||||
# Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes:
|
||||
# OSError: master_fd is in error condition
|
||||
./disable-test_ssh_bootstrap_with_different_launchers.patch
|
||||
@@ -122,6 +141,7 @@ buildPythonApplication rec {
|
||||
--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' \
|
||||
--fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \
|
||||
${commonOptions}
|
||||
''}
|
||||
runHook postBuild
|
||||
@@ -203,7 +223,6 @@ buildPythonApplication rec {
|
||||
passthru.tests.test = nixosTests.terminal-emulators.kitty;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://github.com/kovidgoyal/kitty";
|
||||
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
|
||||
license = licenses.gpl3Only;
|
||||
|
||||
-13
@@ -1,13 +0,0 @@
|
||||
diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py
|
||||
index 1f424146..57620334 100644
|
||||
--- a/kitty_tests/ssh.py
|
||||
+++ b/kitty_tests/ssh.py
|
||||
@@ -197,7 +197,7 @@ def test_ssh_login_shell_detection(self):
|
||||
expected_login_shell = pwd.getpwuid(os.geteuid()).pw_shell
|
||||
for m in methods:
|
||||
for sh in self.all_possible_sh:
|
||||
- if 'python' in sh:
|
||||
+ if 'python' in sh or '/sbin/nologin' in expected_login_shell:
|
||||
continue
|
||||
with self.subTest(sh=sh, method=m), tempfile.TemporaryDirectory() as tdir:
|
||||
pty = self.check_bootstrap(sh, tdir, test_script=f'{m}; echo "$login_shell"; exit 0', SHELL_INTEGRATION_VALUE='')
|
||||
@@ -1,27 +0,0 @@
|
||||
From 59f6876187da2c01b35e696e169ca98239c08a41 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Felice <jason.m.felice@gmail.com>
|
||||
Date: Tue, 24 May 2022 07:54:25 -0400
|
||||
Subject: [PATCH] Restore write permissions in tarball
|
||||
|
||||
In Nix, the source files are stored in an immutable store and
|
||||
therefore have been stripped of write permissions. When the SSH
|
||||
kitten makes the tarfile, the files contained in it are also missing
|
||||
the write permissions, causing commands on the remote side to fail.
|
||||
---
|
||||
kittens/ssh/main.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/kittens/ssh/main.py b/kittens/ssh/main.py
|
||||
index 0b50d5ff..f80ac13d 100644
|
||||
--- a/kittens/ssh/main.py
|
||||
+++ b/kittens/ssh/main.py
|
||||
@@ -123,6 +123,7 @@ def make_tarfile(ssh_opts: SSHOptions, base_env: Dict[str, str], compression: st
|
||||
def normalize_tarinfo(tarinfo: tarfile.TarInfo) -> tarfile.TarInfo:
|
||||
tarinfo.uname = tarinfo.gname = ''
|
||||
tarinfo.uid = tarinfo.gid = 0
|
||||
+ tarinfo.mode |= 0o200
|
||||
return tarinfo
|
||||
|
||||
def add_data_as_file(tf: tarfile.TarFile, arcname: str, data: Union[str, bytes]) -> tarfile.TarInfo:
|
||||
--
|
||||
2.36.0
|
||||
@@ -1,50 +0,0 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline
|
||||
, cmake }:
|
||||
let
|
||||
version = "0.3.2";
|
||||
in
|
||||
buildGoPackage {
|
||||
pname = "grv";
|
||||
inherit version;
|
||||
|
||||
buildInputs = [ ncurses readline curl ];
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
goPackagePath = "github.com/rgburke/grv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rgburke";
|
||||
repo = "grv";
|
||||
rev = "v${version}";
|
||||
sha256 = "0bpjsk35rlp56z8149z890adnhmxyh743vsls3q86j4682b83kyf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm util/update_latest_release.go
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
cd $NIX_BUILD_TOP/go/src/$goPackagePath
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make build-only
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D grv $out/bin/grv
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GRV is a terminal interface for viewing Git repositories";
|
||||
homepage = "https://github.com/rgburke/grv";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@@ -1,64 +1,134 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch
|
||||
, cairo, ffmpeg, sox, xdg-utils, texlive
|
||||
, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub
|
||||
, pbr, fetchPypi
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "manim";
|
||||
version = "0.1.10";
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "manimlib";
|
||||
inherit version;
|
||||
sha256 = "0vg9b3rwypq5zir74pi0pmj47yqlcg7hrvscwrpjzjbqq2yihn49";
|
||||
, cairo
|
||||
, ffmpeg
|
||||
, texlive
|
||||
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
# According to ManimCommunity documentation manim uses tex-packages packaged
|
||||
# in a custom distribution called "manim-latex",
|
||||
#
|
||||
# https://community.chocolatey.org/packages/manim-latex#files
|
||||
#
|
||||
# which includes another cutom distribution called tinytex, for which the
|
||||
# package list can be found at
|
||||
#
|
||||
# https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt
|
||||
#
|
||||
# these two combined add up to:
|
||||
manim-tinytex = {
|
||||
inherit (texlive)
|
||||
|
||||
# tinytex
|
||||
scheme-infraonly amsfonts amsmath atbegshi atveryend auxhook babel bibtex
|
||||
bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex
|
||||
etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec
|
||||
framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def
|
||||
grffile helvetic hycolor hyperref hyph-utf8 iftex inconsolata infwarerr
|
||||
intcalc knuth-lib kvdefinekeys kvoptions kvsetkeys l3backend l3kernel
|
||||
l3packages latex latex-amsmath-dev latex-bin latex-fonts latex-tools-dev
|
||||
latexconfig latexmk letltxmacro lm lm-math ltxcmds lua-alt-getopt luahbtex
|
||||
lualatex-math lualibs luaotfload luatex mdwtools metafont mfware natbib
|
||||
pdfescape pdftex pdftexcmds plain psnfss refcount rerunfilecheck stringenc
|
||||
tex tex-ini-files times tipa tools unicode-data unicode-math uniquecounter
|
||||
url xcolor xetex xetexconfig xkeyval xunicode zapfding
|
||||
|
||||
# manim-latex
|
||||
standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e
|
||||
fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super
|
||||
babel-english gnu-freefont mathastext cbfonts-fd;
|
||||
};
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "manim";
|
||||
format = "pyproject";
|
||||
version = "0.15.2";
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManimCommunity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "l5JiFWCMQbGnwRRtYzCHBXdVzWBrTNPdcIYaAt/wRNA=";
|
||||
};
|
||||
|
||||
patches = [ ./remove-dependency-constraints.patch ];
|
||||
|
||||
nativeBuildInputs = [ pbr ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colour
|
||||
numpy
|
||||
pillow
|
||||
progressbar
|
||||
scipy
|
||||
tqdm
|
||||
opencv
|
||||
pycairo
|
||||
pydub
|
||||
|
||||
cairo sox ffmpeg xdg-utils
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.poetry-core
|
||||
];
|
||||
|
||||
# Test with texlive to see whether it works but don't propagate
|
||||
# because it's huge and optional
|
||||
# TODO: Use smaller TexLive distribution
|
||||
# Doesn't need everything but it's hard to figure out what it needs
|
||||
checkInputs = [ cairo sox ffmpeg xdg-utils texlive.combined.scheme-full ];
|
||||
|
||||
# Simple test and complex test with LaTeX
|
||||
checkPhase = ''
|
||||
for scene in SquareToCircle OpeningManimExample
|
||||
do
|
||||
python3 manim.py example_scenes.py $scene -l
|
||||
tail -n 20 files/Tex/*.log # Print potential LaTeX erorrs
|
||||
${file}/bin/file videos/example_scenes/480p15/$scene.mp4 \
|
||||
| tee | grep -F "ISO Media, MP4 Base Media v1 [ISO 14496-12:2003]"
|
||||
done
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'cloup = "^0.13.0"' 'cloup = "*"' \
|
||||
--replace 'mapbox-earcut = "^0.12.10"' 'mapbox-earcut = "*"' \
|
||||
'';
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
buildInputs = [ cairo ];
|
||||
|
||||
meta = {
|
||||
description = "Animation engine for explanatory math videos";
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
click
|
||||
click-default-group
|
||||
cloup
|
||||
colour
|
||||
grpcio
|
||||
grpcio-tools
|
||||
importlib-metadata
|
||||
isosurfaces
|
||||
jupyterlab
|
||||
manimpango
|
||||
mapbox-earcut
|
||||
moderngl
|
||||
moderngl-window
|
||||
networkx
|
||||
numpy
|
||||
pillow
|
||||
pycairo
|
||||
pydub
|
||||
pygments
|
||||
pysrt
|
||||
rich
|
||||
scipy
|
||||
screeninfo
|
||||
skia-pathops
|
||||
srt
|
||||
tqdm
|
||||
watchdog
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [
|
||||
ffmpeg
|
||||
(texlive.combine manim-tinytex)
|
||||
])
|
||||
];
|
||||
|
||||
|
||||
checkInputs = [
|
||||
python3.pkgs.pytest-cov
|
||||
python3.pkgs.pytest-xdist
|
||||
python3.pkgs.pytestCheckHook
|
||||
|
||||
ffmpeg
|
||||
(texlive.combine manim-tinytex)
|
||||
];
|
||||
|
||||
# about 55 of ~600 tests failing mostly due to demand for display
|
||||
disabledTests = import ./failing_tests.nix;
|
||||
|
||||
pythonImportsCheck = [ "manim" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Animation engine for explanatory math videos - Community version";
|
||||
longDescription = ''
|
||||
Manim is an animation engine for explanatory math videos. It's used to
|
||||
create precise animations programmatically, as seen in the videos of
|
||||
3Blue1Brown on YouTube.
|
||||
3Blue1Brown on YouTube. This is the community maintained version of
|
||||
manim.
|
||||
'';
|
||||
homepage = "https://github.com/3b1b/manim";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ johnazoidberg ];
|
||||
homepage = "https://github.com/ManimCommunity/manim";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ friedelino ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
# reason for failure: tests try to open display
|
||||
[
|
||||
"test_background_color"
|
||||
"test_scene_add_remove"
|
||||
"test_Circle"
|
||||
"test_wait_skip"
|
||||
"test_basic_scene_with_default_values"
|
||||
"test_dry_run_with_png_format"
|
||||
"test_dry_run_with_png_format_skipped_animations"
|
||||
"test_FixedMobjects3D"
|
||||
"test_basic_scene_l_flag"
|
||||
"test_n_flag"
|
||||
"test_s_flag_opengl_renderer"
|
||||
"test_s_flag_no_animations"
|
||||
"test_image_output_for_static_scene"
|
||||
"test_no_image_output_with_interactive_embed"
|
||||
"test_no_default_image_output_with_non_static_scene"
|
||||
"test_image_output_for_static_scene_with_write_to_movie"
|
||||
"test_s_flag"
|
||||
"test_r_flag"
|
||||
"test_play_skip"
|
||||
"test_write_to_movie_disables_window"
|
||||
"test_a_flag"
|
||||
"test_pixel_coords_to_space_coords"
|
||||
"test_t_values"
|
||||
"test_custom_folders"
|
||||
"test_t_values[15]"
|
||||
"test_t_values[30]"
|
||||
"test_t_values[60]"
|
||||
"test_dash_as_filename"
|
||||
"test_images_are_created_when_png_format_set_for_opengl"
|
||||
"test_t_values_with_skip_animations"
|
||||
"test_static_wait_detection"
|
||||
"test_non_static_wait_detection"
|
||||
"test_frozen_frame"
|
||||
"test_gif_format_output"
|
||||
"test_animate_with_changed_custom_attribute"
|
||||
"test_images_are_zero_padded_when_zero_pad_set_for_opengl"
|
||||
"test_mp4_format_output"
|
||||
"test_videos_not_created_when_png_format_set"
|
||||
"test_images_are_created_when_png_format_set"
|
||||
"test_images_are_zero_padded_when_zero_pad_set"
|
||||
"test_webm_format_output"
|
||||
"test_default_format_output_for_transparent_flag"
|
||||
"test_mov_can_be_set_as_output_format"
|
||||
"test_force_window_opengl_render_with_format"
|
||||
"test_get_frame_with_preview_disabled"
|
||||
"test_get_frame_with_preview_enabled"
|
||||
] ++
|
||||
|
||||
# reason for failure: tests try to reach network
|
||||
[
|
||||
"test_logging_to_file"
|
||||
"test_plugin_function_like"
|
||||
"test_plugin_no_all"
|
||||
"test_plugin_with_all"
|
||||
] ++
|
||||
|
||||
# failing with:
|
||||
# E AssertionError:
|
||||
# E Not equal to tolerance rtol=1e-07, atol=1.01
|
||||
# E Frame no -1. You can use --show_diff to visually show the difference.
|
||||
# E Mismatched elements: 18525 / 1639680 (1.13%)
|
||||
# E Max absolute difference: 255
|
||||
# E Max relative difference: 255.
|
||||
[
|
||||
"test_Text2Color"
|
||||
] ++
|
||||
|
||||
# failing with:
|
||||
# TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif?
|
||||
[
|
||||
"test_force_window_opengl_render_with_movies"
|
||||
]
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git i/requirements.txt w/requirements.txt
|
||||
index 556122ad..11fd49d5 100644
|
||||
--- i/requirements.txt
|
||||
+++ w/requirements.txt
|
||||
@@ -1,11 +1,10 @@
|
||||
-argparse==1.4.0
|
||||
-colour==0.1.5
|
||||
-numpy==1.15.0
|
||||
-Pillow==5.2.0
|
||||
-progressbar==2.5
|
||||
-scipy==1.1.0
|
||||
-tqdm==4.24.0
|
||||
-opencv-python==3.4.2.17
|
||||
-pycairo==1.17.1; sys_platform == 'linux'
|
||||
-pycairo>=1.18.0; sys_platform == 'win32'
|
||||
-pydub==0.23.0
|
||||
+colour
|
||||
+numpy
|
||||
+Pillow
|
||||
+progressbar
|
||||
+scipy
|
||||
+tqdm
|
||||
+pycairo
|
||||
+pycairo>=1.18.1; sys_platform == 'win32'
|
||||
+pydub
|
||||
+pyreadline==2.1; sys_platform == 'win32'
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.23.2";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U=";
|
||||
sha256 = "sha256-LbLBG8nvEgSF5KAeAYnp7dM9cbqF078QpVai1iDx63U=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@@ -42,11 +42,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "7WWFGuVK3NWKJMhoN9Yk/GoUvYSrIulN9Ao6TP0Z/9s=";
|
||||
sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -25,7 +25,7 @@ gsmakeDerivation rec {
|
||||
cups
|
||||
gmp gnutls
|
||||
libffi binutils-unwrapped
|
||||
libjpeg libtiff libpng giflib giflib
|
||||
libjpeg libtiff libpng giflib
|
||||
libxml2 libxslt libiconv
|
||||
libobjc libgcrypt
|
||||
icu
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
, parsec, process, regex-compat, text, time }:
|
||||
|
||||
let
|
||||
version = "2.3.8";
|
||||
version = "2.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "koka-lang";
|
||||
repo = "koka";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4a9UwtiWq9eFpNHpcrlhYUwzXcr1EXFMjBmDFYP933U=";
|
||||
sha256 = "sha256-+evs5g0qrplUMr8zC51GvUx2JXQBYJb39IaI4rC6CSA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
kklib = stdenv.mkDerivation {
|
||||
|
||||
@@ -63,9 +63,6 @@ assert x11Support -> tcl != null
|
||||
|
||||
assert bluezSupport -> bluez != null;
|
||||
|
||||
assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang))
|
||||
"Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found.";
|
||||
|
||||
assert lib.assertMsg (reproducibleBuild -> stripBytecode)
|
||||
"Deterministic builds require stripping bytecode.";
|
||||
|
||||
@@ -115,7 +112,7 @@ let
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
buildPackages.stdenv.cc
|
||||
pythonForBuild
|
||||
] ++ optionals (stdenv.cc.isClang && enableLTO) [
|
||||
] ++ optionals (stdenv.cc.isClang && (enableLTO || enableOptimizations)) [
|
||||
stdenv.cc.cc.libllvm.out
|
||||
];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, lib, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }:
|
||||
{ fetchFromGitHub, lib, stdenv, zlib, qtbase, qt5compat ? null, cmake, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quazip";
|
||||
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ zlib qtbase ];
|
||||
propagatedBuildInputs = [ qt5compat ];
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.36.2";
|
||||
version = "2.36.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "/pO920oCwONvkm77boHSiv0oi4gk9sXPanXPQCKOAI4=";
|
||||
sha256 = "sha256-cy/PjE7GRLjtKLRuu9fB66udngr+qb315dEnhq/EeNE=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
, "awesome-lint"
|
||||
, "balanceofsatoshis"
|
||||
, "bash-language-server"
|
||||
, "beancount-langserver"
|
||||
, "bower"
|
||||
, "bower2nix"
|
||||
, "browserify"
|
||||
|
||||
+159
-412
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,37 @@
|
||||
{ buildDunePackage
|
||||
, dune-configurator
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, tsdl
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tsdl-image";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanette";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-u6VYAwq+2oLn2Kw1+KQRVPswAqeKDSAaPfGLPrzn30s=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
dune-configurator
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
SDL2
|
||||
SDL2_image
|
||||
tsdl
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OCaml SDL2_image bindings to go with Tsdl";
|
||||
homepage = "https://github.com/sanette/tsdl-image";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
{ buildDunePackage
|
||||
, dune-configurator
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
, tsdl
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tsdl-mixer";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanette";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UDRhwnanrn87/PYVnacur1z/LsKuUu2G+0QQXjTw/IE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
dune-configurator
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
tsdl
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "SDL2_mixer bindings to go with Tsdl";
|
||||
homepage = "https://github.com/sanette/tsdl-mixer";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
{ buildDunePackage
|
||||
, dune-configurator
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, SDL2
|
||||
, SDL2_ttf
|
||||
, tsdl
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tsdl-ttf";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanette";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-COBLF9K8thRROJJGeg4wxqrjB3aBa4CGYkf8HdAQ2o0";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
dune-configurator
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
SDL2
|
||||
SDL2_ttf
|
||||
tsdl
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "SDL2_ttf bindings for Ocaml with Tsdl";
|
||||
homepage = "https://github.com/sanette/tsdl-ttf";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
};
|
||||
}
|
||||
@@ -6,7 +6,7 @@ else
|
||||
|
||||
let
|
||||
pname = "tsdl";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
in
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f";
|
||||
sha256 = "sha256-zjXz2++42FHmbE0nIDeryNQeX+avGwh9rwAs8O0pZYU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ];
|
||||
|
||||
@@ -2,17 +2,20 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.22.1";
|
||||
version = "3.23.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
sha256 = "sha256-fOBs0aPekIvpwbrYxzh1wz7EKGko0Je1f/N5H0DIguw=";
|
||||
hash = "sha256-4OWDwvdQBtV+ZqpITr027z0jwfge5/yOof9Xm7QRtuM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "afdko";
|
||||
version = "3.8.1";
|
||||
version = "3.8.3";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-BaSpw7TiBymCvoP0/z1zynWKQJH/PjbbGf85ZI9LOZw=";
|
||||
sha256 = "0mplyla4zcai3qld7is7bl5wn2kzhp87w87yi13wpqnw06i6ij4b";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
commit 105daa26f09034af58eb13ac7c5c4ff5420c1724
|
||||
commit 1ccbf21a67da0fdbaad881a1f5c2a4df915e8c57
|
||||
Author: sternenseemann <sternenseemann@systemli.org>
|
||||
Date: Tue Oct 5 18:16:10 2021 +0200
|
||||
|
||||
@@ -9,19 +9,17 @@ Date: Tue Oct 5 18:16:10 2021 +0200
|
||||
called antlr4-runtime, not antlr4_static).
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d7f86fb6..c43c4456 100644
|
||||
index e9c8c08e..dc3a46da 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -36,13 +36,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||
# https://www.antlr.org/download/antlr4-cpp-runtime-4.9.2-source.zip
|
||||
@@ -36,11 +36,11 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||
# https://www.antlr.org/download/antlr4-cpp-runtime-4.9.3-source.zip
|
||||
# set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip")
|
||||
|
||||
-add_definitions(-DANTLR4CPP_STATIC)
|
||||
set(ANTLR4_WITH_STATIC_CRT OFF)
|
||||
# Use slightly more recent commit than 4.9.2 to deal with utfcpp test
|
||||
# compilation problems
|
||||
# set(ANTLR4_TAG tags/4.9.2)
|
||||
set(ANTLR4_TAG 916f03366edf15bf8b50010b11d479c189bf9f96)
|
||||
# 4.9.3 is the latest ANTLR4 version
|
||||
set(ANTLR4_TAG tags/4.9.3)
|
||||
-include(ExternalAntlr4Cpp)
|
||||
+find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime)
|
||||
+set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER})
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.5";
|
||||
version = "9.2.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eETl1AMDdY55okPUVDv7L2zZMtDfA4dRi11z37xAM58=";
|
||||
hash = "sha256-SymOCHKIr0SOi4OM+OONA7+A2nV4JMA467OkoqDhZ+M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -46,7 +46,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.5";
|
||||
version = "9.2.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uXH/7Qfs4VxG53819TG/Y2M0taIcE4uC06rdfBe22O0=";
|
||||
hash = "sha256-qXzkrfF8FkALkEaFLSmaadovwLc2DkXXJivdrT6srTc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.2.5";
|
||||
version = "9.2.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-APm7+V0eLvgnPRzojQsfDPleEfrIssbgeUh5eugKiLM=";
|
||||
hash = "sha256-qaDAicmYZxLPTl17il61ij01prRv2H4xxe07Xg4KWhI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.5";
|
||||
version = "9.2.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U++Ly+UwY2CiyKdHpPWRpURqxVv4dgVylZD7ERVzUCA=";
|
||||
hash = "sha256-yMUcuZ9v1dVbh/t456fpMu8tDFWIdh55LZh7FLkz9GM=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awesomeversion";
|
||||
version = "22.4.0";
|
||||
version = "22.5.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-bloBP5cKZtvu96HSQ4AmZ5+VeSXGkmN/m4fuyHLrBws=";
|
||||
sha256 = "sha256-/La54qrejUhyoA1fRPEIItlKojTP5n5YmH+ovL6ASGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -33,6 +33,11 @@ buildPythonPackage rec {
|
||||
"strictoverflow"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "extra_link_args += ['-Wl,-fatal_warnings']" ""
|
||||
'';
|
||||
|
||||
# gcc <10 is not supported, LLVM on darwin is just fine
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -52,7 +57,6 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://github.com/awslabs/aws-crt-python";
|
||||
description = "Python bindings for the AWS Common Runtime";
|
||||
license = licenses.asl20;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.5";
|
||||
version = "9.2.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o5aNHYysIpccWhf09xuJ1WT2Hac4OPyztnKqPne1Vng=";
|
||||
hash = "sha256-mBpAwKUclwvgOeGD6BvPUKZHdjngfvuHdtKY3nx7jzM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.5";
|
||||
version = "9.2.6";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tBiabSbi4LKXA1Ou7MURRG2eGq1m1TutaHba+hq6DhQ=";
|
||||
hash = "sha256-GOrjT5CM+yzboOTgkVriuf1UpNDVhDgGpS8vp4D39W0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, click
|
||||
, setuptools-scm
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloup";
|
||||
version = "0.14.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4dec7e43905b7771884cda4f13ab8b7537bceaee467a92655e7660797ab08c47";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cloup" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/janLuke/cloup";
|
||||
description = "Click extended with option groups, constraints, aliases, help themes";
|
||||
longDescription = ''
|
||||
Enriches Click with option groups, constraints, command aliases, help sections for subcommands, themes for --help and other stuff.
|
||||
'';
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ friedelino ];
|
||||
};
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "crownstone-uart";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "crownstone";
|
||||
repo = "crownstone-lib-python-uart";
|
||||
rev = version;
|
||||
sha256 = "sha256-oCPv4siGy0POK6XeY29roKO/t8xMcJkwSO1onGNLq3E=";
|
||||
sha256 = "sha256-NGy63o56oWhHcQ9QKo05k/z8ABp3p3T3+uY2O1YyzBk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,15 +7,19 @@
|
||||
, fetchPypi
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.7.3";
|
||||
pname = "dask-jobqueue";
|
||||
version = "0.7.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79";
|
||||
hash = "sha256-aC18wOazGbarg6eomGgMEunHfdx33zgLQAQSkPVdTnk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -39,12 +43,14 @@ buildPythonPackage rec {
|
||||
"test_security"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "dask_jobqueue" ];
|
||||
pythonImportsCheck = [
|
||||
"dask_jobqueue"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://github.com/dask/dask-jobqueue";
|
||||
description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
|
||||
homepage = "https://github.com/dask/dask-jobqueue";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
|
||||
@@ -4,27 +4,38 @@
|
||||
, dask
|
||||
, distributed
|
||||
, mpi4py
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2022.4.0";
|
||||
pname = "dask-mpi";
|
||||
version = "2022.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CgTx19NaBs3/UGWTMw1EFOokLJFySYzhkfV0LqxJnhc=";
|
||||
hash = "sha256-CgTx19NaBs3/UGWTMw1EFOokLJFySYzhkfV0LqxJnhc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dask distributed mpi4py ];
|
||||
propagatedBuildInputs = [
|
||||
dask
|
||||
distributed
|
||||
mpi4py
|
||||
];
|
||||
|
||||
# hardcoded mpirun path in tests
|
||||
# Hardcoded mpirun path in tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "dask_mpi" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dask_mpi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dask/dask-mpi";
|
||||
description = "Deploy Dask using mpi4py";
|
||||
homepage = "https://github.com/dask/dask-mpi";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -63,7 +63,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "A Python interface for fplll";
|
||||
changelog = "https://github.com/fplll/fpylll/releases/tag/${version}";
|
||||
homepage = "https://github.com/fplll/fpylll";
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-nest-sdm";
|
||||
version = "1.9.0";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,8 +24,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = "python-google-nest-sdm";
|
||||
rev = version;
|
||||
sha256 = "sha256-FHa6/oWV35TPsafgEUTCuu0Rnd1/YBZF3mHOhkVuEU0=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-af1oYeNEQdz6HivAhvQY0xm3J4s+uXpcdema37oG15U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.6.2";
|
||||
version = "1.7.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-x7TaSpmNd0YUgh81Favpo6qZgRsVeIyvvFfH3UCCqsQ=";
|
||||
sha256 = "sha256-lLv3DrBPxw5M903ehKMYqsbBicmXcVS2v7P7FgTNkSQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "isosurfaces";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fa1b44e5e59d2f429add49289ab89e36f8dcda49b7badd99e0beea273be331f4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
# no tests defined upstream
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "isosurfaces" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jared-hughes/isosurfaces";
|
||||
description = "Construct isolines/isosurfaces of a 2D/3D scalar field defined by a function";
|
||||
longDescription = ''
|
||||
Construct isolines/isosurfaces of a 2D/3D scalar field defined by a
|
||||
function, i.e. curves over which f(x,y)=0 or surfaces over which
|
||||
f(x,y,z)=0. Most similar libraries use marching squares or similar over a
|
||||
uniform grid, but this uses a quadtree to avoid wasting time sampling
|
||||
many far from the implicit surface.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ friedelino ];
|
||||
};
|
||||
}
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0UOU4arSCh+5l258mwZQLNf/JUbPcTgcHtusiTyYPwg=";
|
||||
sha256 = "sha256-Qw6jgbYDfeJfT6QtIaT2llbfwZTpoLeH78mxJlFA7TI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pybind11
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mapbox-earcut";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skogler";
|
||||
repo = "mapbox_earcut_python";
|
||||
rev = "v${version}";
|
||||
sha256 = "m4q2qTL55fkdi3hm75C3/XV9SUQkpJS+B5SEgpPEctk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools pybind11 ];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "mapbox_earcut" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/skogler/mapbox_earcut_python";
|
||||
license = licenses.isc;
|
||||
description = "Mapbox-earcut fast triangulation of 2D-polygons";
|
||||
longDescription = ''
|
||||
Python bindings for the C++ implementation of the Mapbox Earcut
|
||||
library, which provides very fast and quite robust triangulation of 2D
|
||||
polygons.
|
||||
'';
|
||||
maintainers = with maintainers; [ friedelino ];
|
||||
};
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "motionblinds";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "motion-blinds";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-c6+kctEB4gwLGTgTA+sUA3v9ST4dn4RFPbyaXSgGvoQ=";
|
||||
sha256 = "sha256-xlAQD0sJVhbr0nfJZdrBbskVbgC9Lrbrgu6rvT3jQCs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.23.0.post1";
|
||||
version = "1.24.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eF0ChMOqisXsMWLlKCAWGMrTUe4sGfZxWo5uc/ZKAQk=";
|
||||
hash = "sha256-ITZItcLZ/Im/tWptkKXGc+H1lT4m1mIlljTP/w+6pNo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
{ lib
|
||||
{ async_generator
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, async_generator
|
||||
, traitlets
|
||||
, fetchFromGitHub
|
||||
, ipykernel
|
||||
, ipywidgets
|
||||
, jupyter-client
|
||||
, lib
|
||||
, nbconvert
|
||||
, nbformat
|
||||
, nest-asyncio
|
||||
, jupyter-client
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, traitlets
|
||||
, xmltodict
|
||||
, nbconvert
|
||||
, ipywidgets
|
||||
}:
|
||||
|
||||
let nbclient = buildPythonPackage rec {
|
||||
@@ -20,9 +22,11 @@ let nbclient = buildPythonPackage rec {
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uAcm/B+4mg6Pi+HnfijQAmsejtkLwUPIoMdiLk+M3Z4=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ofyJNJeNkXbZ9qHLTuzJ13PgEXU9lDQ9NkT4nG/R8Ic=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
|
||||
@@ -30,7 +34,14 @@ let nbclient = buildPythonPackage rec {
|
||||
# circular dependencies if enabled by default
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [ pytestCheckHook xmltodict nbconvert ipywidgets ];
|
||||
checkInputs = [
|
||||
ipykernel
|
||||
ipywidgets
|
||||
nbconvert
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
xmltodict
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
@@ -9,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nexia";
|
||||
version = "0.9.13";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
@@ -18,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0VG8tSwbVTIIsQYAEwzQfXLTDy4df/nS/rbHjYo7xf0=";
|
||||
sha256 = "sha256-f1IUyeOmRmnr7zWoMKF895FKsNgiiCbw7inmXDGZrVw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -26,6 +27,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aioresponses
|
||||
requests-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "onvif-zeep-async";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM=";
|
||||
hash = "sha256-bRPqbuBrC4Q0gdQGb2KAy1pTHce42WvM7gjvAspH4WE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "0.1.4";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+L730I30dN+d6oc5HWq578B0Io5j5CjAy3SuIGGjOR8=";
|
||||
hash = "sha256-M7jBwpo9yMggd81xiWH9SSJ1axGXiC5uQo/jnRcQ3/4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.91";
|
||||
version = "2.1.92";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nlEdCdFxF/maOZtpUwNVExnmqUhdAfzlbrEMxAHvUxE=";
|
||||
hash = "sha256-LEHbS6rSKQl1APWYjNS8y1edtXDRqSuhfftcuM67K44=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "9.4.0";
|
||||
version = "9.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Md4vzAirCm5fjcTAeiLIQwH0MAP47r2AT8O5yigGqv8=";
|
||||
hash = "sha256-gjYlr2rp2xRMcFKbA4Y/Pb7YYOUR4LTzMtVoG1iMlx0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycfmodel";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-c6RbglmG/A1fVOLmJLRsyMy9EgEIzpXnIe9Co/OLMSg=";
|
||||
hash = "sha256-syEE03lcOt6tTD88+BJ8nHCkamKn+BX/rZU9TOsxATc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -23,8 +23,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uaeSyRtnokUJ3jWTioVMuo+T3jFoH+SYTBT3HPCPjm8=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PVRNfpV6LwZNzSQaDJnDztNUdzosa2yIdXRLXpPMVW4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypoolstation";
|
||||
version = "0.4.2";
|
||||
version = "0.4.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "PyPoolstation";
|
||||
inherit version;
|
||||
sha256 = "sha256-86y/JnTSV+MEr0np3bbwqFMkVrWpMAeyn9WVuNod9xQ=";
|
||||
sha256 = "sha256-MG2V7/AqgH4OVcOEDdhwQswt96URJBQtoi1i+n4IV7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.5";
|
||||
version = "9.2.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zQbIhl5MW/RYXV5EgL2Q7eKEwHNXVe+p6LPmIDbokwc=";
|
||||
hash = "sha256-I2ZQJ/CDvNq5uJoLT9SHDGzeuI32YUy/6fMSNR9WM8I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.15.14";
|
||||
version = "0.15.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "z0PVjVzmAb5cgBdXWMxOdsy0VMMkmewHZaPNBYivXSA=";
|
||||
sha256 = "Xg1Bd9Q6XV/+vuJH9Huiq2+igdAE/RS8yTvLeJz1l34=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmrepo";
|
||||
version = "0.0.22";
|
||||
version = "0.0.23";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hV0BusvuJUEGfmue7OHR3YYmpBcFTgbQE7UuHmTUBo0=";
|
||||
hash = "sha256-Yg08twcxXKtDlkOxmD5eafeaeij4zX/3XQQQN948xxs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -3,27 +3,37 @@
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sdds";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pylhc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JcxcF0tDigZz3upzE7rPDynCH45dnLk/zpS0a2dOwRU=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-l9j+YJ5VNMzL6JW59kq0hQS7XIj53UxW5bNnfdURz/o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sdds" ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sdds"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python 3 package to handle SDDS files";
|
||||
description = "Module to handle SDDS files";
|
||||
homepage = "https://pylhc.github.io/sdds/";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2022.05.1";
|
||||
version = "2022.05.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-tYExqOIJPJN8Lss6y0oelkrDuQCpNtFrsFRCxnbUNvU=";
|
||||
sha256 = "sha256-DWhXNn5KNs06oKJbWTCI/vuX2oruERAgb/1f4Au8na0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-spelling";
|
||||
version = "7.4.1";
|
||||
version = "7.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-OpbyKqxq9JQHOvrLmI2U2NfCtgJ7IFA6jyDa4ysQw74=";
|
||||
hash = "sha256-2SvcHWPzYbbgoXG51oUYEBdFSFMX8VhhUB44fxt49qs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, hypothesis
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srt";
|
||||
version = "3.5.2";
|
||||
|
||||
disabled = pythonOlder "2.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7aa4ad5ce4126d3f53b3e7bc4edaa86653d0378bf1c0b1ab8c59f5ab41384450";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "srt" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cdown/srt";
|
||||
description = "A tiny but featureful Python library for parsing, modifying, and composing SRT files";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ friedelino ];
|
||||
};
|
||||
}
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tqdm";
|
||||
version = "4.63.1";
|
||||
version = "4.64.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QjCkkRmkFsiMxH0NLTLV2Q8aKC1eSX1JgBlQcE5Jhj0=";
|
||||
sha256 = "13a0spki37rdbx54nspcni3bpsp4d7p5ln570yipf1r01v9mbgj0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vulcan-api";
|
||||
version = "2.0.3";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "kapi2289";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "YLt9yufOBlWRyo+le7HcaFD/s7V5WpvhMUrHJqyC3pY=";
|
||||
sha256 = "sha256-XYpQ1uqRmdqsGeKyHKGxFyXMN9HugTiPUx9tFUiGSpU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.73";
|
||||
version = "0.0.75";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vC1kkh9t2fWmSqmKQz9ON8Y+tBFhTxrprLNzOldQR+A=";
|
||||
hash = "sha256-iwNXyoA85NcgrxqAPydTA3FAW+weE2pdPyijEV4PbSA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.36.1";
|
||||
version = "0.37.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc=";
|
||||
hash = "sha256-321voxogSkeHMsMdLnrjwG3vQOgGDcMjDen0EUKYE1U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "beancount-language-server";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarmutex";
|
||||
repo = "beancount-language-server";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CkwNxamkErRo3svJNth2F8NSqlJNX+1S/srKu6Z+mX4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-NTUs9ADTn+KoE08FikRHrdptZkrUqnjVIlcr8RtDvic=";
|
||||
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
$out/bin/beancount-language-server --help > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Language Server Protocol (LSP) for beancount files";
|
||||
homepage = "https://github.com/polarmutex/beancount-language-server";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ polarmutex ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
nixosTests }:
|
||||
buildGoModule rec {
|
||||
pname = "buildkite-agent";
|
||||
version = "3.35.2";
|
||||
version = "3.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BpfWeSEX4N77yXfWKpH7KWKsncdOYquxF+L+g13DdiA=";
|
||||
sha256 = "sha256-Q1ul4YF6iBi6aCd9TiD0yjUUJx9OfsoyNWeevwvISBs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-E51LBpNN/N3wH1LMxv/+nnwpQAxHhyDW2jgVIDkNeQ4=";
|
||||
vendorSha256 = "sha256-5K1xnfQ4U39WR8agOH8zYrvFS1gbr/ahEVTXlAzILL4=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
{ buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage {
|
||||
pname = "kexpand";
|
||||
version = "unstable-2017-05-12";
|
||||
|
||||
goPackagePath = "github.com/kopeio/kexpand";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kopeio";
|
||||
repo = "kexpand";
|
||||
rev = "c508a43a4e84410dfd30827603e902148c5c1f3c";
|
||||
sha256 = "0946h74lsqnr1106j7i2w2a5jg2bbk831d7prlws4bb2kigfm38p";
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "universal-ctags";
|
||||
version = "5.9.20220220.0";
|
||||
version = "5.9.20220529.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "universal-ctags";
|
||||
repo = "ctags";
|
||||
rev = "p${version}";
|
||||
sha256 = "1118iq33snxyw1jk8nwvsl08f3zdainksh0yiapzvg0y5906jjjd";
|
||||
sha256 = "sha256-Lu4eYMA5Uf/A8r11W6v7xTAnj0gtCjKQ4aX5IbV0dbo=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.unix;
|
||||
# universal-ctags is preferred over emacs's ctags
|
||||
priority = 1;
|
||||
mainProgram = "ctags";
|
||||
maintainers = [ maintainers.mimame ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
, fetchpatch, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, utf8cpp, darwin }:
|
||||
|
||||
let
|
||||
version = "4.9.2";
|
||||
version = "4.9.3";
|
||||
source = fetchFromGitHub {
|
||||
owner = "antlr";
|
||||
repo = "antlr4";
|
||||
rev = version;
|
||||
sha256 = "0rpqgl2y22iiyg42y8jyiy2g7x421yf0q16cf17j76iai6y0bm5p";
|
||||
sha256 = "1af3cfqwk7lq1b5qsh1am0922fyhy7wmlpnrqdnvch3zzza9n1qm";
|
||||
};
|
||||
|
||||
runtime = {
|
||||
@@ -18,14 +18,6 @@ let
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "use-utfcpp-from-system.patch";
|
||||
url = "https://github.com/antlr/antlr4/commit/5a808b470e1314b63b0a921178040ccabb357945.patch";
|
||||
sha256 = "0nq7iajy9inllcspyqpxskfg3k5s1fwm7ph75i8lfc25rl35k1w7";
|
||||
})
|
||||
];
|
||||
|
||||
patchFlags = [ "-p3" ];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
@@ -52,7 +44,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.antlr.org/download/antlr-${version}-complete.jar";
|
||||
sha256 = "1k9pw5gv2zhh06n1vys76kchlz4mz0vgv3iiba8w47b9fqa7n4dv";
|
||||
sha256 = "0dnz2x54kigc58bxnynjhmr5iq49f938vj6p50gdir1xdna41kdg";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svd2rust";
|
||||
version = "0.21.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "0mxzbbxrg1jysxpjqcvgwwmh8qf0lyf64fl1gxxp0whph0x279qj";
|
||||
sha256 = "sha256-P0s2mrfYA7DUThvje0LH3Pq0Os6UZJrrnjnzAm8UlDQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0kvya6swx1nsxxlhn2w8x4dhl4j3v56jxqr2h259cx6lzv3xjhin";
|
||||
cargoSha256 = "sha256-TDgd8RG97ROeAQJ1uDF2m+yIa8US7zFz+5qrQtFbazE=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
@@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/rust-embedded/svd2rust";
|
||||
changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ newam ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{ lib, stdenv, kernel, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "new-lg4ff";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "berarma";
|
||||
repo = "new-lg4ff";
|
||||
rev = "${version}";
|
||||
sha256 = "+05xDpNI4m6wTS+YPgA0fP4iM10nMOZOtCrdQxpevBU=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install"
|
||||
sed -i '/depmod/d' Makefile
|
||||
sed -i "10i\\\trmmod hid-logitech 2> /dev/null || true" Makefile
|
||||
sed -i "11i\\\trmmod hid-logitech-new 2> /dev/null || true" Makefile
|
||||
'';
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags = [
|
||||
"KVERSION=${kernel.modDirVersion}"
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Experimental Logitech force feedback module for Linux";
|
||||
homepage = "https://github.com/berarma/new-lg4ff";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ matthiasbenaets ];
|
||||
platforms = platforms.linux;
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
@@ -5,15 +5,15 @@
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-05-25";
|
||||
version = "2022-06-01";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "e9e8c6b54d594109041bdd4bc3902b40f9ae8849";
|
||||
rev = "18e7e5d0339f3491a6c0324e2443415309b56173";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "afSA6OJm1ydw0/yBZx9QLyt4z7nWjQBAb+77Gw6nR4g=";
|
||||
sha256 = "NAVotL5RxpS/zKnO+ngMIjv787lqc1dj/c4blQrQcvU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -83,7 +83,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
paramiko
|
||||
pyasn1
|
||||
pycrypto
|
||||
pydrive
|
||||
pydrive2
|
||||
future
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
enum
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.10.12";
|
||||
version = "0.10.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "Q69XltTdJgRLCwjt+oLSUWexO3MGd2HB11dN/edRGes=";
|
||||
sha256 = "u18dIw4At78OSeWCDHJIjzDbaxpiSs3g+bf2WClFkuY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "2nQE/5SPAaih4TunHgZHcYKPoAaA+4KDLxxcK0RLUgw=";
|
||||
cargoSha256 = "mLFponkRIEWePpSyhQK1IG/rnJ0qpDwrS7vwAoP1ro0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.archimatetool.com/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ earldouglas SuperSandro2000 ];
|
||||
maintainers = with maintainers; [ earldouglas ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,21 +2,21 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ntfy-sh";
|
||||
version = "1.22.0";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "binwiederhier";
|
||||
repo = "ntfy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-30j62GaO5SXG78c6vMpLZ+ixy1zesjXoX3L9Et/7uhU=";
|
||||
sha256 = "sha256-Jw+8rgbevtk1Mzy/g+DryAk7a/RbQXpEtwPlqJRD/UM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Sx6l5GJ72A0SHEHyVtlte8Ed9fuJzZAkJzC0zpCbvK8=";
|
||||
vendorSha256 = "sha256-MdbC+Hv8jSImg0d2HMeAmUdWLQT8+zSe+0mkIwHIJXM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
preBuild = ''
|
||||
make server-deps-static-sites
|
||||
make cli-deps-static-sites
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,18 +1,32 @@
|
||||
{ lib, buildPythonApplication, fetchPypi, installShellFiles }:
|
||||
{ lib
|
||||
, python3
|
||||
, substituteAll
|
||||
, ffmpeg
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "you-get";
|
||||
version = "0.4.1602";
|
||||
version = "0.4.1612";
|
||||
|
||||
# Tests aren't packaged, but they all hit the real network so
|
||||
# probably aren't suitable for a build environment anyway.
|
||||
doCheck = false;
|
||||
|
||||
src = fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RwbAbMS5CA6pO08TuaTb67YM/hLRkceOF7D6iV0XcI8=";
|
||||
sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./ffmpeg-path.patch;
|
||||
ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg";
|
||||
ffprobe = "${lib.getBin ffmpeg}/bin/ffmpeg";
|
||||
version = lib.getVersion ffmpeg;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
@@ -25,7 +39,6 @@ buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "A tiny command line utility to download media contents from the web";
|
||||
homepage = "https://you-get.org";
|
||||
changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ryneeverett ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py
|
||||
index 50e2c9f..46e7f61 100755
|
||||
--- a/src/you_get/processor/ffmpeg.py
|
||||
+++ b/src/you_get/processor/ffmpeg.py
|
||||
@@ -31,7 +31,7 @@ def get_usable_ffmpeg(cmd):
|
||||
except:
|
||||
return None
|
||||
|
||||
-FFMPEG, FFPROBE, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None, None)
|
||||
+FFMPEG, FFPROBE, FFMPEG_VERSION = ('@ffmpeg@', '@ffprobe@', '@version@')
|
||||
if logging.getLogger().isEnabledFor(logging.DEBUG):
|
||||
LOGLEVEL = ['-loglevel', 'info']
|
||||
STDIN = None
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "localtime";
|
||||
version = "unstable-2021-11-23";
|
||||
version = "unstable-2022-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stebalien";
|
||||
repo = "localtime";
|
||||
rev = "3e5d6cd64444b2164e87cea03448bfb8eefd6ccd";
|
||||
sha256 = "sha256-6uxxPq6abtRqM/R2Fw46ynP9PEkHggTSUymLYlQXQRU=";
|
||||
rev = "c1e10aa4141ed2bb01986b48e0e942e618993c06";
|
||||
hash = "sha256-bPQ1c2KUTkxx2g7IvLmrKgJKfRHTLlTXLR/QQ0O4CrI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sf3sL6aO5jSytT2NtBkA3lhg77RIzbYkSC4fkH+cwwk=";
|
||||
vendorSha256 = "sha256-12JnEU41sp9qRP07p502EYogveE+aNdfmLwlDRbIdxU=";
|
||||
|
||||
postPatch = ''
|
||||
demoPath="${geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"
|
||||
|
||||
@@ -49,6 +49,10 @@ in stdenv.mkDerivation rec {
|
||||
# Therefore we put it into `/run/netdata`, which is owned
|
||||
# by netdata only.
|
||||
./ipc-socket-in-run.patch
|
||||
|
||||
# Avoid build-only inputs in closure leaked by configure command:
|
||||
# https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162
|
||||
./skip-CONFIGURE_COMMAND.patch
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
Shrink closure size by avoiding paths embedded from configure call.
|
||||
|
||||
https://github.com/NixOS/nixpkgs/issues/175693
|
||||
--- a/daemon/buildinfo.c
|
||||
+++ b/daemon/buildinfo.c
|
||||
@@ -248,7 +248,9 @@ void print_build_info(void) {
|
||||
char *prebuilt_distro = NULL;
|
||||
get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro);
|
||||
|
||||
- printf("Configure options: %s\n", CONFIGURE_COMMAND);
|
||||
+ // To minimize closure size do not persist configure options
|
||||
+ // with build-time inputs.
|
||||
+ printf("Configure options: REMOVED\n");
|
||||
|
||||
if (install_type == NULL) {
|
||||
printf("Install type: unknown\n");
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swaysome";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "hyask";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hI6XPND05m67dxo9EwIDhFTyC2UrL4Ll1V/WcBoJymU=";
|
||||
sha256 = "sha256-E2Oy8ubH4VIpuH4idYNiZJISuYYe+stcUY/atN2JcVw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jG6HZiL2almALyEnQRmbeCTRG11URP3+Bxqyn8hLs7w=";
|
||||
cargoSha256 = "sha256-S+GcyEYQ4nnVoPMuglTmFdP5j015UyCXMyyhPHa5m8k=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Helper to make sway behave more like awesomewm";
|
||||
|
||||
@@ -534,6 +534,7 @@ mapAliases ({
|
||||
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
|
||||
gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
|
||||
grv = "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01
|
||||
gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22
|
||||
gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22
|
||||
gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01
|
||||
@@ -635,6 +636,7 @@ mapAliases ({
|
||||
keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01
|
||||
kerberos = libkrb5; # moved from top-level 2021-03-14
|
||||
kexectools = kexec-tools; # Added 2021-09-03
|
||||
kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01
|
||||
keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22
|
||||
keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14
|
||||
kgx = gnome-console; # Added 2022-02-19
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user