Merge branch 'master' into staging-next
; Conflicts: ; pkgs/top-level/python-packages.nix
This commit is contained in:
commit
222bf23c35
|
@ -6303,6 +6303,12 @@
|
|||
githubId = 1843676;
|
||||
name = "Jonathan Reeve";
|
||||
};
|
||||
jonnybolton = {
|
||||
email = "jonnybolton@gmail.com";
|
||||
github = "jonnybolton";
|
||||
githubId = 8580434;
|
||||
name = "Jonny Bolton";
|
||||
};
|
||||
jonringer = {
|
||||
email = "jonringer117@gmail.com";
|
||||
matrix = "@jonringer:matrix.org";
|
||||
|
@ -7848,6 +7854,12 @@
|
|||
githubId = 7645711;
|
||||
name = "Bart Brouns";
|
||||
};
|
||||
magnouvean = {
|
||||
email = "rg0zjsyh@anonaddy.me";
|
||||
github = "magnouvean";
|
||||
githubId = 85435692;
|
||||
name = "Maxwell Berg";
|
||||
};
|
||||
mahe = {
|
||||
email = "matthias.mh.herrmann@gmail.com";
|
||||
github = "2chilled";
|
||||
|
|
|
@ -36,6 +36,18 @@
|
|||
PHP now defaults to PHP 8.1, updated from 8.0.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>hardware.nvidia</literal> has a new option
|
||||
<literal>open</literal> that can be used to opt in the
|
||||
opensource version of NVIDIA kernel driver. Note that the
|
||||
driver’s support for GeForce and Workstation GPUs is still
|
||||
alpha quality, see
|
||||
<link xlink:href="https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/">NVIDIA
|
||||
Releases Open-Source GPU Kernel Modules</link> for the
|
||||
official announcement.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.11-new-services">
|
||||
|
|
|
@ -19,6 +19,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- PHP now defaults to PHP 8.1, updated from 8.0.
|
||||
|
||||
- `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## New Services {#sec-release-22.11-new-services}
|
||||
|
|
|
@ -4,6 +4,7 @@ setup(
|
|||
name="nixos-test-driver",
|
||||
version='1.1',
|
||||
packages=find_packages(),
|
||||
package_data={"test_driver": ["py.typed"]},
|
||||
entry_points={
|
||||
"console_scripts": [
|
||||
"nixos-test-driver=test_driver:main",
|
||||
|
|
|
@ -119,6 +119,7 @@ rec {
|
|||
{
|
||||
inherit testName;
|
||||
nativeBuildInputs = [ makeWrapper mypy ];
|
||||
buildInputs = [ testDriver ];
|
||||
testScript = testScript';
|
||||
preferLocalBuild = true;
|
||||
passthru = passthru // {
|
||||
|
@ -138,13 +139,10 @@ rec {
|
|||
echo "${builtins.toString vlanNames}" >> testScriptWithTypes
|
||||
echo -n "$testScript" >> testScriptWithTypes
|
||||
|
||||
# set pythonpath so mypy knows where to find the imports. this requires the py.typed file.
|
||||
export PYTHONPATH='${./test-driver}'
|
||||
mypy --no-implicit-optional \
|
||||
--pretty \
|
||||
--no-color-output \
|
||||
testScriptWithTypes
|
||||
unset PYTHONPATH
|
||||
''}
|
||||
|
||||
echo -n "$testScript" >> $out/test-script
|
||||
|
|
|
@ -183,6 +183,14 @@ in
|
|||
'';
|
||||
example = literalExpression "config.boot.kernelPackages.nvidiaPackages.legacy_340";
|
||||
};
|
||||
|
||||
hardware.nvidia.open = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to use the open source kernel module
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = let
|
||||
|
@ -231,6 +239,11 @@ in
|
|||
);
|
||||
message = "Required files for driver based power management don't exist.";
|
||||
}
|
||||
|
||||
{
|
||||
assertion = cfg.open -> (cfg.package ? open && cfg.package ? firmware);
|
||||
message = "This version of NVIDIA driver does not provide a corresponding opensource kernel driver";
|
||||
}
|
||||
];
|
||||
|
||||
# If Optimus/PRIME is enabled, we:
|
||||
|
@ -364,7 +377,8 @@ in
|
|||
++ optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
|
||||
"L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
|
||||
|
||||
boot.extraModulePackages = [ nvidia_x11.bin ];
|
||||
boot.extraModulePackages = if cfg.open then [ nvidia_x11.open ] else [ nvidia_x11.bin ];
|
||||
hardware.firmware = lib.optional cfg.open nvidia_x11.firmware;
|
||||
|
||||
# nvidia-uvm is required by CUDA applications.
|
||||
boot.kernelModules = [ "nvidia-uvm" ] ++
|
||||
|
@ -372,7 +386,8 @@ in
|
|||
|
||||
# If requested enable modesetting via kernel parameter.
|
||||
boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
|
||||
++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1";
|
||||
++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
|
||||
++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1";
|
||||
|
||||
services.udev.extraRules =
|
||||
''
|
||||
|
|
|
@ -578,7 +578,7 @@ in {
|
|||
webserver.wait_for_unit(f"acme-finished-{test_domain}.target")
|
||||
wait_for_server()
|
||||
check_connection(client, test_domain)
|
||||
rc, _ = client.execute(
|
||||
rc, _s = client.execute(
|
||||
f"openssl s_client -CAfile /tmp/ca.crt -connect {test_alias}:443"
|
||||
" </dev/null 2>/dev/null | openssl x509 -noout -text"
|
||||
f" | grep DNS: | grep {test_alias}"
|
||||
|
|
|
@ -23,7 +23,7 @@ in
|
|||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("convos")
|
||||
machine.wait_for_open_port(port)
|
||||
machine.wait_for_open_port(${toString port})
|
||||
machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'")
|
||||
machine.succeed("curl -f http://localhost:${toString port}/")
|
||||
'';
|
||||
|
|
|
@ -5,6 +5,7 @@ import ../make-test-python.nix (
|
|||
# copy_from_host works only for store paths
|
||||
rec {
|
||||
name = "fcitx";
|
||||
meta.broken = true; # takes hours to time out since October 2021
|
||||
nodes.machine =
|
||||
{
|
||||
pkgs,
|
||||
|
|
|
@ -39,16 +39,17 @@
|
|||
|
||||
let
|
||||
pname = "RStudio";
|
||||
version = "1.4.1717";
|
||||
RSTUDIO_VERSION_MAJOR = lib.versions.major version;
|
||||
RSTUDIO_VERSION_MINOR = lib.versions.minor version;
|
||||
RSTUDIO_VERSION_PATCH = lib.versions.patch version;
|
||||
version = "2022.02.3+492";
|
||||
RSTUDIO_VERSION_MAJOR = "2022";
|
||||
RSTUDIO_VERSION_MINOR = "02";
|
||||
RSTUDIO_VERSION_PATCH = "3";
|
||||
RSTUDIO_VERSION_SUFFIX = "+492";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rstudio";
|
||||
repo = "rstudio";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9c1bNsf8kJjpcZ2cMV/pPNtXQkFOntX29a1cdnXpllE=";
|
||||
sha256 = "1pgbk5rpy47h9ihdrplbfhfc49hrc6242j9099bclq7rqif049wi";
|
||||
};
|
||||
|
||||
mathJaxSrc = fetchurl {
|
||||
|
@ -59,7 +60,7 @@ let
|
|||
rsconnectSrc = fetchFromGitHub {
|
||||
owner = "rstudio";
|
||||
repo = "rsconnect";
|
||||
rev = "f5854bb71464f6e3017da9855f058fe3d5b32efd";
|
||||
rev = "e287b586e7da03105de3faa8774c63f08984eb3c";
|
||||
sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y=";
|
||||
};
|
||||
|
||||
|
@ -74,7 +75,7 @@ let
|
|||
in
|
||||
(if server then stdenv.mkDerivation else mkDerivation)
|
||||
(rec {
|
||||
inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH;
|
||||
inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH RSTUDIO_VERSION_SUFFIX;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
@ -114,6 +115,7 @@ in
|
|||
"-DRSTUDIO_USE_SYSTEM_SOCI=ON"
|
||||
"-DRSTUDIO_USE_SYSTEM_BOOST=ON"
|
||||
"-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
|
||||
"-DQUARTO_ENABLED=FALSE"
|
||||
"-DPANDOC_VERSION=${pandoc.version}"
|
||||
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
|
||||
] ++ lib.optional (!server) [
|
||||
|
@ -124,14 +126,9 @@ in
|
|||
patches = [
|
||||
./r-location.patch
|
||||
./clang-location.patch
|
||||
# postFetch doesn't work with this | error: unexpected end-of-file
|
||||
# replacing /usr/bin/node is done in postPatch
|
||||
# https://src.fedoraproject.org/rpms/rstudio/tree/rawhide
|
||||
(fetchpatch {
|
||||
name = "system-node.patch";
|
||||
url = "https://src.fedoraproject.org/rpms/rstudio/raw/5bda2e290c9e72305582f2011040938d3e356906/f/0004-use-system-node.patch";
|
||||
sha256 = "sha256-P1Y07RB/ceFNa749nyBUWSE41eiiZgt43zVcmahvfZM=";
|
||||
})
|
||||
./use-system-node.patch
|
||||
./fix-resources-path.patch
|
||||
./pandoc-nix-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -141,14 +138,14 @@ in
|
|||
--replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"'
|
||||
|
||||
substituteInPlace src/gwt/build.xml \
|
||||
--replace '/usr/bin/node' '${nodejs}/bin/node'
|
||||
--replace '@node@' ${nodejs}
|
||||
|
||||
substituteInPlace src/cpp/core/libclang/LibClang.cpp \
|
||||
--replace '@libclang@' ${llvmPackages.libclang.lib} \
|
||||
--replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so
|
||||
|
||||
substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \
|
||||
--replace "bin/pandoc" "${pandoc}/bin/pandoc"
|
||||
substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \
|
||||
--replace '@pandoc@' ${pandoc}/bin/pandoc
|
||||
'';
|
||||
|
||||
hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts));
|
||||
|
@ -197,6 +194,7 @@ in
|
|||
for f in .gitignore .Rbuildignore LICENSE README; do
|
||||
find . -name $f -delete
|
||||
done
|
||||
|
||||
rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
|
||||
rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc}
|
||||
'';
|
||||
|
|
19
pkgs/applications/editors/rstudio/fix-resources-path.patch
Normal file
19
pkgs/applications/editors/rstudio/fix-resources-path.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
--- a/src/cpp/desktop/DesktopOptions.cpp
|
||||
+++ b/src/cpp/desktop/DesktopOptions.cpp
|
||||
@@ -499,15 +499,9 @@
|
||||
{
|
||||
if (resourcesPath_.isEmpty())
|
||||
{
|
||||
-#ifdef RSTUDIO_PACKAGE_BUILD
|
||||
// release configuration: the 'resources' folder is
|
||||
// part of the supporting files folder
|
||||
- resourcesPath_ = supportingFilePath().completePath("resources");
|
||||
-#else
|
||||
- // developer configuration: the 'resources' folder is
|
||||
- // a sibling of the RStudio executable
|
||||
- resourcesPath_ = scriptsPath().completePath("resources");
|
||||
-#endif
|
||||
+ resourcesPath_ = supportingFilePath().completePath("resources");
|
||||
}
|
||||
|
||||
return resourcesPath_;
|
|
@ -5,57 +5,59 @@
|
|||
"license": "agpl-3.0",
|
||||
"dependencies": {
|
||||
"@types/ace": "^0.0.43",
|
||||
"@types/clipboard": "^2.0.1",
|
||||
"@types/clipboard": "^2.0.7",
|
||||
"@types/diff-match-patch": "^1.0.32",
|
||||
"@types/js-yaml": "^3.12.3",
|
||||
"@types/js-yaml": "^4.0.3",
|
||||
"@types/lodash.debounce": "^4.0.6",
|
||||
"@types/lodash.orderby": "^4.6.6",
|
||||
"@types/lodash.uniqby": "^4.7.6",
|
||||
"@types/orderedmap": "^1.0.0",
|
||||
"@types/prosemirror-commands": "^1.0.3",
|
||||
"@types/prosemirror-dev-tools": "^2.1.0",
|
||||
"@types/prosemirror-dropcursor": "^1.0.0",
|
||||
"@types/prosemirror-gapcursor": "^1.0.1",
|
||||
"@types/prosemirror-history": "^1.0.1",
|
||||
"@types/prosemirror-inputrules": "^1.0.3",
|
||||
"@types/prosemirror-keymap": "^1.0.3",
|
||||
"@types/prosemirror-model": "^1.7.2",
|
||||
"@types/prosemirror-schema-list": "^1.0.1",
|
||||
"@types/prosemirror-state": "^1.2.5",
|
||||
"@types/pinyin": "^2.10.0",
|
||||
"@types/prosemirror-commands": "^1.0.4",
|
||||
"@types/prosemirror-dropcursor": "^1.0.3",
|
||||
"@types/prosemirror-gapcursor": "^1.0.4",
|
||||
"@types/prosemirror-history": "^1.0.3",
|
||||
"@types/prosemirror-inputrules": "^1.0.4",
|
||||
"@types/prosemirror-keymap": "^1.0.4",
|
||||
"@types/prosemirror-schema-list": "^1.0.3",
|
||||
"@types/prosemirror-tables": "^0.9.1",
|
||||
"@types/prosemirror-transform": "^1.1.1",
|
||||
"@types/react": "^16.9.32",
|
||||
"@types/react-dom": "^16.9.6",
|
||||
"@types/react-window": "^1.8.2",
|
||||
"@types/zenscroll": "^4.0.0",
|
||||
"biblatex-csl-converter": "^1.9.1",
|
||||
"clipboard": "^2.0.6",
|
||||
"diff-match-patch": "^1.0.4",
|
||||
"fuse.js": "^6.0.4",
|
||||
"js-yaml": "^3.13.1",
|
||||
"@types/react": "^17.0.20",
|
||||
"@types/react-dom": "^17.0.9",
|
||||
"@types/react-window": "^1.8.5",
|
||||
"@types/transliteration": "^1.6.6",
|
||||
"@types/zenscroll": "^4.0.1",
|
||||
"biblatex-csl-converter": "^2.0.2",
|
||||
"clipboard": "^2.0.8",
|
||||
"diff-match-patch": "^1.0.5",
|
||||
"fuse.js": "^6.4.6",
|
||||
"js-yaml": "^4.1.0",
|
||||
"lodash.debounce": "^4.0.8",
|
||||
"lodash.orderby": "^4.6.0",
|
||||
"lodash.uniqby": "^4.7.0",
|
||||
"orderedmap": "^1.0.0",
|
||||
"pinyin": "^2.10.2",
|
||||
"prosemirror-changeset": "^2.1.2",
|
||||
"prosemirror-commands": "^1.1.4",
|
||||
"prosemirror-commands": "^1.1.10",
|
||||
"prosemirror-dev-tools": "^2.1.1",
|
||||
"prosemirror-dropcursor": "^1.3.2",
|
||||
"prosemirror-dropcursor": "^1.3.5",
|
||||
"prosemirror-gapcursor": "^1.1.5",
|
||||
"prosemirror-history": "^1.1.3",
|
||||
"prosemirror-inputrules": "^1.1.2",
|
||||
"prosemirror-history": "^1.2.0",
|
||||
"prosemirror-inputrules": "^1.1.3",
|
||||
"prosemirror-keymap": "^1.1.4",
|
||||
"prosemirror-model": "^1.11.0",
|
||||
"prosemirror-schema-list": "^1.1.4",
|
||||
"prosemirror-state": "^1.3.3",
|
||||
"prosemirror-model": "^1.14.3",
|
||||
"prosemirror-schema-list": "^1.1.5",
|
||||
"prosemirror-state": "^1.3.4",
|
||||
"prosemirror-tables": "^1.1.1",
|
||||
"prosemirror-transform": "^1.2.8",
|
||||
"prosemirror-transform": "^1.3.2",
|
||||
"prosemirror-utils": "^0.9.6",
|
||||
"prosemirror-view": "^1.15.6",
|
||||
"react": "^16.13.1",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-window": "^1.8.5",
|
||||
"sentence-splitter": "^3.2.0",
|
||||
"prosemirror-view": "^1.20.1",
|
||||
"react": "^17.0.2",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-window": "^1.8.6",
|
||||
"sentence-splitter": "^3.2.2",
|
||||
"thenby": "^1.3.3",
|
||||
"tlite": "^0.1.9",
|
||||
"transliteration": "^2.2.0",
|
||||
"typescript": "3.8.3",
|
||||
"zenscroll": "^4.0.2"
|
||||
},
|
||||
|
|
11
pkgs/applications/editors/rstudio/pandoc-nix-path.patch
Normal file
11
pkgs/applications/editors/rstudio/pandoc-nix-path.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- a/src/cpp/session/include/session/SessionConstants.hpp
|
||||
+++ b/src/cpp/session/include/session/SessionConstants.hpp
|
||||
@@ -140,7 +140,7 @@
|
||||
#ifdef QUARTO_ENABLED
|
||||
# define kDefaultPandocPath "bin/quarto/bin"
|
||||
#else
|
||||
-# define kDefaultPandocPath "bin/pandoc"
|
||||
+# define kDefaultPandocPath "@pandoc@"
|
||||
#endif
|
||||
|
||||
#define kDefaultQuartoPath "bin/quarto"
|
28
pkgs/applications/editors/rstudio/use-system-node.patch
Normal file
28
pkgs/applications/editors/rstudio/use-system-node.patch
Normal file
|
@ -0,0 +1,28 @@
|
|||
--- a/src/gwt/build.xml
|
||||
+++ b/src/gwt/build.xml
|
||||
@@ -84,23 +84,7 @@
|
||||
</target>
|
||||
|
||||
<!-- panmirror typescript library -->
|
||||
- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
|
||||
- <property name="node.version" value="14.17.5"/>
|
||||
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
|
||||
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
|
||||
- <not>
|
||||
- <os family="windows" />
|
||||
- </not>
|
||||
- </condition>
|
||||
- <condition property="node.bin" value="${node.dir}/node.exe">
|
||||
- <os family="windows" />
|
||||
- </condition>
|
||||
-
|
||||
- <!-- use node from /opt/rstudio-tools if installed (typical for Docker) -->
|
||||
- <available
|
||||
- property="node.bin"
|
||||
- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"
|
||||
- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/>
|
||||
+ <property name="node.bin" value="@node@/bin/node"/>
|
||||
|
||||
<property name="panmirror.dir" value="./panmirror/src/editor"/>
|
||||
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
|
||||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -18,6 +18,7 @@
|
|||
, lcms
|
||||
, libpng
|
||||
, libjpeg
|
||||
, libjxl
|
||||
, poppler
|
||||
, poppler_data
|
||||
, libtiff
|
||||
|
@ -53,13 +54,13 @@ let
|
|||
python = python2.withPackages (pp: [ pp.pygtk ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gimp";
|
||||
version = "2.10.30";
|
||||
version = "2.10.32";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "iIFdqnbtfUJ37rNTNYuvoRbNL80shh2VuVE1wdUrZ9w=";
|
||||
sha256 = "PxXHBVSvXcwbRubcaPPY8KbMn+VrbXisCMD9hZq4miU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -100,6 +101,7 @@ in stdenv.mkDerivation rec {
|
|||
lcms
|
||||
libpng
|
||||
libjpeg
|
||||
libjxl
|
||||
poppler
|
||||
poppler_data
|
||||
libtiff
|
||||
|
|
|
@ -1,24 +1,43 @@
|
|||
{ buildGraalvmNativeImage, fetchzip, graalvm17-ce, lib }:
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
{ buildPackages
|
||||
, buildPlatform
|
||||
, fetchzip
|
||||
, javaOpts ? "-XX:+UseZGC"
|
||||
, jdk
|
||||
, jre_headless
|
||||
, lib
|
||||
, makeWrapper
|
||||
, stdenvNoCC
|
||||
,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "HentaiAtHome";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}.zip";
|
||||
url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip";
|
||||
hash =
|
||||
"sha512-nGGCuVovj4NJGrihKKYXnh0Ic9YD36o7r6wv9zSivZn22zm8lBYVXP85LnOw2z9DiJARivOctQGl48YFD7vxOQ==";
|
||||
"sha512-j+B0kx6fjUibI3MjVJ5PVTq9xxtSOTTY/XizAJKjeNkpExJF9DIV4VCwf+sfLlg+7W4UBosnyb8hZNNoidRBKA==";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
jar = "${src}/HentaiAtHome.jar";
|
||||
dontUnpack = true;
|
||||
nativeBuildInputs = [ jdk makeWrapper ];
|
||||
|
||||
graalvmDrv = graalvm17-ce;
|
||||
extraNativeImageBuildArgs = [
|
||||
"--enable-url-protocols=http,https"
|
||||
"--install-exit-handlers"
|
||||
"--no-fallback"
|
||||
];
|
||||
LANG = "en_US.UTF-8";
|
||||
LOCALE_ARCHIVE = lib.optionalString (buildPlatform.libc == "glibc")
|
||||
"${buildPackages.glibcLocales}/lib/locale/locale-archive";
|
||||
|
||||
buildPhase = ''
|
||||
make all
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/java
|
||||
cp build/HentaiAtHome.jar $out/share/java
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${jre_headless}/bin/java $out/bin/HentaiAtHome \
|
||||
--add-flags "${javaOpts} -jar $out/share/java/HentaiAtHome.jar"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
|
@ -27,11 +46,12 @@ buildGraalvmNativeImage rec {
|
|||
popd
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ehwiki.org/wiki/Hentai@Home";
|
||||
description =
|
||||
"Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ terrorjack ];
|
||||
};
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kn";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knative";
|
||||
repo = "client";
|
||||
rev = "knative-v${version}";
|
||||
sha256 = "sha256-Q67dictDE+HWw99lFAiidBvIL30mMAkjYb2CDLDcalw=";
|
||||
sha256 = "sha256-etENW/zP9xy0pyUT2UoFXrzgkSXrfp8dxl35bD2t/Yc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, mkFranzDerivation, fetchurl, xorg }:
|
||||
|
||||
mkFranzDerivation rec {
|
||||
pname = "ferdium";
|
||||
name = "Ferdium";
|
||||
version = "6.0.0-nightly.65";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/ferdium_${version}_amd64.deb";
|
||||
sha256 = "sha256-vmu74aLAKGbmRf9hkMUL5VOfi/Cbvdix9MzsZK1qW80=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [ xorg.libxshmfence ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "All your services in one place built by the community";
|
||||
homepage = "https://ferdium.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ magnouvean ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
hydraPlatforms = [ ];
|
||||
};
|
||||
}
|
|
@ -15,14 +15,14 @@ let
|
|||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "openmolcas";
|
||||
version = "22.02";
|
||||
version = "22.06";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Molcas";
|
||||
repo = "OpenMolcas";
|
||||
# The tag keeps moving, fix a hash instead
|
||||
rev = "f8df69cf87b241a15ebc82d72a8f9a031a385dd4"; # 2022-02-10
|
||||
sha256 = "0p2xj8kgqdk5kb1jv5k77acbiqkbl2sh971jnz9p00cmbh556r6a";
|
||||
rev = "17238da5c339c41ddf14ceb88f139d57143d7a14"; # 2022-06-17
|
||||
sha256 = "0g17x5fp27b57f7j284xl3b3i9c4b909q504wpz0ipb0mrcvcpdp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -32,6 +32,12 @@ in stdenv.mkDerivation {
|
|||
./MKL-MPICH.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Using env fails in the sandbox
|
||||
substituteInPlace Tools/pymolcas/export.py --replace \
|
||||
"/usr/bin/env','python3" "python3"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
gfortran
|
||||
|
|
|
@ -21,6 +21,7 @@ let
|
|||
homepage = "https://tamarin-prover.github.io";
|
||||
description = "Security protocol verification in the symbolic model";
|
||||
maintainers = [ lib.maintainers.thoughtpolice ];
|
||||
hydraPlatforms = lib.platforms.linux; # maude is broken on darwin
|
||||
};
|
||||
|
||||
# tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wxmaxima";
|
||||
version = "22.03.0";
|
||||
version = "22.05.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wxMaxima-developers";
|
||||
repo = "wxmaxima";
|
||||
rev = "Version-${version}";
|
||||
sha256 = "sha256-ynLx1HPfDjLbyFziWFbjpCeUBaA3hAFRFm5/1GeFKRE=";
|
||||
sha256 = "sha256-pcKnEjJmvMXCBpjtOSLyl4I0x3fjh0os9Sdp39I2Re0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "a4be9679c308459b390768e6195f3f08ae5366db",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4be9679c308459b390768e6195f3f08ae5366db.tar.gz",
|
||||
"sha256": "09pr3ag0k1wjiih36p902gcpygxg8f7wqpr5g8j7ka851g0gckqa",
|
||||
"msg": "Update from Hackage at 2022-06-04T09:01:11Z"
|
||||
"commit": "e55c7aa130b33bcfe416a246d9e8a108c63022f9",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e55c7aa130b33bcfe416a246d9e8a108c63022f9.tar.gz",
|
||||
"sha256": "1nmqxlj9c76xpyz1js47bk7m05mr229c8y5k7gnnjwh4gspr0p0r",
|
||||
"msg": "Update from Hackage at 2022-06-07T15:13:17Z"
|
||||
}
|
||||
|
|
|
@ -8,12 +8,14 @@
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "ghcjs-base";
|
||||
version = "0.2.0.3";
|
||||
version = "0.2.1.0";
|
||||
# This is the release 0.2.1.0, but the hackage release misses test source files,
|
||||
# so lets use github https://github.com/ghcjs/ghcjs-base/issues/132
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghcjs";
|
||||
repo = "ghcjs-base";
|
||||
rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2";
|
||||
sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU=";
|
||||
rev = "fbaae59b05b020e91783df122249095e168df53f";
|
||||
sha256 = "sha256-x6eCAK1Hne0QkV3Loi9YpxbleNHU593E4AO8cbk2vUc=";
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson attoparsec base binary bytestring containers deepseq dlist
|
||||
|
|
|
@ -238,10 +238,16 @@ self: super: {
|
|||
digit = doJailbreak super.digit;
|
||||
|
||||
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
||||
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix);
|
||||
# 2022-06-17: Use hnix-store 0.5 until hnix 0.17
|
||||
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck (
|
||||
super.hnix.overrideScope (hself: hsuper: {
|
||||
hnix-store-core = hself.hnix-store-core_0_5_0_0;
|
||||
hnix-store-remote = hself.hnix-store-remote_0_5_0_0;
|
||||
})
|
||||
));
|
||||
# Too strict bounds on algebraic-graphs
|
||||
# https://github.com/haskell-nix/hnix-store/issues/180
|
||||
hnix-store-core = doJailbreak super.hnix-store-core;
|
||||
hnix-store-core_0_5_0_0 = doJailbreak super.hnix-store-core_0_5_0_0;
|
||||
|
||||
# Fails for non-obvious reasons while attempting to use doctest.
|
||||
focuslist = dontCheck super.focuslist;
|
||||
|
@ -2096,15 +2102,18 @@ self: super: {
|
|||
};
|
||||
} self.haskell-ci;
|
||||
|
||||
large-hashable = lib.pipe super.large-hashable [
|
||||
# 2022-03-21: use version from git which includes support for GHC 9.0.1
|
||||
large-hashable = lib.pipe (super.large-hashable.override {
|
||||
# https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c
|
||||
utf8-light = null;
|
||||
}) [
|
||||
# 2022-03-21: use version from git which supports GHC 9.{0,2} and aeson 2.0
|
||||
(assert super.large-hashable.version == "0.1.0.4"; overrideSrc {
|
||||
version = "unstable-2021-11-01";
|
||||
version = "unstable-2022-06-10";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "factisresearch";
|
||||
repo = "large-hashable";
|
||||
rev = "b4e6b3d23c2b1af965ffcc055f5405ff673e66cf";
|
||||
sha256 = "1bgf37qfzdyjhpgnj9aipwzpa06nc7b1g4f64xsmknyds7ffhixz";
|
||||
rev = "4d149c828c185bcf05556d1660f79ff1aec7eaa1";
|
||||
sha256 = "141349qcw3m93jw95jcha9rsg2y8sn5ca5j59cv8xmci38k2nam0";
|
||||
};
|
||||
})
|
||||
# Provide newly added dependencies
|
||||
|
@ -2117,15 +2126,12 @@ self: super: {
|
|||
self.inspection-testing
|
||||
];
|
||||
}))
|
||||
# 2022-03-21: patch for aeson 2.0
|
||||
# https://github.com/factisresearch/large-hashable/pull/22
|
||||
(appendPatches [
|
||||
(fetchpatch {
|
||||
name = "large-hashable-aeson-2.0.patch";
|
||||
url = "https://github.com/factisresearch/large-hashable/commit/7094ef0ba55b4848cb57bae73d119acfb496a4c9.patch";
|
||||
sha256 = "0ckiii0s697h817z65jwlmjzqw2ckpm815wqcnxjigf6v9kxps8j";
|
||||
})
|
||||
])
|
||||
# https://github.com/factisresearch/large-hashable/issues/24
|
||||
(overrideCabal (drv: {
|
||||
testFlags = drv.testFlags or [] ++ [
|
||||
"-n" "^Data.LargeHashable.Tests.Inspection:genericSumGetsOptimized$"
|
||||
];
|
||||
}))
|
||||
];
|
||||
|
||||
# BSON defaults to requiring network instead of network-bsd which is
|
||||
|
@ -2179,10 +2185,10 @@ self: super: {
|
|||
# 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
|
||||
stylish-haskell = (super.stylish-haskell.override {
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
|
||||
});
|
||||
|
||||
ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override {
|
||||
ghc-lib-parser-ex_9_2_1_0 = super.ghc-lib-parser-ex_9_2_1_0.override {
|
||||
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527;
|
||||
};
|
||||
|
||||
|
|
|
@ -102,7 +102,7 @@ self: super: {
|
|||
}) super.ghc-exactprint;
|
||||
ghc-lib = self.ghc-lib_9_2_3_20220527;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220527;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
|
||||
hackage-security = doJailbreak super.hackage-security;
|
||||
hashable = super.hashable_1_4_0_2;
|
||||
hashable-time = doJailbreak super.hashable-time;
|
||||
|
|
|
@ -18,8 +18,10 @@ self: super:
|
|||
inherit (self.ghc.bootPkgs)
|
||||
jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
|
||||
|
||||
# Test suite fails; https://github.com/ghcjs/ghcjs-base/issues/133
|
||||
ghcjs-base = dontCheck (self.callPackage ../compilers/ghcjs/ghcjs-base.nix {
|
||||
fetchFromGitHub = pkgs.buildPackages.fetchFromGitHub;
|
||||
aeson = self.aeson_1_5_6_0;
|
||||
});
|
||||
|
||||
# GHCJS does not ship with the same core packages as GHC.
|
||||
|
@ -35,6 +37,9 @@ self: super:
|
|||
# nodejs crashes during test
|
||||
ChasingBottoms = dontCheck super.ChasingBottoms;
|
||||
|
||||
# runs forever
|
||||
text-short = dontCheck super.text-short;
|
||||
|
||||
# doctest doesn't work on ghcjs, but sometimes dontCheck doesn't seem to get rid of the dependency
|
||||
doctest = pkgs.lib.warn "ignoring dependency on doctest" null;
|
||||
|
||||
|
|
|
@ -262,7 +262,6 @@ broken-packages:
|
|||
- authenticate-ldap
|
||||
- authinfo-hs
|
||||
- auto
|
||||
- autodocodec
|
||||
- autom
|
||||
- autonix-deps
|
||||
- autopack
|
||||
|
@ -519,6 +518,7 @@ broken-packages:
|
|||
- cabal2doap
|
||||
- cabal2ebuild
|
||||
- cabal2ghci
|
||||
- cabal2json
|
||||
- cabal-audit
|
||||
- cabal-auto-expose
|
||||
- cabal-bundle-clib
|
||||
|
@ -610,6 +610,7 @@ broken-packages:
|
|||
- category-traced
|
||||
- catnplus
|
||||
- cautious-file
|
||||
- cautious-gen
|
||||
- cayene-lpp
|
||||
- cayley-client
|
||||
- cblrepo
|
||||
|
@ -865,6 +866,7 @@ broken-packages:
|
|||
- CoreDump
|
||||
- CoreErlang
|
||||
- core-haskell
|
||||
- core-telemetry
|
||||
- core-webserver-warp
|
||||
- Coroutine
|
||||
- coroutine-object
|
||||
|
@ -929,6 +931,7 @@ broken-packages:
|
|||
- ctemplate
|
||||
- ctkl
|
||||
- cuboid
|
||||
- cuckoo
|
||||
- cuckoo-filter
|
||||
- curl-aeson
|
||||
- curl-runnings
|
||||
|
@ -1361,6 +1364,7 @@ broken-packages:
|
|||
- except-exceptions
|
||||
- exceptional
|
||||
- exceptionfree-readfile
|
||||
- exchangerates
|
||||
- execs
|
||||
- executor
|
||||
- exh
|
||||
|
@ -1476,6 +1480,7 @@ broken-packages:
|
|||
- fixed-storable-array
|
||||
- fixed-timestep
|
||||
- fixed-width
|
||||
- fixer
|
||||
- fixfile
|
||||
- fixie
|
||||
- fix-symbols-gitit
|
||||
|
@ -2210,7 +2215,6 @@ broken-packages:
|
|||
- higgledy
|
||||
- higherorder
|
||||
- highjson
|
||||
- highlight
|
||||
- highlight-versions
|
||||
- highWaterMark
|
||||
- himg
|
||||
|
@ -2744,7 +2748,6 @@ broken-packages:
|
|||
- joy-rewrite
|
||||
- jpeg
|
||||
- jsaddle-clib
|
||||
- jsaddle-warp
|
||||
- jsaddle-wkwebview
|
||||
- js-good-parts
|
||||
- json2
|
||||
|
@ -3096,6 +3099,7 @@ broken-packages:
|
|||
- lushtags
|
||||
- luthor
|
||||
- lvmlib
|
||||
- lvmrun
|
||||
- lxd-client
|
||||
- lye
|
||||
- lz4-frame-conduit
|
||||
|
@ -3129,6 +3133,7 @@ broken-packages:
|
|||
- make-hard-links
|
||||
- make-monofoldable-foldable
|
||||
- mallard
|
||||
- managed-functions
|
||||
- mandulia
|
||||
- mangopay
|
||||
- Map
|
||||
|
@ -3204,6 +3209,7 @@ broken-packages:
|
|||
- menoh
|
||||
- menshen
|
||||
- mergeful
|
||||
- mergeless-persistent
|
||||
- merkle-tree
|
||||
- messagepack-rpc
|
||||
- messente
|
||||
|
@ -3603,6 +3609,7 @@ broken-packages:
|
|||
- open-adt
|
||||
- OpenAFP
|
||||
- openai-servant
|
||||
- openapi3-code-generator
|
||||
- openapi-petstore
|
||||
- openapi-typed
|
||||
- opench-meteo
|
||||
|
@ -4084,6 +4091,7 @@ broken-packages:
|
|||
- proto-lens-combinators
|
||||
- proto-lens-jsonpb
|
||||
- protolude-lifted
|
||||
- proton
|
||||
- proton-haskell
|
||||
- prototype
|
||||
- prove-everywhere-server
|
||||
|
@ -4597,7 +4605,11 @@ broken-packages:
|
|||
- shorten-strings
|
||||
- short-vec
|
||||
- show-prettyprint
|
||||
- Shpadoinkle-backend-pardiff
|
||||
- Shpadoinkle-backend-snabbdom
|
||||
- Shpadoinkle-backend-static
|
||||
- Shpadoinkle-console
|
||||
- Shpadoinkle-html
|
||||
- Shpadoinkle-isreal
|
||||
- shwifty
|
||||
- sifflet
|
||||
|
@ -4937,6 +4949,7 @@ broken-packages:
|
|||
- supernova
|
||||
- supero
|
||||
- superrecord
|
||||
- super-user-spark
|
||||
- supervisor
|
||||
- supervisors
|
||||
- supplemented
|
||||
|
@ -4960,6 +4973,11 @@ broken-packages:
|
|||
- sws
|
||||
- syb-extras
|
||||
- syb-with-class
|
||||
- sydtest-hedis
|
||||
- sydtest-mongo
|
||||
- sydtest-persistent-postgresql
|
||||
- sydtest-rabbitmq
|
||||
- sydtest-yesod
|
||||
- syfco
|
||||
- sym
|
||||
- symantic
|
||||
|
@ -5429,7 +5447,6 @@ broken-packages:
|
|||
- validated-types
|
||||
- Validation
|
||||
- validations
|
||||
- validity-aeson
|
||||
- valid-names
|
||||
- value-supply
|
||||
- vampire
|
||||
|
|
|
@ -135,6 +135,8 @@ extra-packages:
|
|||
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
|
||||
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
|
||||
- fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
|
||||
- hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
||||
- hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
@ -347,9 +349,16 @@ package-maintainers:
|
|||
- lentil
|
||||
sorki:
|
||||
- cayenne-lpp
|
||||
- blockfrost-client
|
||||
- data-lens-light
|
||||
- data-stm32
|
||||
- gcodehs
|
||||
- hnix
|
||||
- hnix-store-core
|
||||
- hnix-store-remote
|
||||
- implicit
|
||||
- nix-derivation
|
||||
- nix-diff
|
||||
- nix-narinfo
|
||||
- ttn
|
||||
- ttn-client
|
||||
|
@ -456,6 +465,7 @@ unsupported-platforms:
|
|||
HSoM: [ x86_64-darwin, aarch64-darwin ]
|
||||
iwlib: [ x86_64-darwin, aarch64-darwin ]
|
||||
Jazzkell: [ x86_64-darwin, aarch64-darwin ] # depends on Euterpea
|
||||
jsaddle-hello: [ x86_64-darwin, aarch64-darwin ] # depends on jsaddle-webkit2gtk
|
||||
jsaddle-webkit2gtk: [ x86_64-darwin, aarch64-darwin ]
|
||||
keid-core: [ aarch64-linux ]
|
||||
keid-geometry: [ aarch64-linux ]
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# Stackage LTS 19.9
|
||||
# Stackage LTS 19.10
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
|
@ -8,7 +8,7 @@ default-package-overrides:
|
|||
- AC-Angle ==1.0
|
||||
- acc ==0.2.0.1
|
||||
- ace ==0.6
|
||||
- acid-state ==0.16.1
|
||||
- acid-state ==0.16.1.1
|
||||
- action-permutations ==0.0.0.1
|
||||
- active ==0.2.0.15
|
||||
- ad ==4.5.1
|
||||
|
@ -373,7 +373,7 @@ default-package-overrides:
|
|||
- comfort-fftw ==0.0
|
||||
- comfort-graph ==0.0.3.2
|
||||
- commonmark ==0.2.2
|
||||
- commonmark-extensions ==0.2.3.1
|
||||
- commonmark-extensions ==0.2.3.2
|
||||
- commonmark-pandoc ==0.2.1.2
|
||||
- commutative ==0.0.2
|
||||
- comonad ==5.0.8
|
||||
|
@ -580,7 +580,7 @@ default-package-overrides:
|
|||
- dimensional ==1.4
|
||||
- di-monad ==1.3.1
|
||||
- directory-tree ==0.12.1
|
||||
- direct-sqlite ==2.3.26
|
||||
- direct-sqlite ==2.3.27
|
||||
- dirichlet ==0.1.0.6
|
||||
- discount ==0.1.1
|
||||
- discover-instances ==0.1.0.0
|
||||
|
@ -682,7 +682,7 @@ default-package-overrides:
|
|||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.11
|
||||
- esqueleto ==3.5.4.1
|
||||
- esqueleto ==3.5.5.0
|
||||
- essence-of-live-coding ==0.2.6
|
||||
- essence-of-live-coding-gloss ==0.2.6
|
||||
- essence-of-live-coding-pulse ==0.2.6
|
||||
|
@ -1003,10 +1003,10 @@ default-package-overrides:
|
|||
- haskintex ==0.8.0.0
|
||||
- haskoin-core ==0.21.2
|
||||
- hasktags ==0.72.0
|
||||
- hasql ==1.5.0.2
|
||||
- hasql ==1.5.0.3
|
||||
- hasql-migration ==0.3.0
|
||||
- hasql-notifications ==0.2.0.0
|
||||
- hasql-optparse-applicative ==0.3.0.8
|
||||
- hasql-notifications ==0.2.0.1
|
||||
- hasql-optparse-applicative ==0.3.0.9
|
||||
- hasql-pool ==0.5.2.2
|
||||
- hasql-queue ==1.2.0.2
|
||||
- hasql-th ==0.4.0.14
|
||||
|
@ -1326,7 +1326,7 @@ default-package-overrides:
|
|||
- js-jquery ==3.3.1
|
||||
- json ==0.10
|
||||
- json-feed ==2.0.0.1
|
||||
- jsonifier ==0.2.0.1
|
||||
- jsonifier ==0.2.1.1
|
||||
- jsonpath ==0.2.1.0
|
||||
- json-stream ==0.4.4.1
|
||||
- JuicyPixels ==3.3.7
|
||||
|
@ -1611,7 +1611,7 @@ default-package-overrides:
|
|||
- mwc-random-monad ==0.7.3.1
|
||||
- mx-state-codes ==1.0.0.0
|
||||
- mysql ==0.2.1
|
||||
- mysql-simple ==0.4.8
|
||||
- mysql-simple ==0.4.8.1
|
||||
- n2o ==0.11.1
|
||||
- n2o-nitro ==0.11.2
|
||||
- nagios-check ==0.3.2
|
||||
|
@ -1746,7 +1746,7 @@ default-package-overrides:
|
|||
- pandoc ==2.17.1.1
|
||||
- pandoc-csv2table ==1.0.9
|
||||
- pandoc-dhall-decoder ==0.1.0.1
|
||||
- pandoc-lua-marshal ==0.1.5.1
|
||||
- pandoc-lua-marshal ==0.1.6
|
||||
- pandoc-plot ==1.4.1
|
||||
- pandoc-throw ==0.1.0.0
|
||||
- pandoc-types ==1.22.2
|
||||
|
@ -2088,7 +2088,7 @@ default-package-overrides:
|
|||
- rope-utf16-splay ==0.3.2.0
|
||||
- rosezipper ==0.2
|
||||
- rot13 ==0.2.0.1
|
||||
- rpmbuild-order ==0.4.5
|
||||
- rpmbuild-order ==0.4.7
|
||||
- rpm-nvr ==0.1.2
|
||||
- rp-tree ==0.7.1
|
||||
- RSA ==2.4.1
|
||||
|
@ -2295,7 +2295,7 @@ default-package-overrides:
|
|||
- spreadsheet ==0.1.3.8
|
||||
- sqlcli ==0.2.2.0
|
||||
- sqlcli-odbc ==0.2.0.1
|
||||
- sqlite-simple ==0.4.18.0
|
||||
- sqlite-simple ==0.4.18.2
|
||||
- sql-words ==0.1.6.4
|
||||
- squeather ==0.8.0.0
|
||||
- srcloc ==0.6.0.1
|
||||
|
@ -2532,7 +2532,7 @@ default-package-overrides:
|
|||
- tinylog ==0.15.0
|
||||
- titlecase ==1.0.1
|
||||
- tldr ==0.9.2
|
||||
- tls ==1.5.7
|
||||
- tls ==1.5.8
|
||||
- tls-debug ==0.4.8
|
||||
- tls-session-manager ==0.0.4
|
||||
- tlynx ==0.6.1.1
|
||||
|
@ -2575,7 +2575,7 @@ default-package-overrides:
|
|||
- twitter-types ==0.11.0
|
||||
- twitter-types-lens ==0.11.0
|
||||
- TypeCompose ==0.9.14
|
||||
- typed-process ==0.2.8.0
|
||||
- typed-process ==0.2.10.1
|
||||
- type-equality ==1
|
||||
- type-errors ==0.2.0.0
|
||||
- type-errors-pretty ==0.0.1.2
|
||||
|
@ -2792,7 +2792,7 @@ default-package-overrides:
|
|||
- X11 ==1.10.2
|
||||
- X11-xft ==0.3.4
|
||||
- x11-xim ==0.0.9.0
|
||||
- x509 ==1.7.6
|
||||
- x509 ==1.7.7
|
||||
- x509-store ==1.6.9
|
||||
- x509-system ==1.6.7
|
||||
- x509-validation ==1.6.12
|
||||
|
|
|
@ -338,17 +338,10 @@ dont-distribute-packages:
|
|||
- Shellac-haskeline
|
||||
- Shellac-readline
|
||||
- ShortestPathProblems
|
||||
- Shpadoinkle
|
||||
- Shpadoinkle-backend-pardiff
|
||||
- Shpadoinkle-backend-snabbdom
|
||||
- Shpadoinkle-backend-static
|
||||
- Shpadoinkle-developer-tools
|
||||
- Shpadoinkle-disembodied
|
||||
- Shpadoinkle-examples
|
||||
- Shpadoinkle-html
|
||||
- Shpadoinkle-lens
|
||||
- Shpadoinkle-router
|
||||
- Shpadoinkle-streaming
|
||||
- Shpadoinkle-template
|
||||
- Shpadoinkle-widgets
|
||||
- SimpleGL
|
||||
|
@ -650,7 +643,6 @@ dont-distribute-packages:
|
|||
- apiary-websockets
|
||||
- apis
|
||||
- apotiki
|
||||
- appendful-persistent
|
||||
- approx-rand-test
|
||||
- arbor-monad-metric-datadog
|
||||
- archive-tar-bytestring
|
||||
|
@ -692,10 +684,6 @@ dont-distribute-packages:
|
|||
- audiovisual
|
||||
- aura
|
||||
- authoring
|
||||
- autodocodec-openapi3
|
||||
- autodocodec-schema
|
||||
- autodocodec-swagger2
|
||||
- autodocodec-yaml
|
||||
- automata
|
||||
- autonix-deps-kf5
|
||||
- avers
|
||||
|
@ -878,7 +866,6 @@ dont-distribute-packages:
|
|||
- cabal-query
|
||||
- cabal-test
|
||||
- cabal2arch
|
||||
- cabal2json
|
||||
- cabalmdvrpm
|
||||
- cabalrpmdeps
|
||||
- cabocha
|
||||
|
@ -923,7 +910,6 @@ dont-distribute-packages:
|
|||
- categorical-algebra
|
||||
- category
|
||||
- category-extras
|
||||
- cautious-gen
|
||||
- cctools-workqueue
|
||||
- cef3-simple
|
||||
- ceilometer-common
|
||||
|
@ -1040,7 +1026,6 @@ dont-distribute-packages:
|
|||
- commsec-keyexchange
|
||||
- comonad-random
|
||||
- compact-mutable
|
||||
- compactable
|
||||
- compdata-automata
|
||||
- compdata-dags
|
||||
- compdata-param
|
||||
|
@ -1140,7 +1125,6 @@ dont-distribute-packages:
|
|||
- csv-enumerator
|
||||
- ctpl
|
||||
- cube
|
||||
- cuckoo
|
||||
- curryer-rpc
|
||||
- cursedcsv
|
||||
- cv-combinators
|
||||
|
@ -1387,7 +1371,6 @@ dont-distribute-packages:
|
|||
- eventsource-stub-store
|
||||
- every-bit-counts
|
||||
- exception-monads-fd
|
||||
- exchangerates
|
||||
- exference
|
||||
- exinst-aeson
|
||||
- exinst-bytes
|
||||
|
@ -1445,7 +1428,6 @@ dont-distribute-packages:
|
|||
- feed-translator
|
||||
- feed2lj
|
||||
- feed2twitter
|
||||
- feedback
|
||||
- fei-base
|
||||
- fei-dataiter
|
||||
- fei-datasets
|
||||
|
@ -1474,7 +1456,6 @@ dont-distribute-packages:
|
|||
- fixed-point-vector
|
||||
- fixed-point-vector-space
|
||||
- fixed-precision
|
||||
- fixer
|
||||
- fixhs
|
||||
- flac-picture
|
||||
- flashblast
|
||||
|
@ -1573,17 +1554,7 @@ dont-distribute-packages:
|
|||
- geni-util
|
||||
- geniconvert
|
||||
- geniserver
|
||||
- genvalidity-aeson
|
||||
- genvalidity-appendful
|
||||
- genvalidity-hspec-aeson
|
||||
- genvalidity-mergeful
|
||||
- genvalidity-mergeless
|
||||
- genvalidity-sydtest
|
||||
- genvalidity-sydtest-aeson
|
||||
- genvalidity-sydtest-hashable
|
||||
- genvalidity-sydtest-lens
|
||||
- genvalidity-sydtest-persistent
|
||||
- genvalidity-typed-uuid
|
||||
- geodetic
|
||||
- geolite-csv
|
||||
- getemx
|
||||
|
@ -1598,7 +1569,6 @@ dont-distribute-packages:
|
|||
- ghc-session
|
||||
- ghc-tags-plugin
|
||||
- ghci-pretty
|
||||
- ghcjs-dom-hello
|
||||
- ghcjs-dom-webkit
|
||||
- ghcjs-fetch
|
||||
- ghcjs-hplay
|
||||
|
@ -1964,7 +1934,6 @@ dont-distribute-packages:
|
|||
- hascat-setup
|
||||
- hascat-system
|
||||
- hashable-accelerate
|
||||
- hashes
|
||||
- hashflare
|
||||
- hask-home
|
||||
- haskades
|
||||
|
@ -2207,6 +2176,7 @@ dont-distribute-packages:
|
|||
- hs-ix
|
||||
- hs-opentelemetry-exporter-in-memory
|
||||
- hs-opentelemetry-exporter-otlp
|
||||
- hs-opentelemetry-instrumentation-cloudflare
|
||||
- hs-opentelemetry-instrumentation-conduit
|
||||
- hs-opentelemetry-instrumentation-http-client
|
||||
- hs-opentelemetry-instrumentation-persistent
|
||||
|
@ -2433,7 +2403,6 @@ dont-distribute-packages:
|
|||
- jobqueue
|
||||
- join
|
||||
- jordan-openapi
|
||||
- jsaddle-hello
|
||||
- jsc
|
||||
- jsmw
|
||||
- json-ast-json-encoder
|
||||
|
@ -2703,6 +2672,8 @@ dont-distribute-packages:
|
|||
- majordomo
|
||||
- majority
|
||||
- make-package
|
||||
- managed-functions-http-connector
|
||||
- managed-functions-json
|
||||
- manatee
|
||||
- manatee-all
|
||||
- manatee-anything
|
||||
|
@ -2751,7 +2722,6 @@ dont-distribute-packages:
|
|||
- memis
|
||||
- memory-hexstring
|
||||
- mergeful-persistent
|
||||
- mergeless-persistent
|
||||
- merkle-patricia-db
|
||||
- meta-par-accelerate
|
||||
- metaplug
|
||||
|
@ -2987,7 +2957,6 @@ dont-distribute-packages:
|
|||
- opc-xml-da-client
|
||||
- open-adt-tutorial
|
||||
- openai-hs
|
||||
- openapi3-code-generator
|
||||
- opencv-extra
|
||||
- openpgp-Crypto
|
||||
- openpgp-crypto-api
|
||||
|
@ -3200,7 +3169,6 @@ dont-distribute-packages:
|
|||
- proto3-wire
|
||||
- protobuf-native
|
||||
- protocol-buffers-descriptor-fork
|
||||
- proton
|
||||
- psc-ide
|
||||
- psql
|
||||
- ptera
|
||||
|
@ -3452,9 +3420,6 @@ dont-distribute-packages:
|
|||
- runtime-arbitrary
|
||||
- rv
|
||||
- s-expression
|
||||
- safe-coloured-text-gen
|
||||
- safe-coloured-text-layout
|
||||
- safe-coloured-text-layout-gen
|
||||
- safe-coupling
|
||||
- safe-plugins
|
||||
- safer-file-handles
|
||||
|
@ -3762,7 +3727,6 @@ dont-distribute-packages:
|
|||
- sump
|
||||
- sunroof-examples
|
||||
- sunroof-server
|
||||
- super-user-spark
|
||||
- supercollider-ht
|
||||
- supercollider-midi
|
||||
- superconstraints
|
||||
|
@ -3775,25 +3739,10 @@ dont-distribute-packages:
|
|||
- sweet-egison
|
||||
- switch
|
||||
- syb-with-class-instances-text
|
||||
- sydtest
|
||||
- sydtest-aeson
|
||||
- sydtest-amqp
|
||||
- sydtest-hedgehog
|
||||
- sydtest-hedis
|
||||
- sydtest-hspec
|
||||
- sydtest-mongo
|
||||
- sydtest-persistent
|
||||
- sydtest-persistent-postgresql
|
||||
- sydtest-persistent-sqlite
|
||||
- sydtest-process
|
||||
- sydtest-rabbitmq
|
||||
- sydtest-servant
|
||||
- sydtest-typed-process
|
||||
- sydtest-wai
|
||||
- sydtest-webdriver
|
||||
- sydtest-webdriver-screenshot
|
||||
- sydtest-webdriver-yesod
|
||||
- sydtest-yesod
|
||||
- sylvia
|
||||
- sym-plot
|
||||
- symantic-atom
|
||||
|
@ -3895,7 +3844,6 @@ dont-distribute-packages:
|
|||
- to-string-instances
|
||||
- toboggan
|
||||
- todos
|
||||
- token-limiter-concurrent
|
||||
- toktok
|
||||
- tomlcheck
|
||||
- tonatona
|
||||
|
@ -3977,7 +3925,6 @@ dont-distribute-packages:
|
|||
- typed-admin
|
||||
- typed-encoding-encoding
|
||||
- typed-streams
|
||||
- typed-uuid
|
||||
- typelevel
|
||||
- typelevel-rewrite-rules
|
||||
- typesafe-precure
|
||||
|
|
1014
pkgs/development/haskell-modules/hackage-packages.nix
generated
1014
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
35
pkgs/development/libraries/sokol/default.nix
Normal file
35
pkgs/development/libraries/sokol/default.nix
Normal file
|
@ -0,0 +1,35 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sokol";
|
||||
version = "unstable-2022-06-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "floooh";
|
||||
repo = "sokol";
|
||||
rev = "3c7016105f3b7463f0cfc74df8a55642e5448c11";
|
||||
sha256 = "sha256-dKHb6GTp5aJPuWWXI4ZYnhgdXs23gGWyPymGPGwxcLY=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/include/sokol
|
||||
cp *.h $out/include/sokol/
|
||||
cp -R util $out/include/sokol/util
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimal cross-platform standalone C headers";
|
||||
homepage = "https://github.com/floooh/sokol";
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ jonnybolton ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apycula";
|
||||
version = "0.3.1";
|
||||
version = "0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Apycula";
|
||||
hash = "sha256-RoWZt2Ox0XjJ6vmuCCcNCTMfwZnwJ6fSx71fmipmu2c=";
|
||||
hash = "sha256-+GVXmqoF9r/GPv2S7KP+PTS2WTeubhLBNaA9MXw5lRo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-filter";
|
||||
version = "21.1";
|
||||
version = "22.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YyolH6jxqttLjM7/kyu1L+L4Jt19/n8+rEDlxGPWg24=";
|
||||
sha256 = "sha256-7Uc7duhPfoOyURuyBQw++zbRNSB9ASjf465LNuNZS6U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
{ buildPythonPackage
|
||||
, fetchzip
|
||||
, isPy3k
|
||||
, lib
|
||||
, mkdocs
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-gitlab-plugin";
|
||||
version = "0.1.4";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gitlab.inria.fr/vidjil/mkdocs-gitlab-plugin/-/archive/fb87fbfd404839e661a799c540664b1103096a5f/mkdocs-gitlab-plugin-fb87fbfd404839e661a799c540664b1103096a5f.tar.gz";
|
||||
sha256 = "sha256-z+U0PRwymDDXVNM7a2Yl4pNNVBxpx/BhJnlx6kgyvww=";
|
||||
};
|
||||
|
||||
patches = [ ./mkdocs-gitlab-plugin.diff ];
|
||||
|
||||
propagatedBuildInputs = [ mkdocs ];
|
||||
|
||||
pythonImportsCheck = [ "mkdocs_gitlab_plugin" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MkDocs plugin to transform strings such as #1234, %56, or !789 into links to a Gitlab repository.";
|
||||
homepage = "https://gitlab.inria.fr/vidjil/mkdocs-gitlab-plugin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ snpschaaf ];
|
||||
longDescription = ''
|
||||
Plugin for MkDocs.
|
||||
Transform handles such as #1234, %56, !789, &12 or $34 into links to a gitlab repository,
|
||||
given by the gitlab_url configuration option.
|
||||
Before the #/%/!/&/$ is needed either a space, a '(', or a '['.
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -0,0 +1,37 @@
|
|||
diff --git a/mkdocs_gitlab_plugin/plugin.py b/mkdocs_gitlab_plugin/plugin.py
|
||||
index e8d7ab7..8b883f5 100644
|
||||
--- a/mkdocs_gitlab_plugin/plugin.py
|
||||
+++ b/mkdocs_gitlab_plugin/plugin.py
|
||||
@@ -3,7 +3,7 @@
|
||||
import re
|
||||
import mkdocs
|
||||
|
||||
-from mkdocs.config import Config
|
||||
+from mkdocs.config.config_options import Type
|
||||
from mkdocs.plugins import BasePlugin
|
||||
|
||||
class GitlabLinksPlugin(BasePlugin):
|
||||
@@ -13,8 +13,8 @@ class GitlabLinksPlugin(BasePlugin):
|
||||
'''
|
||||
|
||||
config_scheme = (
|
||||
- ('gitlab_url', mkdocs.config.config_options.Type(str, default='http://gitlab.com/XXX')),
|
||||
- ('verbose', mkdocs.config.config_options.Type(bool, default=False))
|
||||
+ ('gitlab_url', Type(str, default='http://gitlab.com/XXX')),
|
||||
+ ('verbose', Type(bool, default=False))
|
||||
)
|
||||
|
||||
TOKEN_PATHS = {
|
||||
diff --git a/mkdocs_gitlab_plugin/test.py b/mkdocs_gitlab_plugin/test.py
|
||||
index 4a5c35f..d5a19c6 100644
|
||||
--- a/mkdocs_gitlab_plugin/test.py
|
||||
+++ b/mkdocs_gitlab_plugin/test.py
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
import sys
|
||||
|
||||
-from plugin import GitlabLinksPlugin
|
||||
+from .plugin import GitlabLinksPlugin
|
||||
|
||||
if __name__ == '__main__':
|
||||
plugin = GitlabLinksPlugin()
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma-pipeline-windows";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,8 +17,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma-pipeline-windows";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BO6hiPLwEJX0sICqMZfcO4tqljdS+93Z1kG8IWsV9og=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ATDWhHY9tjuQbfIFgoGhz8qsluH9hTSI9zdPmP8GPWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
|
||||
# Build inputs
|
||||
numactl,
|
||||
CoreServices, libobjc,
|
||||
|
||||
# Propagated build inputs
|
||||
numpy, pyyaml, cffi, click, typing-extensions,
|
||||
|
@ -145,7 +146,7 @@ in buildPythonPackage rec {
|
|||
# https://github.com/pytorch/pytorch/issues/70297
|
||||
# https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
|
||||
./breakpad-sigstksz.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
# pthreadpool added support for Grand Central Dispatch in April
|
||||
# 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO)
|
||||
# that is available starting with macOS 10.13. However, our current
|
||||
|
@ -229,7 +230,8 @@ in buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ blas blas.provider pybind11 ]
|
||||
++ lib.optionals cudaSupport [ cudnn magma nccl ]
|
||||
++ lib.optionals stdenv.isLinux [ numactl ];
|
||||
++ lib.optionals stdenv.isLinux [ numactl ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices libobjc ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
|
@ -295,15 +297,6 @@ in buildPythonPackage rec {
|
|||
|
||||
install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libtorch.dylib
|
||||
|
||||
install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_observers.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_observers.dylib
|
||||
|
||||
install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_module_test_dynamic.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_module_test_dynamic.dylib
|
||||
|
||||
install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libcaffe2_detectron_ops.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libcaffe2_detectron_ops.dylib
|
||||
|
||||
install_name_tool -change @rpath/libtorch.dylib $lib/lib/libtorch.dylib $lib/lib/libshm.dylib
|
||||
install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib
|
||||
'';
|
||||
|
@ -319,12 +312,11 @@ in buildPythonPackage rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
# darwin: error: use of undeclared identifier 'noU'; did you mean 'no'?
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
description = "Open source, prototype-to-production deep learning platform";
|
||||
homepage = "https://pytorch.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
|
||||
platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
broken = stdenv.isLinux && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -22,15 +22,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qiskit-finance";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qiskit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wnto3IqrJFAqIv6QAXe3BB9fvXQXe2fw/iUZe3+198M=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-ZmK4nYuv3DBJ0Ah819zGAh7inGVBWDnzJvl0FABJ6KU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.94.0";
|
||||
version = "2.95.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-WASgnF1IwqwiYcNEkHlhbV13rKdTTZgwvLcbBZaBNK8=";
|
||||
hash = "sha256-Rx4PrQqWN6Q19ov9Ao5sAGvdgls+y6WjMxP+35dpKsQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yfinance";
|
||||
version = "0.1.70";
|
||||
version = "0.1.72";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ranaroussi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Anvt+ag0PysGynQv4q+2IrQmCPZViGqWI4dgfLQWGds=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-7dA5+PJhuj/KAZoHMxx34yfyxDeiIf6DhufymfvD8Gg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.32.0";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "conftest";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fPg3376QtbjrUJWZxjRqEFL2cWy1xb7vUX1Lfp5WFmY=";
|
||||
sha256 = "sha256-lmz5ALGvTwPiz0PaGYlL3UTd6tYgO5rpUHXFoLKgS7E=";
|
||||
};
|
||||
vendorSha256 = "sha256-/RfIjCI2RMktUSVEoyJqMwdmlW6lGvXanX7RBxiaTyE=";
|
||||
vendorSha256 = "sha256-Y0S759iPSU7kboa9GxC56QR3caOG9gEmEG44B1Lp3w4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fly";
|
||||
version = "7.8.0";
|
||||
version = "7.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "concourse";
|
||||
repo = "concourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CYQQ44Yx97PvhFHrTzUM2RooNCh5Sdg8SXsV4BOzzPE=";
|
||||
sha256 = "sha256-A37XTLL6BcltKofriqai8RX+VQ4jcFRHriP4sUZ5g2c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aYu5K6pK6Q0Fmagr91i6nc3t55nUjn5vasIO+kUXWrs=";
|
||||
|
|
|
@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "open-policy-agent";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rLfo2SUlxL6QFc2v+nxFnbyYcfy7i3OFhGt6ZAUteHY=";
|
||||
sha256 = "sha256-mvTaVKNE+XSBhJkodKSkLHoxJPOInPCycsoeeEJXABQ=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
@ -147,6 +147,11 @@ installPhase() {
|
|||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$firmware" ]; then
|
||||
# Install the GSP firmware
|
||||
install -Dm644 firmware/gsp.bin $firmware/lib/firmware/nvidia/$version/gsp.bin
|
||||
fi
|
||||
|
||||
# All libs except GUI-only are installed now, so fixup them.
|
||||
for libname in $(find "$out/lib/" $(test -n "$lib32" && echo "$lib32/lib/") $(test -n "$bin" && echo "$bin/lib/") -name '*.so.*')
|
||||
do
|
||||
|
|
|
@ -3,9 +3,7 @@
|
|||
let
|
||||
generic = args: let
|
||||
imported = import ./generic.nix args;
|
||||
in if lib.versionAtLeast args.version "391"
|
||||
&& stdenv.hostPlatform.system != "x86_64-linux" then null
|
||||
else callPackage imported {
|
||||
in callPackage imported {
|
||||
lib32 = (pkgsi686Linux.callPackage imported {
|
||||
libsOnly = true;
|
||||
kernel = null;
|
||||
|
@ -21,6 +19,7 @@ rec {
|
|||
then generic {
|
||||
version = "515.48.07";
|
||||
sha256_64bit = "sha256-4odkzFsTwy52NwUT2ur8BcKJt37gURVSRQ8aAOMa4eM=";
|
||||
openSha256 = "sha256-EGIrdabPr+AhQxXhFb8XXumuPxC+U6XEeIeSYFvA/q4=";
|
||||
settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
|
||||
persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
|
||||
}
|
||||
|
@ -32,6 +31,7 @@ rec {
|
|||
beta = generic {
|
||||
version = "515.43.04";
|
||||
sha256_64bit = "sha256-PodaTTUOSyMW8rtdtabIkSLskgzAymQyfToNlwxPPcc=";
|
||||
openSha256 = "sha256-1bAr5dWZ4jnY3Uo2JaEz/rhw2HuW9LZ5bACmA1VG068=";
|
||||
settingsSha256 = "sha256-j47LtP6FNTPfiXFh9KwXX8vZOQzlytA30ZfW9N5F2PY=";
|
||||
persistencedSha256 = "sha256-hULBy0wnVpLH8I0L6O9/HfgvJURtE2whpXOgN/vb3Wo=";
|
||||
};
|
||||
|
@ -46,6 +46,7 @@ rec {
|
|||
settingsSha256 = "sha256-fq6RlD6g3uylvvTjE4MmaQwxPJYU0u6IMfpPVzks0tI=";
|
||||
persistencedSha256 = "sha256-eHvauvh8Wd+b8DK6B3ZWNjoWGztupWrR8iog9ok58io=";
|
||||
url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
|
||||
broken = kernel.kernelAtLeast "5.17";
|
||||
};
|
||||
|
||||
# Update note:
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, url ? null
|
||||
, sha256_32bit ? null
|
||||
, sha256_64bit
|
||||
, openSha256 ? null
|
||||
, settingsSha256
|
||||
, settingsVersion ? version
|
||||
, persistencedSha256
|
||||
|
@ -27,13 +28,14 @@
|
|||
disable32Bit ? false
|
||||
# 32 bit libs only version of this package
|
||||
, lib32 ? null
|
||||
# Whether to extract the GSP firmware
|
||||
, firmware ? openSha256 != null
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert !libsOnly -> kernel != null;
|
||||
assert versionOlder version "391" -> sha256_32bit != null;
|
||||
assert versionAtLeast version "391" -> stdenv.hostPlatform.system == "x86_64-linux";
|
||||
|
||||
let
|
||||
nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
|
||||
|
@ -72,7 +74,8 @@ let
|
|||
|
||||
outputs = [ "out" ]
|
||||
++ optional i686bundled "lib32"
|
||||
++ optional (!libsOnly) "bin";
|
||||
++ optional (!libsOnly) "bin"
|
||||
++ optional (!libsOnly && firmware) "firmware";
|
||||
outputDev = if libsOnly then null else "bin";
|
||||
|
||||
kernel = if libsOnly then null else kernel.dev;
|
||||
|
@ -100,6 +103,7 @@ let
|
|||
disallowedReferences = optional (!libsOnly) [ kernel.dev ];
|
||||
|
||||
passthru = {
|
||||
open = mapNullable (hash: callPackage (import ./open.nix self hash) { }) openSha256;
|
||||
settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) {
|
||||
withGtk2 = preferGtk2;
|
||||
withGtk3 = !preferGtk2;
|
||||
|
|
37
pkgs/os-specific/linux/nvidia-x11/open.nix
Normal file
37
pkgs/os-specific/linux/nvidia-x11/open.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
nvidia_x11: hash:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, kernel
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "nvidia-open";
|
||||
version = "${kernel.version}-${nvidia_x11.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "open-gpu-kernel-modules";
|
||||
rev = nvidia_x11.version;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
makeFlags = kernel.makeFlags ++ [
|
||||
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
|
||||
];
|
||||
|
||||
installTargets = [ "modules_install" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "NVIDIA Linux Open GPU Kernel Module";
|
||||
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
|
||||
license = with licenses; [ gpl2Plus mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
}
|
|
@ -1,12 +1,16 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, rsync
|
||||
, libxslt
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, dbus
|
||||
, umockdev
|
||||
, libeatmydata
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, udev
|
||||
|
@ -23,7 +27,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "upower";
|
||||
version = "0.99.17";
|
||||
version = "0.99.19";
|
||||
|
||||
outputs = [ "out" "dev" ]
|
||||
++ lib.optionals withDocs [ "devdoc" ];
|
||||
|
@ -33,9 +37,18 @@ stdenv.mkDerivation rec {
|
|||
owner = "upower";
|
||||
repo = "upower";
|
||||
rev = "v${version}";
|
||||
sha256 = "xvvqzGxgkuGcvnO12jnLURNJUoSlnMw2g/mnII+i6Bs=";
|
||||
sha256 = "gpLsBh4jgiDO8bxic2BTFhjIwc2q/tuAIxykTHqK6UM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix test
|
||||
# https://gitlab.freedesktop.org/upower/upower/-/merge_requests/150
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/upower/upower/-/commit/a78ee6039054770b466749f8ec4bfbe4c278d697.patch";
|
||||
sha256 = "aUPXnr/2PlOZNb7mQl43hmKe01DtuBUrGnqvwBFRf7Q=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
|
@ -64,6 +77,16 @@ stdenv.mkDerivation rec {
|
|||
libimobiledevice
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
python3.pkgs.dbus-python
|
||||
python3.pkgs.python-dbusmock
|
||||
python3.pkgs.pygobject3
|
||||
dbus
|
||||
umockdev
|
||||
libeatmydata
|
||||
python3.pkgs.packaging
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
];
|
||||
|
@ -74,16 +97,37 @@ stdenv.mkDerivation rec {
|
|||
"-Dos_backend=linux"
|
||||
"-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d"
|
||||
"-Dudevhwdbdir=${placeholder "out"}/lib/udev/hwdb.d"
|
||||
"-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "auto" else "disabled"}"
|
||||
"-Dgtk-doc=${lib.boolToString withDocs}"
|
||||
];
|
||||
|
||||
doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs src/linux/integration-test.py
|
||||
patchShebangs src/linux/unittest_inspector.py
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Our gobject-introspection patches make the shared library paths absolute
|
||||
# in the GIR files. When running tests, the library is not yet installed,
|
||||
# though, so we need to replace the absolute path with a local one during build.
|
||||
# We are using a symlink that will be overwitten during installation.
|
||||
mkdir -p "$out/lib"
|
||||
ln -s "$PWD/libupower-glib/libupower-glib.so" "$out/lib/libupower-glib.so.3"
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# Slow fsync calls can make self-test fail:
|
||||
# https://gitlab.freedesktop.org/upower/upower/-/issues/195
|
||||
eatmydata meson test --print-errorlogs
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Move stuff from DESTDIR to proper location.
|
||||
# We use rsync to merge the directories.
|
||||
|
|
|
@ -252,8 +252,8 @@ in
|
|||
name = "modsecurity-nginx";
|
||||
owner = "SpiderLabs";
|
||||
repo = "ModSecurity-nginx";
|
||||
rev = "v1.0.2";
|
||||
sha256 = "sha256-UXiitc3jZlgXlCsDPS+xEFLNRVgRbn8BCCXUEqAWlII=";
|
||||
rev = "v1.0.3";
|
||||
sha256 = "sha256-xp0/eqi5PJlzb9NaUbNnzEqNcxDPyjyNwZOwmlv1+ag=";
|
||||
};
|
||||
inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ];
|
||||
disableIPC = true;
|
||||
|
|
|
@ -2,23 +2,23 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "8.5.5";
|
||||
version = "9.0.0";
|
||||
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ];
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-ixqvBwwnkdEb3dFFw+I3XUksf2uMezbwcyyhmLTqh2M=";
|
||||
sha256 = "sha256-vPPaOepx4uwOWOjeE+dWULxmJPk5To9UY3rnoEqeAJA=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "0mqzrzi21qi3m4wm7q18i3n7cg8nwzlc3nw1axgmp7vs1bh5vs0l";
|
||||
sha256 = "0xl5z31mkgbwkwcpvr0v0hmc0ynvxjn39w4sb1vc572kjbwqpvkr";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZL+A6Sz0uHg7ZzYHmA4EU5ZxfRXBLyKglk135iQT600=";
|
||||
vendorSha256 = "sha256-E3uSwdgoPgQPQ/uCIuTxcYeNRYbQR7q7SrUrh/ypENk=";
|
||||
|
||||
nativeBuildInputs = [ wire ];
|
||||
|
||||
|
@ -28,6 +28,9 @@ buildGoModule rec {
|
|||
wire gen -tags oss ./pkg/server
|
||||
wire gen -tags oss ./pkg/cmd/grafana-cli/runner
|
||||
|
||||
go generate ./pkg/framework/coremodel
|
||||
go generate ./public/app/plugins
|
||||
|
||||
# The testcase makes an API call against grafana.com:
|
||||
#
|
||||
# [...]
|
||||
|
|
23
pkgs/tools/misc/iam-policy-json-to-terraform/default.nix
Normal file
23
pkgs/tools/misc/iam-policy-json-to-terraform/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "iam-policy-json-to-terraform";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flosell";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-1OQvm3M/n/8F3QHNfPlq9YQVyV97NlHX3dXWA/VXEZU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Fn5GgGW9QhnQOKV34Kzl1Yctv3XLQ51lCuuGx5kvlIA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document ";
|
||||
homepage = "https://github.com/flosell/iam-policy-json-to-terraform";
|
||||
changelog = "https://github.com/flosell/iam-policy-json-to-terraform/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ivankovnatsky ];
|
||||
};
|
||||
}
|
|
@ -33,7 +33,7 @@ xorg,
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.31.2";
|
||||
version = "1.32.2";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
|
@ -82,7 +82,7 @@ let
|
|||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-ij5lOP3xaty9YjKPionfUhZTcuumlFHt46MUMkjO2yA=";
|
||||
sha256 = "sha256-ceQp4EiLEWy8niGC0uUdWJrvmdt9Ijt29YdLt7vtcyY=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
@ -1,34 +1,35 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook, bison, flex, pkg-config
|
||||
, curl, geoip, libmaxminddb, libxml2, lmdb, lua, pcre
|
||||
, ssdeep, yajl
|
||||
, curl, geoip, libmaxminddb, libxml2, lmdb, lua, pcre, pcre2, ssdeep, yajl
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmodsecurity";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpiderLabs";
|
||||
repo = "ModSecurity";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-V+NBT2YN8qO3Px8zEzSA2ZsjSf1pv8+VlLxYlrpqfGg=";
|
||||
sha256 = "sha256-Xf+wtYg0ZKgP5qo891fCMML/7tgSM/fvBdrmsgJixY4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];
|
||||
buildInputs = [ curl geoip libmaxminddb libxml2 lmdb lua pcre ssdeep yajl ];
|
||||
buildInputs = [ curl geoip libmaxminddb libxml2 lmdb lua pcre pcre2 ssdeep yajl ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-parser-generation"
|
||||
"--disable-doxygen-doc"
|
||||
"--with-curl=${curl.dev}"
|
||||
"--with-libxml=${libxml2.dev}"
|
||||
"--with-lmdb=${lmdb.out}"
|
||||
"--with-maxmind=${libmaxminddb}"
|
||||
"--with-pcre=${pcre.dev}"
|
||||
"--with-pcre2=${pcre2.out}"
|
||||
"--with-ssdeep=${ssdeep}"
|
||||
];
|
||||
|
||||
|
@ -36,6 +37,10 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace build/lmdb.m4 \
|
||||
--replace "\''${path}/include/lmdb.h" "${lmdb.dev}/include/lmdb.h" \
|
||||
--replace "lmdb_inc_path=\"\''${path}/include\"" "lmdb_inc_path=\"${lmdb.dev}/include\""
|
||||
substituteInPlace build/pcre2.m4 \
|
||||
--replace "/usr/local/pcre2" "${pcre2.out}/lib" \
|
||||
--replace "\''${path}/include/pcre2.h" "${pcre2.dev}/include/pcre2.h" \
|
||||
--replace "pcre2_inc_path=\"\''${path}/include\"" "pcre2_inc_path=\"${pcre2.dev}/include\""
|
||||
substituteInPlace build/ssdeep.m4 \
|
||||
--replace "/usr/local/libfuzzy" "${ssdeep}/lib" \
|
||||
--replace "\''${path}/include/fuzzy.h" "${ssdeep}/include/fuzzy.h" \
|
||||
|
|
|
@ -5,22 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nmap-formatter";
|
||||
version = "0.3.0";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vdjagilev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tG91Cutk+RCBPv4Rf8CVnZa5Wh8qgsxEL0C6WIoEdsw=";
|
||||
hash = "sha256-ePhm1qwluHhMC0oS/qEHkZv04nAdh2IDSkIW507MLjo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WXX1b8fPcwIE40w+Kzd7ZuSRXPiYtolRXC/Z8Kc9H2s=";
|
||||
|
||||
postPatch = ''
|
||||
# Fix hard-coded release
|
||||
substituteInPlace cmd/root.go \
|
||||
--replace "0.2.0" "${version}"
|
||||
'';
|
||||
vendorSha256 = "sha256-zkPXjCC+ZdR14O60ZaGFYdEZVxQ5z99HVmLOR10qqfg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool that allows you to convert nmap output";
|
||||
|
|
|
@ -1923,6 +1923,8 @@ with pkgs;
|
|||
|
||||
iamy = callPackage ../tools/admin/iamy { };
|
||||
|
||||
iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { };
|
||||
|
||||
azure-cli = callPackage ../tools/admin/azure-cli { };
|
||||
|
||||
azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { };
|
||||
|
@ -6053,6 +6055,10 @@ with pkgs;
|
|||
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
|
||||
};
|
||||
|
||||
ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
|
||||
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
|
||||
};
|
||||
|
||||
fq = callPackage ../development/tools/fq { };
|
||||
|
||||
franz = callPackage ../applications/networking/instant-messengers/franz {
|
||||
|
@ -20758,6 +20764,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Carbon;
|
||||
};
|
||||
|
||||
sokol = callPackage ../development/libraries/sokol { };
|
||||
|
||||
sonic = callPackage ../development/libraries/sonic { };
|
||||
|
||||
sope = callPackage ../development/libraries/sope { };
|
||||
|
@ -22175,7 +22183,9 @@ with pkgs;
|
|||
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ];
|
||||
};
|
||||
|
||||
libmodsecurity = callPackage ../tools/security/libmodsecurity { };
|
||||
libmodsecurity = callPackage ../tools/security/libmodsecurity {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
ngircd = callPackage ../servers/irc/ngircd { };
|
||||
|
||||
|
|
|
@ -357,6 +357,10 @@ in {
|
|||
nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta;
|
||||
nvidia_x11 = nvidiaPackages.stable;
|
||||
|
||||
# this is not a replacement for nvidia_x11
|
||||
# only the opensource kernel driver exposed for hydra to build
|
||||
nvidia_x11_beta_open = nvidiaPackages.beta.open;
|
||||
|
||||
openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { };
|
||||
|
||||
ply = callPackage ../os-specific/linux/ply { };
|
||||
|
|
|
@ -5439,6 +5439,7 @@ in {
|
|||
mkdocs = callPackage ../development/python-modules/mkdocs { };
|
||||
mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { };
|
||||
mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { };
|
||||
mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { };
|
||||
mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { };
|
||||
mkdocs-material = callPackage ../development/python-modules/mkdocs-material { };
|
||||
mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { };
|
||||
|
@ -8760,6 +8761,8 @@ in {
|
|||
|
||||
pytorch = callPackage ../development/python-modules/pytorch {
|
||||
cudaSupport = pkgs.config.cudaSupport or false;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||
inherit (pkgs.darwin) libobjc;
|
||||
};
|
||||
|
||||
pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { };
|
||||
|
|
Loading…
Reference in a new issue