Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
a12e0d5bff
@ -64,6 +64,16 @@
|
||||
fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D";
|
||||
}];
|
||||
};
|
||||
_0xbe7a = {
|
||||
email = "nix@be7a.de";
|
||||
name = "Bela Stoyan";
|
||||
github = "0xbe7a";
|
||||
githubId = 6232980;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x6510870A77F49A99";
|
||||
fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99";
|
||||
}];
|
||||
};
|
||||
_1000101 = {
|
||||
email = "b1000101@pm.me";
|
||||
github = "1000101";
|
||||
|
||||
@ -436,6 +436,18 @@ machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<methodname>shell_interact</methodname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Allows you to directly interact with the guest shell.
|
||||
This should only be used during test development, not in production tests.
|
||||
Killing the interactive session with <literal>Ctrl-d</literal> or <literal>Ctrl-c</literal> also ends the guest session.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
</para>
|
||||
|
||||
|
||||
@ -21,6 +21,7 @@ import shutil
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import telnetlib
|
||||
import tempfile
|
||||
import time
|
||||
import traceback
|
||||
@ -455,6 +456,16 @@ class Machine:
|
||||
return (status_code, output)
|
||||
output += chunk
|
||||
|
||||
def shell_interact(self) -> None:
|
||||
"""Allows you to interact with the guest shell
|
||||
|
||||
Should only be used during test development, not in the production test."""
|
||||
self.connect()
|
||||
self.log("Terminal is ready (there is no prompt):")
|
||||
telnet = telnetlib.Telnet()
|
||||
telnet.sock = self.shell # type: ignore
|
||||
telnet.interact()
|
||||
|
||||
def succeed(self, *commands: str) -> str:
|
||||
"""Execute each command and check that it succeeds."""
|
||||
output = ""
|
||||
|
||||
@ -333,6 +333,7 @@ in {
|
||||
before = [ "mailman.service" "mailman-web-setup.service" "mailman-uwsgi.service" "hyperkitty.service" ];
|
||||
requiredBy = [ "mailman.service" "mailman-web-setup.service" "mailman-uwsgi.service" "hyperkitty.service" ];
|
||||
path = with pkgs; [ jq ];
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
mailmanDir=/var/lib/mailman
|
||||
mailmanWebDir=/var/lib/mailman-web
|
||||
|
||||
33
pkgs/applications/audio/gnaural/default.nix
Normal file
33
pkgs/applications/audio/gnaural/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, libsndfile, portaudio, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnaural";
|
||||
version = "20110606";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}_${version}.tar.xz";
|
||||
hash = "sha256-0a09DUMfHEIGYuIYSBGJalBiIHIgejr/KVDXCFgKBb8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 libsndfile portaudio ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
substitute \
|
||||
$out/share/gnome/apps/Multimedia/gnaural.desktop \
|
||||
$out/share/applications/gnaural.desktop \
|
||||
--replace \
|
||||
"/usr/share/gnaural/pixmaps/gnaural-icon.png" \
|
||||
"$out/share/gnaural/pixmaps/gnaural-icon.png" \
|
||||
|
||||
rm -rf $out/share/gnome
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Programmable auditory binaural-beat synthesizer";
|
||||
homepage = "http://gnaural.sourceforge.net/";
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
license = with licenses; [ gpl2Only ];
|
||||
};
|
||||
}
|
||||
@ -14,16 +14,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncspot";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ww7ipyvcdphbkzjpvdqs1s3bqk3rj3jdy1n3bnk76csw9vgn2zi";
|
||||
sha256 = "0lfly3d8pag78pabmna4i6xjwzi65dx1mwfmsk7nx64brq3iypbq";
|
||||
};
|
||||
|
||||
cargoSha256 = "1mrjp5p3iryxzgg6ca9zjwm8n6w0ljs108ll0wkwgfih6rip7ba4";
|
||||
cargoSha256 = "0a6d41ll90fza6k3lixjqzwxim98q6zbkqa3zvxvs7q5ydzg8nsp";
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
|
||||
|
||||
|
||||
@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zeek";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.zeek.org/zeek-${version}.tar.gz";
|
||||
sha256 = "0ficl4i012gfv4mdbdclgvi6gyq338gw9gb6k58k1drw8c7qk6k5";
|
||||
sha256 = "15gxxgg7nmfmswlbxhvcp6alq5k9wpvrm5cwyf1qfd7xsfli61sm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison file ];
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.0.28";
|
||||
version = "2.0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lwR+XoB1LoW/pLjmvExUJKGnAqFhvcDs3sEKkw6pv48=";
|
||||
sha256 = "sha256-Idt+bN9Lf6GEjdGC/sM9Ln1ohXhUy78CrmJxSDA2Y0o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
, setJavaClassPath
|
||||
}:
|
||||
|
||||
assert (stdenv.isDarwin && stdenv.isx86_64);
|
||||
|
||||
let cpuName = stdenv.hostPlatform.parsed.cpu.name;
|
||||
result = stdenv.mkDerivation {
|
||||
name = if sourcePerArch.packageType == "jdk"
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, buildLlvmTools
|
||||
, fixDarwinDylibNames
|
||||
, enableManpages ? false
|
||||
, enablePolly ? false
|
||||
}:
|
||||
|
||||
let
|
||||
@ -39,8 +40,12 @@ let
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
|
||||
"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
|
||||
] ++ lib.optionals enablePolly [
|
||||
"-DWITH_POLLY=ON"
|
||||
"-DLINK_POLLY_INTO_TOOLS=ON"
|
||||
];
|
||||
|
||||
|
||||
patches = [
|
||||
./purity.patch
|
||||
# https://reviews.llvm.org/D51899
|
||||
|
||||
@ -68,16 +68,30 @@ let
|
||||
# we need to reintroduce `outputUnspecified` to get the expected behavior e.g. of lib.get*
|
||||
llvm = tools.libllvm.out // { outputUnspecified = true; };
|
||||
|
||||
libllvm-polly = callPackage ./llvm {
|
||||
inherit llvm_meta;
|
||||
enablePolly = true;
|
||||
};
|
||||
|
||||
llvm-polly = tools.libllvm-polly.lib // { outputUnspecified = true; };
|
||||
|
||||
libclang = callPackage ./clang {
|
||||
inherit clang-tools-extra_src llvm_meta;
|
||||
};
|
||||
|
||||
clang-unwrapped = tools.libclang.out // { outputUnspecified = true; };
|
||||
# disabled until recommonmark supports sphinx 3
|
||||
#Llvm-manpages = lowPrio (tools.libllvm.override {
|
||||
# enableManpages = true;
|
||||
# python3 = pkgs.python3; # don't use python-boot
|
||||
#});
|
||||
|
||||
clang-polly-unwrapped = callPackage ./clang {
|
||||
inherit llvm_meta;
|
||||
inherit clang-tools-extra_src;
|
||||
libllvm = tools.libllvm-polly;
|
||||
enablePolly = true;
|
||||
};
|
||||
|
||||
llvm-manpages = lowPrio (tools.libllvm.override {
|
||||
enableManpages = true;
|
||||
python3 = pkgs.python3; # don't use python-boot
|
||||
});
|
||||
|
||||
clang-manpages = lowPrio (tools.libclang.override {
|
||||
enableManpages = true;
|
||||
|
||||
@ -1,5 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
|
||||
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
|
||||
let
|
||||
# Details from https://www.azul.com/downloads/?version=java-11-lts&os=macos&package=jdk
|
||||
# Note that the latest build may differ by platform
|
||||
dist = {
|
||||
x86_64-darwin = {
|
||||
arch = "x64";
|
||||
zuluVersion = "11.48.21";
|
||||
jdkVersion = "11.0.11";
|
||||
sha256 = "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
arch = "aarch64";
|
||||
zuluVersion = "11.48.21";
|
||||
jdkVersion = "11.0.11";
|
||||
sha256 = "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc";
|
||||
};
|
||||
}."${stdenv.hostPlatform.system}";
|
||||
|
||||
jce-policies = fetchurl {
|
||||
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
|
||||
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
|
||||
@ -7,16 +25,16 @@ let
|
||||
};
|
||||
|
||||
jdk = stdenv.mkDerivation rec {
|
||||
name = "zulu11.43.21-ca-jdk11.0.9";
|
||||
pname = "zulu${dist.zuluVersion}-ca-jdk";
|
||||
version = dist.jdkVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
|
||||
sha256 = "1j19fb5mwdkfn6y8wfsnvxsz6wfpcab4xv439fqssxy520n6q4zs";
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
|
||||
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
|
||||
inherit (dist) sha256;
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ freetype ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
@ -41,8 +59,6 @@ let
|
||||
mkdir -p $out/nix-support
|
||||
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
|
||||
|
||||
install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
cat <<EOF >> $out/nix-support/setup-hook
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
|
||||
|
||||
@ -1,25 +1,43 @@
|
||||
{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
|
||||
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
|
||||
let
|
||||
# Details from https://www.azul.com/downloads/?version=java-8-lts&os=macos&package=jdk
|
||||
# Note that the latest build may differ by platform
|
||||
dist = {
|
||||
x86_64-darwin = {
|
||||
arch = "x64";
|
||||
zuluVersion = "8.54.0.21";
|
||||
jdkVersion = "8.0.292";
|
||||
sha256 = "1pgl0bir4r5v349gkxk54k6v62w241q7vw4gjxhv2g6pfq6hv7in";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
arch = "aarch64";
|
||||
zuluVersion = "8.54.0.21";
|
||||
jdkVersion = "8.0.292";
|
||||
sha256 = "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c";
|
||||
};
|
||||
}."${stdenv.hostPlatform.system}";
|
||||
|
||||
jce-policies = fetchurl {
|
||||
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
|
||||
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
|
||||
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
|
||||
};
|
||||
|
||||
jdk = stdenv.mkDerivation {
|
||||
jdk = stdenv.mkDerivation rec {
|
||||
# @hlolli: Later version than 1.8.0_202 throws error when building jvmci.
|
||||
# dyld: lazy symbol binding failed: Symbol not found: _JVM_BeforeHalt
|
||||
# Referenced from: ../libjava.dylib Expected in: .../libjvm.dylib
|
||||
name = "zulu1.8.0_202-8.36.0.1";
|
||||
pname = "zulu${dist.zuluVersion}-ca-jdk";
|
||||
version = dist.jdkVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.azul.com/zulu/bin/zulu8.36.0.1-ca-jdk8.0.202-macosx_x64.zip";
|
||||
sha256 = "0s92l1wlf02vjx8dvrsla2kq7qwxnmgh325b38mgqy872016jm9p";
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
|
||||
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
|
||||
inherit (dist) sha256;
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ freetype ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
@ -44,8 +62,6 @@ let
|
||||
mkdir -p $out/nix-support
|
||||
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
|
||||
|
||||
install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
cat <<EOF >> $out/nix-support/setup-hook
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
|
||||
|
||||
@ -1,5 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
|
||||
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
|
||||
let
|
||||
# Details from https://www.azul.com/downloads/?version=java-16-sts&os=macos&package=jdk
|
||||
# Note that the latest build may differ by platform
|
||||
dist = {
|
||||
x86_64-darwin = {
|
||||
arch = "x64";
|
||||
zuluVersion = "16.30.15";
|
||||
jdkVersion = "16.0.1";
|
||||
sha256 = "1jihn125dmxr9y5h9jq89zywm3z6rbwv5q7msfzsf2wzrr13jh0z";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
arch = "aarch64";
|
||||
zuluVersion = "16.30.19";
|
||||
jdkVersion = "16.0.1";
|
||||
sha256 = "1i0bcjx3acb5dhslf6cabdcnd6mrz9728vxw9hb4al5y3f5fll4w";
|
||||
};
|
||||
}."${stdenv.hostPlatform.system}";
|
||||
|
||||
jce-policies = fetchurl {
|
||||
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
|
||||
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
|
||||
@ -7,17 +25,16 @@ let
|
||||
};
|
||||
|
||||
jdk = stdenv.mkDerivation rec {
|
||||
pname = "zulu16.28.11-ca-jdk";
|
||||
version = "16.0.0";
|
||||
pname = "zulu${dist.zuluVersion}-ca-jdk";
|
||||
version = dist.jdkVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.azul.com/zulu/bin/${pname}${version}-macosx_x64.tar.gz";
|
||||
sha256 = "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5";
|
||||
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
|
||||
inherit (dist) sha256;
|
||||
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ freetype ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
@ -42,8 +59,6 @@ let
|
||||
mkdir -p $out/nix-support
|
||||
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
|
||||
|
||||
install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
cat <<EOF >> $out/nix-support/setup-hook
|
||||
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
|
||||
|
||||
@ -3,25 +3,26 @@
|
||||
libX11, libXi, libXcursor, libXrandr, libXinerama,
|
||||
alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib,
|
||||
pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio,
|
||||
sharedLib ? true,
|
||||
includeEverything ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raylib";
|
||||
version = "3.5.0";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raysan5";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0syvd5js1lbx3g4cddwwncqg95l6hb3fdz5nsh5pqy7fr6v84kwj";
|
||||
sha256 = "1w8v747hqy0ils6zmy8sm056f24ybjhn9bamqzlxvbqhvh9vvly1";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes examples not compiling in 3.5.0
|
||||
# fixes incorrect version being set by cmake
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/raysan5/raylib/pull/1470.patch";
|
||||
sha256 = "1ff5l839wl8dxwrs2bwky7kqa8kk9qmsflg31sk5vbil68dzbzg0";
|
||||
url = "https://github.com/raysan5/raylib/commit/204aa4c46fdd6986aa0130eeba658562c540759f.patch";
|
||||
sha256 = "10pl7828iy4kadach0wy4fs95vr7k08z3mxw90j8dm9xak1ri8fz";
|
||||
})
|
||||
];
|
||||
|
||||
@ -34,9 +35,9 @@ stdenv.mkDerivation rec {
|
||||
# https://github.com/raysan5/raylib/wiki/CMake-Build-Options
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_GLFW=ON"
|
||||
"-DSHARED=ON"
|
||||
"-DBUILD_EXAMPLES=OFF"
|
||||
] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON";
|
||||
] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
|
||||
++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
|
||||
|
||||
# fix libasound.so/libpulse.so not being found
|
||||
preFixup = ''
|
||||
|
||||
@ -14,12 +14,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosmb";
|
||||
version = "0.2.41";
|
||||
version = "0.2.44";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hiLLoFswh0rm5f5TsaX+zyRDkOIyzGXVO0M5J5d/gtQ=";
|
||||
sha256 = "sha256-xNdrOO0BqV4sD6U39G2RXihDBBf516x8RLiqNLnZyWk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,7 +11,9 @@ buildPythonPackage rec {
|
||||
# https://github.com/NixOS/nixpkgs/issues/39687
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isAarch64 ([ gcc10 perl ]);
|
||||
nativeBuildInputs = [ cmake ] ++
|
||||
# gcc <10 is not supported, LLVM on darwin is just fine
|
||||
lib.optionals (!stdenv.isDarwin && stdenv.isAarch64) [ gcc10 perl ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hstspreload";
|
||||
version = "2021.5.24";
|
||||
version = "2021.5.31";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Z1v2p8kn0IO38Cgr4tUp2n3zAiQntkskS7kYPUakC5U=";
|
||||
sha256 = "sha256-qTOzhPET2uj/ST28pzeckFTYYfyPgErvG4HB9zMMB2w=";
|
||||
};
|
||||
|
||||
# tests require network connection
|
||||
|
||||
41
pkgs/development/python-modules/i-pi/default.nix
Normal file
41
pkgs/development/python-modules/i-pi/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ buildPythonPackage, lib, fetchFromGitHub, gfortran
|
||||
, makeWrapper, numpy, pytest, mock, pytest-mock
|
||||
} :
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "i-pi";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "i-pi";
|
||||
repo = "i-pi";
|
||||
rev = "v${version}";
|
||||
sha256 = "0d0ag57aa0fsqjwya27fyj8alimjvlxzgh6hxjqy1k4ap9h3n1cy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gfortran
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
mock
|
||||
pytest-mock
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/i-pi \
|
||||
--set IPI_ROOT $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A universal force engine for ab initio and force field driven (path integral) molecular dynamics";
|
||||
license = with licenses; [ gpl3Only mit ];
|
||||
homepage = "http://ipi-code.org/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
@ -3,24 +3,27 @@
|
||||
, asysocks
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, oscrypto
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minikerberos";
|
||||
version = "0.2.11";
|
||||
version = "0.2.14";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OC+Cnk47GFzK1QaDEDxntRVrakpFiBuNelM/R5t/AUY=";
|
||||
sha256 = "sha256-MND7r4Gkx9RnEMgEl62QXFYr1NEloihQ2HeU9hyhsx8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
asysocks
|
||||
oscrypto
|
||||
];
|
||||
|
||||
# no tests are published: https://github.com/skelsec/minikerberos/pull/5
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "minikerberos" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msldap";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0khwyhylh28qvz35pdckr5fdd82zsybv0xmzlzjbgcv99cyy1a94";
|
||||
sha256 = "sha256-fX+W1Bq4F0/6DyxWeA6zvoswFQCdDpSk29g7nq1cYYE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,25 +1,30 @@
|
||||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, asn1crypto
|
||||
, fetchPypi
|
||||
, lib
|
||||
, openssl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oscrypto";
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1vlryamwr442w2av8f54ldhls8fqs6678fg60pqbrf5pjy74kg23";
|
||||
sha256 = "1546si2bdgkqnbvv4mw1hr4mhh6bq39d9z4wxgv1m7fq6miclb3x";
|
||||
};
|
||||
|
||||
testSources = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oscrypto_tests";
|
||||
sha256 = "1crndz647pqdd8148yn3n5l63xwr6qkwa1qarsz59nk3ip0dsyq5";
|
||||
sha256 = "1ha68dsrbx6mlra44x0n81vscn17pajbl4yg7cqkk7mq1zfmjwks";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
openssl
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
tar -xf ${testSources}
|
||||
mv oscrypto_tests-${version} tests
|
||||
@ -28,14 +33,11 @@ buildPythonPackage rec {
|
||||
sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
openssl
|
||||
];
|
||||
pythonImportsCheck = [ "oscrypto" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A compilation-free, always up-to-date encryption library for Python that works on Windows, OS X, Linux and BSD.";
|
||||
homepage = "https://www.snowflake.com/";
|
||||
description = "Encryption library for Python";
|
||||
homepage = "https://github.com/wbond/oscrypto";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ buildPythonPackage, lib, fetchPypi, numpy, pydantic, pint,
|
||||
networkx, pytestrunner, pytestcov, pytest
|
||||
{ buildPythonPackage, lib, fetchPypi, fetchpatch, numpy
|
||||
, pydantic, pint, networkx, pytestrunner, pytestcov, pytest
|
||||
} :
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -14,10 +14,25 @@ buildPythonPackage rec {
|
||||
sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni";
|
||||
};
|
||||
|
||||
# FIXME: Fixed upstream but not released yet. Nevertheless critical for correct behaviour.
|
||||
# See https://github.com/MolSSI/QCElemental/pull/265
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "SearchPath1.patch";
|
||||
url = "https://github.com/MolSSI/QCElemental/commit/2211a4e59690bcb14265a60f199a5efe74fe44db.diff";
|
||||
sha256 = "1ibjvmdrc103jdj79xrr11y5yji5hc966rm4ihfhfzgbvfkbjg2l";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "SearchPath2.patch";
|
||||
url = "https://github.com/MolSSI/QCElemental/commit/5a32ce33e8142047b0a00d0036621fe2750e872a.diff";
|
||||
sha256 = "0gmg70vdps7k6alqclwdlxkli9d8s1fphbdvyl8wy8xrh46jw6rk";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Periodic table, physical constants, and molecule parsing for quantum chemistry.";
|
||||
description = "Periodic table, physical constants, and molecule parsing for quantum chemistry";
|
||||
homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -8,6 +8,6 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "16.2.0";
|
||||
sha256 = "1krm3cnpbnqg4mfl3cpp8x2i1rr6hba9qbl60wyg5f5g8ac3pyfh";
|
||||
version = "16.3.0";
|
||||
sha256 = "0pxcdy9i1iyxp4afmpaz30ajlwrj74y64jl3n9rjqw0r5jw4gavs";
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "frogatto-data";
|
||||
version = "unstable-2018-12-18";
|
||||
version = "unstable-2021-05-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frogatto";
|
||||
repo = "frogatto";
|
||||
# master branch as of 2020-12-17
|
||||
rev = "c1d0813b3b755a4e232369b6791397ad058efc16";
|
||||
sha256 = "1fhaidd35392zzavp93r6ihyansgkc3m1ilz71ia1zl4n3fbsxjg";
|
||||
rev = "8b0f2bc8f9f172f6225b8e0d806552cb94f35e2a";
|
||||
sha256 = "09nrna9l1zj2ma2bazdhdvphwy570kfz4br4xgpwq21rsjrvrqiy";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -34,7 +34,6 @@ in buildEnv {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = true;
|
||||
homepage = "https://frogatto.com";
|
||||
description = description;
|
||||
license = with licenses; [ cc-by-30 unfree ];
|
||||
|
||||
@ -4,17 +4,21 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "anura-engine";
|
||||
version = "unstable-2018-11-28";
|
||||
version = "unstable-2021-05-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anura-engine";
|
||||
repo = "anura";
|
||||
# trunk branch as of 2018-11-28
|
||||
rev = "a05f413f255d2854019134be817c253a03da3d9f";
|
||||
sha256 = "1hd57q8gbn1zdpibnqd3ma0z1ycayc2f4r9j4m2m9kc6yf4v7w7b";
|
||||
rev = "ed50bbfa68a4aa09438d95d39103ec39156d438f";
|
||||
sha256 = "0bk0qklk9wwx3jr2kbrmansccn1nj962v5n2vlb5hxsrcv96s3dg";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/sys.cpp \
|
||||
--replace mallinfo2 mallinfo
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
which pkg-config
|
||||
];
|
||||
|
||||
@ -119,6 +119,20 @@ in rec {
|
||||
'';
|
||||
};
|
||||
|
||||
sandbox = stdenv.mkDerivation {
|
||||
name = "apple-lib-sandbox";
|
||||
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/include $out/lib
|
||||
ln -s "${MacOSX-SDK}/usr/include/sandbox.h" $out/include/sandbox.h
|
||||
cp "${MacOSX-SDK}/usr/lib/libsandbox.1.tbd" $out/lib
|
||||
ln -s libsandbox.1.tbd $out/lib/libsandbox.tbd
|
||||
'';
|
||||
};
|
||||
|
||||
libDER = stdenv.mkDerivation {
|
||||
name = "apple-lib-libDER";
|
||||
dontUnpack = true;
|
||||
@ -133,6 +147,10 @@ in rec {
|
||||
CoreFoundation = lib.overrideDerivation super.CoreFoundation (drv: {
|
||||
setupHook = ./cf-setup-hook.sh;
|
||||
});
|
||||
|
||||
# This framework doesn't exist in newer SDKs (somewhere around 10.13), but
|
||||
# there are references to it in nixpkgs.
|
||||
QuickTime = throw "QuickTime framework not available";
|
||||
};
|
||||
|
||||
bareFrameworks = (
|
||||
|
||||
@ -14,4 +14,5 @@
|
||||
URLFormatting = {};
|
||||
SignpostMetrics = {};
|
||||
PassKitCore = {};
|
||||
SkyLight = {};
|
||||
}
|
||||
|
||||
@ -27,10 +27,10 @@ rec {
|
||||
else legacy_390;
|
||||
|
||||
beta = generic {
|
||||
version = "465.27";
|
||||
sha256_64bit = "fmn/qFve5qqqa26n4dsoOwGZ+ash5Bon3JBI8kncMXE=";
|
||||
settingsSha256 = "3BFLCx0dcrQY4Mv1joMsiVPwTPyufgsNT5pFgp1Mk/A=";
|
||||
persistencedSha256 = "HtoFGTiBnAeQyRTOMlve5poaQh63LHRD+DHJxZO+c90=";
|
||||
version = "465.31";
|
||||
sha256_64bit = "YAjQAckzWGMEnDOOe6arlkBvT3rzFCeqjBjG0ncnLNo=";
|
||||
settingsSha256 = "33zHXxfG/t6REbHqhYjzBhtuus7jP34r2wK90sBT9vE=";
|
||||
persistencedSha256 = "1r/QqjOxg6836mQ46hNsPscKliNAtpN9xW6M++02woY=";
|
||||
};
|
||||
|
||||
# Vulkan developer beta driver
|
||||
|
||||
@ -23,7 +23,7 @@ let
|
||||
# checking, only whitelist licenses used by notable
|
||||
# libcs in nixpkgs (musl and glibc).
|
||||
compatible = lib: drv:
|
||||
lib.any (lic: lic == drv.meta.license) [
|
||||
lib.any (lic: lic == (drv.meta.license or {})) [
|
||||
lib.licenses.mit # musl
|
||||
lib.licenses.lgpl2Plus # glibc
|
||||
];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
|
||||
autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite,
|
||||
liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
|
||||
liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which,
|
||||
openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
|
||||
rsync, glibc, rpcsvc-proto, libtirpc
|
||||
}:
|
||||
@ -17,6 +17,7 @@ let
|
||||
fuse bison flex_2_5_35 openssl ncurses readline
|
||||
autoconf automake libtool pkg-config zlib libaio libxml2
|
||||
acl sqlite liburcu attr makeWrapper util-linux libtirpc
|
||||
liburing
|
||||
(python3.withPackages (pkgs: [
|
||||
pkgs.flask
|
||||
pkgs.prettytable
|
||||
@ -54,13 +55,13 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "glusterfs";
|
||||
version = "9.0";
|
||||
version = "9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gluster";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pjJQAFEb44yNqvNAOclZsiEDZBgcfIxliD3La1IsKPs=";
|
||||
sha256 = "00y2xs7nj4d59x4fp6gq7qql3scykq9lppdvx7y3xbgfmkrwixx9";
|
||||
};
|
||||
inherit buildInputs propagatedBuildInputs;
|
||||
|
||||
|
||||
32
pkgs/tools/misc/pferd/default.nix
Normal file
32
pkgs/tools/misc/pferd/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pferd";
|
||||
version = "3.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Garmelon";
|
||||
repo = "PFERD";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s0z8yajy3n194pnlqb48hy2n5qvhkzwbpksrdyds79vfq0b9rdl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
aiohttp
|
||||
beautifulsoup4
|
||||
rich
|
||||
keyring
|
||||
certifi
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Garmelon/PFERD";
|
||||
description = "Tool for downloading course-related files from ILIAS";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ _0xbe7a ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, apple_sdk ? null
|
||||
, libbsd
|
||||
, libressl
|
||||
, pkg-config
|
||||
@ -18,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libbsd libressl ] ++ optional stdenv.isDarwin apple_sdk.sdk;
|
||||
buildInputs = [ libbsd libressl ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NcLXpxPtTwc/ThI/A9wQ9XI2Msxviy1Ipz8TSfcrHbI=";
|
||||
sha256 = "sha256-nHSnDrvz0EwDnmYch/bDJOZkf1b1Vrf1960d637ZmBs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9uKtrKcF950ZEvpxJzmIQMwc/f1IlgHF8du+RIxhtKI=";
|
||||
vendorSha256 = "sha256-+1XJTr/WJIz/gvvl9KNp68OVEkjHk+KunAd4trd2T/Y=";
|
||||
|
||||
propagatedBuildInputs = [ docker ];
|
||||
|
||||
|
||||
@ -786,7 +786,7 @@ in
|
||||
|
||||
aescrypt = callPackage ../tools/misc/aescrypt { };
|
||||
|
||||
acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; stdenv = gccStdenv; };
|
||||
acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; };
|
||||
|
||||
amass = callPackage ../tools/networking/amass { };
|
||||
|
||||
@ -860,6 +860,8 @@ in
|
||||
|
||||
metapixel = callPackage ../tools/graphics/metapixel { };
|
||||
|
||||
pferd = callPackage ../tools/misc/pferd {};
|
||||
|
||||
quich = callPackage ../tools/misc/quich { } ;
|
||||
|
||||
tfk8s = callPackage ../tools/misc/tfk8s { };
|
||||
@ -5853,6 +5855,8 @@ in
|
||||
|
||||
ipget = callPackage ../applications/networking/ipget { };
|
||||
|
||||
i-pi = with python3Packages; toPythonApplication i-pi;
|
||||
|
||||
iptsd = callPackage ../applications/misc/iptsd { };
|
||||
|
||||
ipmitool = callPackage ../tools/system/ipmitool {};
|
||||
@ -24010,6 +24014,8 @@ in
|
||||
|
||||
gmu = callPackage ../applications/audio/gmu { };
|
||||
|
||||
gnaural = callPackage ../applications/audio/gnaural { };
|
||||
|
||||
gnome_mplayer = callPackage ../applications/video/gnome-mplayer { };
|
||||
|
||||
gnumeric = callPackage ../applications/office/gnumeric { };
|
||||
|
||||
@ -3408,6 +3408,8 @@ in {
|
||||
|
||||
ipfshttpclient = callPackage ../development/python-modules/ipfshttpclient { };
|
||||
|
||||
i-pi = callPackage ../development/python-modules/i-pi { };
|
||||
|
||||
iptools = callPackage ../development/python-modules/iptools { };
|
||||
|
||||
ipy = callPackage ../development/python-modules/IPy { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user