gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-04-22 12:01:23 +00:00
committed by GitHub
parent fe2b7d6a92 ee1428c654
commit 29280b4a7b
38 changed files with 361 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/csound/csound-qt/default.nix
+4 -4
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, csound, desktop-file-utils,
fetchFromGitHub, python, python-qt, qmake,
fetchFromGitHub, python3, python-qt, qmake,
qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }:
stdenv.mkDerivation rec {
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
"CSOUND_INCLUDE_DIR=${csound}/include/csound"
"CSOUND_LIBRARY_DIR=${csound}/lib"
"RTMIDI_DIR=${rtmidi.src}"
"PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt"
"PYTHONQT_SRC_DIR=${python-qt.src}"
"PYTHONQT_LIB_DIR=${python-qt}/lib"
"LIBS+=-L${python-qt}/lib"
"INCLUDEPATH+=${python-qt}/include/PythonQt"
"INCLUDEPATH+=${python}/include/python${python.pythonVersion}"
"INSTALL_DIR=${placeholder "out"}"
"SHARE_DIR=${placeholder "out"}/share"
"PYTHON_DIR=${python3}"
"PYTHON_VERSION=3.${python3.sourceVersion.minor}"
];
meta = with lib; {
pkgs/applications/audio/reaper/default.nix
+4 -4
View File
@@ -28,13 +28,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "7.14";
version = "7.15";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = if stdenv.isDarwin then "sha256-cPxHriUNIG1EUmvOoW00V2Y0j+7BuxSIEbPy+qy5ZEM=" else {
x86_64-linux = "sha256-RgKteq157r4r088mr9wvPPa/rhmX88/lmVJ7mS17px4=";
aarch64-linux = "sha256-Qnb6ZoDIkfRct6dvqXKeYHgXyyEFLSj9R0hwa2bUiXo=";
hash = if stdenv.isDarwin then "sha256-7tWgbHIkARgsPi0buvbQb4qTqndyPwRRqut1Gj4WNZE=" else {
x86_64-linux = "sha256-O1xh+DKwPKTcQrNhWMX5ErKa1hXq0yeyt/XJMQav11c=";
aarch64-linux = "sha256-rQE8Aa+iFWpA18udCXm4JW8BPTEDeEQAupy353Sbcl8=";
}.${stdenv.hostPlatform.system};
};
pkgs/applications/editors/neovim/wrapper.nix
+5 -1
View File
@@ -83,8 +83,12 @@ let
;
perlEnv = perl.withPackages (p: [ p.NeovimExt p.Appcpanminus ]);
pname = "neovim";
version = lib.getVersion neovim-unwrapped;
in {
name = "neovim-${lib.getVersion neovim-unwrapped}${extraName}";
name = "${pname}-${version}${extraName}";
inherit pname version;
__structuredAttrs = true;
dontUnpack = true;
pkgs/applications/editors/vim/plugins/generated.nix
+12
View File
@@ -689,6 +689,18 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/";
};
arrow-nvim = buildVimPlugin {
pname = "arrow.nvim";
version = "2024-04-19";
src = fetchFromGitHub {
owner = "otavioschwanck";
repo = "arrow.nvim";
rev = "37f32c94cf6e01826af5d96337c70d2f9be0a280";
sha256 = "0v23gw86rmciaqbi27ifd3f5mw0vknm2482yznb30dpq3pk53327";
};
meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/";
};
astrotheme = buildVimPlugin {
pname = "astrotheme";
version = "2024-04-10";
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -56,6 +56,7 @@ https://github.com/pearofducks/ansible-vim/,,
https://github.com/ckarnell/antonys-macro-repeater/,,
https://github.com/solarnz/arcanist.vim/,,
https://github.com/vim-scripts/argtextobj.vim/,,
https://github.com/otavioschwanck/arrow.nvim/,,
https://github.com/AstroNvim/astrotheme/,,
https://github.com/prabirshrestha/async.vim/,,
https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
pkgs/applications/emulators/cemu/default.nix
+2 -2
View File
@@ -46,13 +46,13 @@ let
in stdenv.mkDerivation rec {
pname = "cemu";
version = "2.0-78";
version = "2.0-79";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
hash = "sha256-ivdqO44+8sDgOshUDFc+4eTgzcEDSiPPIawyktYpob4=";
hash = "sha256-vSZLiRzOOJJMgycjI5xpgJcUAj5WCz241mAABgNuECw=";
};
patches = [
pkgs/applications/emulators/retroarch/hashes.json
+36 -36
View File
@@ -85,10 +85,10 @@
"src": {
"owner": "libretro",
"repo": "beetle-psx-libretro",
"rev": "9c9b44a7b9b373f2d8f9a3f16bc8373d6469cf98",
"hash": "sha256-XQ7EVPj0Eprs94yjqaUGCphHteRdbcv2nqp3gojYjzc="
"rev": "ab39d37f868ba8ff3982ce52c4ec22c162888dd7",
"hash": "sha256-Ay3wI9WToSsJNjkNFnHXTt9JUQ6nt+S9jI378E/kK8U="
},
"version": "unstable-2024-04-12"
"version": "unstable-2024-04-19"
},
"beetle-saturn": {
"fetcher": "fetchFromGitHub",
@@ -226,10 +226,10 @@
"src": {
"owner": "libretro",
"repo": "dolphin",
"rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04",
"hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg="
"rev": "89a4df725d4eb24537728f7d655cddb1add25c18",
"hash": "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs="
},
"version": "unstable-2022-12-17"
"version": "unstable-2024-04-19"
},
"dosbox": {
"fetcher": "fetchFromGitHub",
@@ -287,10 +287,10 @@
"src": {
"owner": "libretro",
"repo": "fbneo",
"rev": "97f01ed6075b6034aeb16829a2a259bbe8a254f9",
"hash": "sha256-qXym7CzAXfOSK+hmq6JfCIrq9w11uA2UQ2Ps+lFHrfI="
"rev": "c821b1008e31d40b6d0464f67a3bc0b1a3da4cce",
"hash": "sha256-yZimJ1eH5Oi+6+4eMtXppj75awCrPXMiWhalsR+Bfik="
},
"version": "unstable-2024-04-15"
"version": "unstable-2024-04-20"
},
"fceumm": {
"fetcher": "fetchFromGitHub",
@@ -307,11 +307,11 @@
"src": {
"owner": "flyinghead",
"repo": "flycast",
"rev": "7438094d7cdf191e6eb2a39e73cb0f512ea2a714",
"hash": "sha256-T19GJbN/MKC03Q/yS1C6qL5Rv++OlaBol4UYf9//l3s=",
"rev": "3c38fc1f16cc6518db46a5ad350e8b3738eefb48",
"hash": "sha256-NfJJcu7noefSgFlCFCgovnrb6FSzIXu3MGQHu6TCJWo=",
"fetchSubmodules": true
},
"version": "unstable-2024-04-12"
"version": "unstable-2024-04-19"
},
"fmsx": {
"fetcher": "fetchFromGitHub",
@@ -358,10 +358,10 @@
"src": {
"owner": "libretro",
"repo": "Genesis-Plus-GX",
"rev": "b063aa81b90682ca89ae6fd1e958bc589b4ce34d",
"hash": "sha256-Tz6if6NfbwvZVDb5Ggr/tXuLNymOjcMkghKwZq6tl6I="
"rev": "cbacea723690e88e0b11a4b1d0e5b88b1b7eb9d4",
"hash": "sha256-7qFBzATlhf89ILHsEoF+SWwD4Pwd5+08VnK5xU1EDuI="
},
"version": "unstable-2024-04-05"
"version": "unstable-2024-04-20"
},
"gpsp": {
"fetcher": "fetchFromGitHub",
@@ -438,10 +438,10 @@
"src": {
"owner": "libretro",
"repo": "mame2003-plus-libretro",
"rev": "7ca870c4168e69819923f73ae0289c38d57b01dc",
"hash": "sha256-eoLzRNsZtIo6Pc9SovQGh9sHxdXhBSQj71RDcQqjji0="
"rev": "bb864ca20b40908b8fbc49a350939160d6af29f6",
"hash": "sha256-3AvjOpgBh/p0p9xq4rD8xSKqZWzulw7AKUGQ1o9B2Ck="
},
"version": "unstable-2024-04-13"
"version": "unstable-2024-04-19"
},
"mame2010": {
"fetcher": "fetchFromGitHub",
@@ -630,10 +630,10 @@
"src": {
"owner": "libretro",
"repo": "pcsx_rearmed",
"rev": "2f326fa15ff26df057ef10da232ebc07a410803a",
"hash": "sha256-mnJJ1NzxZoA3kwfPOyvpP65SKI0I/9FCPNW8TR8NY8k="
"rev": "e5cb0939ab32d3c3b90b39e2d49a1652a7cf0db1",
"hash": "sha256-K96w3NGXpsnVAmORPdwwhwIJ6PcvaDOEUtLkF4ftX3s="
},
"version": "unstable-2024-04-14"
"version": "unstable-2024-04-18"
},
"picodrive": {
"fetcher": "fetchFromGitHub",
@@ -651,22 +651,22 @@
"src": {
"owner": "jpd002",
"repo": "Play-",
"rev": "5c8f4a818be5c1e4df568abfec169c2b08df6674",
"hash": "sha256-IyxqH0ZAAiJ8V9kaVSwhf1zJnVlxhJWghr51AXcvQvs=",
"rev": "57f8a1389f7f2987ab2ad99fdc846663994603ad",
"hash": "sha256-MwqLSTDL6C823grCMRYZrwjhIhbVipAR+4vF5k8UhyE=",
"fetchSubmodules": true
},
"version": "unstable-2024-04-10"
"version": "unstable-2024-04-15"
},
"ppsspp": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "hrydgard",
"repo": "ppsspp",
"rev": "efe2302548fcbd2dc68c9b5b1fb39dc7976532fd",
"hash": "sha256-zwC3HniJO11/6ApBo0UNn6WMu4Jmj099XaUY4QuKaZI=",
"rev": "1786a4ddb097f7df1c75b55b4c4b163032614371",
"hash": "sha256-nAyGfgSfcJ4dF5oF3FHy+aqzabf9wUOiP0w+GIY1svg=",
"fetchSubmodules": true
},
"version": "unstable-2024-04-14"
"version": "unstable-2024-04-20"
},
"prboom": {
"fetcher": "fetchFromGitHub",
@@ -693,10 +693,10 @@
"src": {
"owner": "libretro",
"repo": "libretro-uae",
"rev": "3c4f02622bd9ab4bbfc5e90cea9c7e60cf410073",
"hash": "sha256-UMbD1RcgQmilBwwzvakUIWWWwg78sl1YT9EOE3Rhyao="
"rev": "4806716da70cf1f030788b43190d71aae61e2041",
"hash": "sha256-MNqk8ItSC//82HsRfXVYCH+Xd2GV8OA/2heZprx89PY="
},
"version": "unstable-2024-04-12"
"version": "unstable-2024-04-19"
},
"quicknes": {
"fetcher": "fetchFromGitHub",
@@ -753,10 +753,10 @@
"src": {
"owner": "snes9xgit",
"repo": "snes9x",
"rev": "9d22dbb8d866f10042fe564db7dc7b41078a580b",
"hash": "sha256-y2kPj1BugXVZGzyxs0Ph/qM5SMe82kjxnQA25DIpzac="
"rev": "8077396d399424de89d0a6cc15134523965658e0",
"hash": "sha256-p6apk/8bRKSM3H3hGPr/fYGsDFgMv7syVmTHV0zgmOg="
},
"version": "unstable-2024-04-13"
"version": "unstable-2024-04-20"
},
"snes9x2002": {
"fetcher": "fetchFromGitHub",
@@ -813,10 +813,10 @@
"src": {
"owner": "libretro",
"repo": "swanstation",
"rev": "77aeeea58a45cccae7a8be37645f8f5a27ff101b",
"hash": "sha256-z+9Y9hoQ832caip5U+siQXh9GFxLMnX0HcmLa93B/lc="
"rev": "c7fefb5bfdec2569c2528f8daa6e75b7a3de0880",
"hash": "sha256-dE8F/NXGIEMrdmBWUTzanCSlT0ddkwG8RLZFmy1XvzQ="
},
"version": "unstable-2024-01-26"
"version": "unstable-2024-04-18"
},
"tgbdual": {
"fetcher": "fetchFromGitHub",
pkgs/applications/emulators/retroarch/retroarch-assets.nix
+3 -3
View File
@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation {
pname = "retroarch-assets";
version = "unstable-2024-01-02";
version = "unstable-2024-04-18";
src = fetchFromGitHub {
owner = "libretro";
repo = "retroarch-assets";
rev = "923b711dc6772a168d83dc8915e9260730fcf3a1";
hash = "sha256-Hwgga2hCJEdf/j2mU+hLGAsWdYcfuzjCycxSF37I4qk=";
rev = "912f652740986549f41967d615d9da27c325c2b9";
hash = "sha256-HpmRnbj6CQp7+rmZY46MyT8Ga6832COm1it2z9rKUEU=";
};
makeFlags = [
pkgs/applications/misc/terminal-stocks/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "terminal-stocks";
version = "1.0.16";
version = "1.0.17";
src = fetchFromGitHub {
owner = "shweshi";
repo = pname;
rev = "v${version}";
hash = "sha256-tu6SKeTVEqIqDJXimoSkMK9+l0uGqWSrlIO0KHoROSQ=";
hash = "sha256-hCKUUISn/TIr2o3ZtG2kSTgmUCut4NVzIzfIrg84PYI=";
};
npmDepsHash = "sha256-13RiEBLhmKW04Tesg1s7c9rCYtRGOd/prnVARb6jpGQ=";
npmDepsHash = "sha256-t71SfoPYVFLWcrjv2ErWazDeaVTO4W46g4lFler86Sc=";
dontNpmBuild = true;
passthru.updateScript = nix-update-script {};
pkgs/by-name/tr/troubadix/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "troubadix";
version = "24.4.0";
version = "24.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "greenbone";
repo = "troubadix";
rev = "refs/tags/v${version}";
hash = "sha256-I/c26dqD7cJ0AtLhJK4XaR5vvud/NsoeXr6/k6+Dezk=";
hash = "sha256-+JrMUog04SS24ZKiBFB46AyYTDzVu7d4IdoX9SRMhpk=";
};
pythonRelaxDeps = [ "validators" ];
pkgs/by-name/tu/tuifimanager/package.nix
+6 -11
View File
@@ -5,29 +5,24 @@
python3.pkgs.buildPythonApplication rec {
pname = "tuifimanager";
version = "3.3.5";
version = "4.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "GiorgosXou";
repo = "TUIFIManager";
rev = "refs/tags/v.${version}";
hash = "sha256-O4cAHFurgF6QzpeAMoipX2/JywU1drZOTw/Ob9Pa8WQ=";
rev = "v${version}";
hash = "sha256-bv/+x2xppUK9i3HOm93FIQRu1xlB4wCKZzAapkVlrM0=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "Send2Trash == 1.8.0" "Send2Trash >= 1.8.0"
'';
nativeBuildInputs = [
python3.pkgs.setuptools
python3.pkgs.setuptools-scm
];
propagatedBuildInputs = with python3.pkgs; [
send2trash
unicurses
propagatedBuildInputs = [
python3.pkgs.send2trash
python3.pkgs.unicurses
];
pythonImportsCheck = [ "TUIFIManager" ];
pkgs/by-name/wa/waycheck/package.nix
+2 -2
View File
@@ -12,14 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "waycheck";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "serebit";
repo = "waycheck";
rev = "v${finalAttrs.version}";
hash = "sha256-sDfIR+F2W59mh50jXoOrcNZ1nuckm3r7jN613BH4Eog=";
hash = "sha256-82jOYWhgD9JNDn24eCAeMm63R5BTy20lQVpiAwhDIOk=";
};
nativeBuildInputs = [
pkgs/data/icons/whitesur-icon-theme/default.nix
+2 -2
View File
@@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: theme variants" [
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2024.04.08";
version = "2024-04-22";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-Baf0BowyR4P7MDx+LmH6MHlANl+9lXlCaQispN4/i9o=";
hash = "sha256-CnAnD5ky+LNcyE59O/iGeoe+1JyhtPM/XUHwU5d8FA4=";
};
nativeBuildInputs = [ gtk3 jdupes ];
pkgs/development/compilers/ocaml/5.2.nix
+3 -3
View File
@@ -1,9 +1,9 @@
import ./generic.nix {
major_version = "5";
minor_version = "2";
patch_version = "0-beta1";
patch_version = "0-beta2";
src = fetchTarball {
url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta1.tar.xz";
sha256 = "sha256:0prf87a41k2y1znnh2pjkggrvhh5cihj68sxqrjn162889rf7wam";
url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta2.tar.xz";
sha256 = "sha256:1cyw0w79j7kyr3x0ivsqm1si704b29ic33yj621dq7f125jabk00";
};
}
pkgs/development/libraries/libcxxrt/default.nix
+3 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "libcxxrt";
version = "unstable-2024-02-05";
version = "unstable-2024-04-15";
src = fetchFromGitHub {
owner = "libcxxrt";
repo = "libcxxrt";
rev = "bd4fa85d7f772f2ad32146d5681c91612fc93842";
sha256 = "2F6MmLfKyFl7HzdTb1NDBVHMSRVzVhcib93JVaR58Qw=";
rev = "25541e312f7094e9c90895000d435af520d42418";
sha256 = "d5uhtlO+28uc2Xnf5trXsy43jgmzBHs2jZhCK57qRM4=";
};
nativeBuildInputs = [ cmake ];
pkgs/development/libraries/python-qt/default.nix
+34 -22
View File
@@ -1,39 +1,42 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake,
qtwebengine, qtxmlpatterns,
qttools, unzip }:
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
python3,
qmake,
qtwebengine,
qtxmlpatterns,
qttools,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "python-qt";
version = "3.4.2";
version = "3.5.1";
src = fetchFromGitHub {
owner = "MeVisLab";
repo = "pythonqt";
rev = "v${version}";
hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0=";
rev = "v${finalAttrs.version}";
hash = "sha256-IED6UFk8UTle7g/yPC0nXOEgJwrs6sB/Dk3OTyVgHPo=";
};
# https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt
postPatch = ''
substituteInPlace build/python.prf \
--replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}"
'';
nativeBuildInputs = [
qmake
qttools
qtxmlpatterns
qtwebengine
];
hardeningDisable = [ "all" ];
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ];
buildInputs = [ python ];
buildInputs = [ python3 ];
qmakeFlags = [
"PythonQt.pro"
"PYTHON_DIR=${python}"
"PYTHON_DIR=${python3}"
"PYTHON_VERSION=3.${python3.sourceVersion.minor}"
];
dontWrapQtApps = true;
unpackCmd = "unzip $src";
installPhase = ''
mkdir -p $out/include/PythonQt
cp -r ./lib $out
@@ -42,6 +45,15 @@ stdenv.mkDerivation rec {
cp -r ./extensions $out/include/PythonQt
'';
preFixup = lib.optionalString stdenv.isDarwin ''
install_name_tool -id \
$out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \
$out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib
install_name_tool -id \
$out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \
$out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib
'';
meta = with lib; {
description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications";
homepage = "https://pythonqt.sourceforge.net/";
@@ -49,4 +61,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
maintainers = with maintainers; [ hlolli ];
};
}
})
pkgs/development/ocaml-modules/ca-certs-nss/default.nix
+2 -2
View File
@@ -14,13 +14,13 @@
buildDunePackage rec {
pname = "ca-certs-nss";
version = "3.92";
version = "3.98";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz";
hash = "sha256-F6eF5jQO9qJACQldad8va5jXPj05o61L8Bp1SDXHBTg=";
hash = "sha256-N1/cz8e3KB3pBd5+ZV/JbuW6FaaVijNhok7QyMB7ppc=";
};
propagatedBuildInputs = [
pkgs/development/ocaml-modules/janestreet/old.nix
-639
View File
@@ -1,639 +0,0 @@
{ self
, super
, lib
, stdenv
, openssl
}:
let
inherit (super)
janePackage
ocaml
ocamlbuild
cryptokit
ctypes
magic-mime
ocaml-migrate-parsetree
octavius
ounit
ppx_deriving
re
zarith
num
;
in
with self;
{
# Jane Street packages, up to ppx_core
sexplib = janePackage {
pname = "sexplib";
meta.description = "Automated S-expression conversion";
version = "0.10.0";
hash = "1agw649n0rnf6h4y2dr1zs1970nncxgjmf90848vbxv8y9im4yy2";
buildInputs = [ num ];
};
base = janePackage {
pname = "base";
version = "0.9.4";
hash = "0x85xi66b4zwlbdwmyc99zcmawgpp75gxqbl55rr67awavw162rw";
propagatedBuildInputs = [ sexplib ];
meta.description = "Full standard library replacement for OCaml";
};
ocaml-compiler-libs = janePackage {
pname = "ocaml-compiler-libs";
hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l";
meta.description = "OCaml compiler libraries repackaged";
};
ppx_ast = janePackage ({
pname = "ppx_ast";
propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
meta.description = "OCaml AST used by Jane Street ppx rewriters";
} // (if lib.versionAtLeast ocaml.version "4.06"
then {
version = "0.9.2";
hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0";
} else {
version = "0.9.1";
hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw";
}
));
ppx_traverse_builtins = janePackage {
pname = "ppx_traverse_builtins";
hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi";
meta.description = "Builtins for Ppx_traverse";
};
stdio = janePackage {
pname = "stdio";
version = "0.9.1";
hash = "13rj3ii0rvmklfim9ild0ib44ssdadig7a9ccjbz22m0pw84a1sx";
propagatedBuildInputs = [ base ];
meta.description = "Standard IO library for OCaml";
};
ppx_core = janePackage {
pname = "ppx_core";
hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3";
propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ];
meta.description = "Jane Street's standard library for ppx rewriters";
};
# Jane Street packages, up to ppx_base
ppx_optcomp = janePackage {
pname = "ppx_optcomp";
hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd";
propagatedBuildInputs = [ ppx_core ];
meta.description = "Optional compilation for OCaml";
};
ppx_driver = janePackage {
pname = "ppx_driver";
version = "0.9.1";
hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay";
buildInputs = [ ocamlbuild ];
propagatedBuildInputs = [ ppx_optcomp ];
meta.description = "Feature-full driver for OCaml AST transformers";
};
ppx_metaquot = janePackage {
pname = "ppx_metaquot";
hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k";
propagatedBuildInputs = [ ppx_driver ];
meta.description = "Metaquotations for ppx_ast";
};
ppx_type_conv = janePackage {
pname = "ppx_type_conv";
hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p";
propagatedBuildInputs = [ ppx_metaquot ppx_deriving ];
meta.description = "Support Library for type-driven code generators";
};
ppx_sexp_conv = janePackage {
pname = "ppx_sexp_conv";
hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l";
propagatedBuildInputs = [ ppx_type_conv sexplib ];
meta.description = "Generation of S-expression conversion functions from type definitions";
};
ppx_compare = janePackage {
pname = "ppx_compare";
hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9";
propagatedBuildInputs = [ ppx_type_conv ];
meta.description = "Generation of comparison functions from types";
};
ppx_enumerate = janePackage {
pname = "ppx_enumerate";
hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46";
propagatedBuildInputs = [ ppx_type_conv ];
meta.description = "Generate a list containing all values of a finite type";
};
ppx_hash = janePackage {
pname = "ppx_hash";
hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d";
propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
};
ppx_js_style = janePackage {
pname = "ppx_js_style";
hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59";
propagatedBuildInputs = [ ppx_metaquot octavius ];
meta.description = "Code style checker for Jane Street Packages";
};
ppx_base = janePackage {
pname = "ppx_base";
hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3";
propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ];
meta.description = "Base set of ppx rewriters";
};
# Jane Street packages, up to ppx_bin_prot
fieldslib = janePackage {
pname = "fieldslib";
hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501";
propagatedBuildInputs = [ ppx_driver ];
meta.description = "OCaml record fields as first class values";
};
variantslib = janePackage {
pname = "variantslib";
hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz";
propagatedBuildInputs = [ ppx_driver ];
meta.description = "OCaml variants as first class values";
};
ppx_traverse = janePackage {
pname = "ppx_traverse";
hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2";
propagatedBuildInputs = [ ppx_type_conv ];
meta.description = "Automatic generation of open recursion classes";
};
ppx_custom_printf = janePackage {
pname = "ppx_custom_printf";
hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19";
propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ];
meta.description = "Printf-style format-strings for user-defined string conversion";
};
ppx_fields_conv = janePackage {
pname = "ppx_fields_conv";
hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z";
propagatedBuildInputs = [ fieldslib ppx_type_conv ];
meta.description = "Generation of accessor and iteration functions for OCaml records";
};
ppx_variants_conv = janePackage {
pname = "ppx_variants_conv";
hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834";
propagatedBuildInputs = [ ppx_type_conv variantslib ];
meta.description = "Generation of accessor and iteration functions for OCaml variant types";
};
bin_prot = janePackage {
pname = "bin_prot";
version = "0.9.1";
hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk";
propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
meta.description = "Binary protocol generator";
};
ppx_here = janePackage {
pname = "ppx_here";
hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh";
propagatedBuildInputs = [ ppx_driver ];
meta.description = "Expands [%here] into its location";
};
ppx_bin_prot = janePackage {
pname = "ppx_bin_prot";
hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3";
propagatedBuildInputs = [ ppx_here bin_prot ];
meta.description = "Generation of bin_prot readers and writers from types";
};
# Jane Street packages, up to ppx_jane
ppx_assert = janePackage {
pname = "ppx_assert";
hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z";
propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ];
meta.description = "Assert-like extension nodes that raise useful errors on failure";
};
ppx_inline_test = janePackage {
pname = "ppx_inline_test";
version = "0.9.2";
hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa";
propagatedBuildInputs = [ ppx_metaquot ];
meta.description = "Syntax extension for writing in-line tests in OCaml code";
};
typerep = janePackage {
pname = "typerep";
hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3";
propagatedBuildInputs = [ base ];
meta.description = "Runtime types for OCaml";
};
ppx_bench = janePackage {
pname = "ppx_bench";
hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93";
propagatedBuildInputs = [ ppx_inline_test ];
meta.description = "Syntax extension for writing in-line benchmarks in OCaml code";
};
ppx_expect = janePackage {
pname = "ppx_expect";
hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b";
propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ];
meta.description = "Cram like framework for OCaml";
};
ppx_fail = janePackage {
pname = "ppx_fail";
hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32";
propagatedBuildInputs = [ ppx_here ppx_metaquot ];
meta.description = "Add location to calls to failwiths";
};
ppx_let = janePackage {
pname = "ppx_let";
hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr";
propagatedBuildInputs = [ ppx_driver ];
meta.description = "Monadic let-bindings";
};
ppx_optional = janePackage {
pname = "ppx_optional";
hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82";
propagatedBuildInputs = [ ppx_metaquot ];
meta.description = "Pattern matching on flat options";
};
ppx_pipebang = janePackage {
pname = "ppx_pipebang";
hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h";
propagatedBuildInputs = [ ppx_metaquot ];
meta.description = "A ppx rewriter that inlines reverse application operators |> and |!";
};
ppx_sexp_message = janePackage {
pname = "ppx_sexp_message";
hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv";
propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
meta.description = "A ppx rewriter for easy construction of s-expressions";
};
ppx_sexp_value = janePackage {
pname = "ppx_sexp_value";
hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah";
propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values";
};
ppx_typerep_conv = janePackage {
pname = "ppx_typerep_conv";
hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1";
propagatedBuildInputs = [ ppx_type_conv typerep ];
meta.description = "Generation of runtime types from type declarations";
};
ppx_jane = janePackage {
pname = "ppx_jane";
hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc";
propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ];
meta.description = "Standard Jane Street ppx rewriters";
};
# Jane Street packages, up to core
configurator = janePackage {
pname = "configurator";
version = "0.9.1";
hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix";
propagatedBuildInputs = [ ppx_base ];
meta.description = "Helper library for gathering system configuration";
};
jane-street-headers = janePackage {
pname = "jane-street-headers";
hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy";
meta.description = "Jane Street header files";
};
core_kernel = janePackage {
pname = "core_kernel";
hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh";
propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ];
meta.description = "Jane Street's standard library overlay (kernel)";
};
spawn = janePackage {
pname = "spawn";
hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5";
meta.description = "Spawning sub-processes";
};
core = janePackage {
pname = "core";
version = "0.9.1";
hash = "1643r0namsgj8xwfr9niimcdwyyq4ddiwd02d73ipb4a8710aqi8";
propagatedBuildInputs = [ core_kernel spawn ];
meta.description = "Jane Street's standard library overlay";
};
# Jane Street packages, up to core_extended
re2 = janePackage {
pname = "re2";
hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi";
propagatedBuildInputs = [ core_kernel ];
meta = {
description = "OCaml bindings for RE2";
broken = stdenv.isDarwin;
};
};
textutils = janePackage {
pname = "textutils";
hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d";
propagatedBuildInputs = [ core ];
meta.description = "Text output utilities";
};
core_extended = janePackage {
pname = "core_extended";
hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk";
propagatedBuildInputs = [ core re2 textutils ];
postPatch = ''
patchShebangs src/discover.sh
'';
meta = {
description = "Jane Street Capital's standard library overlay";
};
};
# Jane Street async packages
async_kernel = janePackage {
pname = "async_kernel";
hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Jane Street Capital's asynchronous execution library (core)";
};
async_rpc_kernel = janePackage {
pname = "async_rpc_kernel";
hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b";
propagatedBuildInputs = [ core_kernel async_kernel ];
meta.description = "Platform-independent core of Async RPC library";
};
async_unix = janePackage {
pname = "async_unix";
hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d";
propagatedBuildInputs = [ core async_kernel ];
meta.description = "Jane Street Capital's asynchronous execution library (unix)";
};
async_extra = janePackage {
pname = "async_extra";
hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0";
propagatedBuildInputs = [ async_rpc_kernel async_unix ];
meta.description = "Jane Street's asynchronous execution library (extra)";
};
async = janePackage {
pname = "async";
hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1";
propagatedBuildInputs = [ async_extra ];
meta.description = "Jane Street Capital's asynchronous execution library";
};
async_find = janePackage {
pname = "async_find";
hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq";
propagatedBuildInputs = [ async ];
meta.description = "Directory traversal with Async";
};
async_interactive = janePackage {
pname = "async_interactive";
hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j";
propagatedBuildInputs = [ async ];
meta.description = "Utilities for building simple command-line based user interfaces";
};
async_parallel = janePackage {
pname = "async_parallel";
hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn";
propagatedBuildInputs = [ async ];
meta.description = "Distributed computing library";
};
async_shell = janePackage {
pname = "async_shell";
hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2";
propagatedBuildInputs = [ core_extended async ];
meta = {
description = "Shell helpers for Async";
};
};
async_ssl = janePackage {
pname = "async_ssl";
hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss";
propagatedBuildInputs = [ async ctypes openssl ];
meta.description = "Async wrappers for SSL";
};
# Jane Street packages, up to expect_test_helpers
sexp_pretty = janePackage {
pname = "sexp_pretty";
hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx";
propagatedBuildInputs = [ ppx_base re ];
meta.description = "S-expression pretty-printer";
};
expect_test_helpers_kernel = janePackage {
pname = "expect_test_helpers_kernel";
hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6";
propagatedBuildInputs = [ core_kernel sexp_pretty ];
meta.description = "Helpers for writing expectation tests";
};
expect_test_helpers = janePackage {
pname = "expect_test_helpers";
hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2";
propagatedBuildInputs = [ async expect_test_helpers_kernel ];
meta.description = "Async helpers for writing expectation tests";
};
# Miscellaneous Jane Street packages
bignum = janePackage {
pname = "bignum";
hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3";
propagatedBuildInputs = [ core_kernel zarith ];
meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
};
cinaps = janePackage {
pname = "cinaps";
hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5";
propagatedBuildInputs = [ re ];
meta.description = "Trivial Metaprogramming tool using the OCaml toplevel";
};
command_rpc = janePackage {
pname = "command_rpc";
hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824";
propagatedBuildInputs = [ async ];
meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout";
};
core_bench = janePackage {
pname = "core_bench";
hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h";
propagatedBuildInputs = [ core_extended ];
meta = {
description = "Micro-benchmarking library for OCaml";
};
};
core_profiler = janePackage {
pname = "core_profiler";
hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44";
propagatedBuildInputs = [ core_extended ];
meta = {
description = "Profiling library";
};
};
csvfields = janePackage {
pname = "csvfields";
hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v";
propagatedBuildInputs = [ core ];
meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
};
ecaml = janePackage {
pname = "ecaml";
hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i";
propagatedBuildInputs = [ async ];
meta.description = "Writing Emacs plugin in OCaml";
};
email_message = janePackage {
pname = "email_message";
hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz";
propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ];
meta = {
description = "E-mail message parser";
};
};
incremental_kernel = janePackage {
pname = "incremental_kernel";
hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Library for incremental computations depending only on core_kernel";
};
incremental = janePackage {
pname = "incremental";
hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh";
propagatedBuildInputs = [ core incremental_kernel ];
meta.description = "Library for incremental computations";
};
incr_map = janePackage {
pname = "incr_map";
hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv";
propagatedBuildInputs = [ incremental_kernel ];
meta.description = "Helpers for incremental operations on map like data structures";
};
ocaml_plugin = janePackage {
pname = "ocaml_plugin";
hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14";
buildInputs = [ ocamlbuild ];
propagatedBuildInputs = [ async ];
meta.description = "Automatically build and dynlink ocaml source files";
};
parsexp = janePackage {
pname = "parsexp";
hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b";
propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ];
meta.description = "S-expression parsing library";
};
parsexp_io = janePackage {
pname = "parsexp_io";
hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5";
propagatedBuildInputs = [ parsexp ];
meta.description = "S-expression parsing library (IO functions)";
};
patience_diff = janePackage {
pname = "patience_diff";
hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Tool and library implementing patience diff";
};
posixat = janePackage {
pname = "posixat";
hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl";
propagatedBuildInputs = [ ppx_sexp_conv ];
meta.description = "Binding to the posix *at functions";
meta.broken = lib.versionAtLeast ocaml.version "4.05";
};
rpc_parallel = janePackage {
pname = "rpc_parallel";
hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38";
propagatedBuildInputs = [ async ];
meta.description = "Type-safe library for building parallel applications";
};
shexp = janePackage {
pname = "shexp";
hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y";
propagatedBuildInputs = [ posixat spawn ];
meta.description = "Process library and s-expression based shell";
};
topological_sort = janePackage {
pname = "topological_sort";
hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Topological sort algorithm";
};
typerep_extended = janePackage {
pname = "typerep_extended";
hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Runtime types for OCaml (Extended)";
};
}
pkgs/development/ocaml-modules/letsencrypt/default.nix
+2 -2
View File
@@ -21,11 +21,11 @@
buildDunePackage rec {
pname = "letsencrypt";
version = "0.5.0";
version = "0.5.1";
src = fetchurl {
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz";
hash = "sha256-XGroZiNyP0ItOMrXK07nrVqT4Yz9RKXYvZuRkDp089M=";
hash = "sha256-uQOHpdyPg5kms+negxpQMxfhow6auZ0ipt5ksoXYo1w=";
};
minimalOCamlVersion = "4.08";
pkgs/development/python-modules/airtouch5py/default.nix
+53
View File
@@ -0,0 +1,53 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
# build-system
poetry-core,
pythonRelaxDepsHook,
# dependencies
bitarray,
crc,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "airtouch5py";
version = "0.2.8";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "danzel";
repo = "airtouch5py";
rev = "refs/tags/${version}";
hash = "sha256-MpwppyAWDiA3CZXCIUQ/vidzcxKXZJSlrFRhmrPMgCE=";
};
build-system = [ poetry-core ];
nativeBuildInputs = [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "crc" ];
dependencies = [
bitarray
crc
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "airtouch5py" ];
meta = with lib; {
changelog = "https://github.com/danzel/airtouch5py/releases/tag/${version}";
description = "Python client for the airtouch 5";
homepage = "https://github.com/danzel/airtouch5py";
license = licenses.asl20;
maintainers = with maintainers; [ jamiemagee ];
};
}
pkgs/development/python-modules/aranet4/default.nix
+14 -19
View File
@@ -1,11 +1,12 @@
{ lib
, bleak
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, requests
, setuptools
{
lib,
bleak,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
requests,
setuptools,
}:
buildPythonPackage rec {
@@ -22,22 +23,16 @@ buildPythonPackage rec {
hash = "sha256-j53d2Ki9xVWGHWkAu1wkjYE56Xq7kfMmqQrQiKrBg2I=";
};
nativeBuildInputs = [
setuptools
];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
bleak
requests
];
nativeCheckInputs = [
pytestCheckHook
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [
"aranet4"
];
pythonImportsCheck = [ "aranet4" ];
disabledTests = [
# Test compares rendered output
@@ -46,9 +41,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module to interact with Aranet4 devices";
mainProgram = "aranetctl";
homepage = "https://github.com/Anrijs/Aranet4-Python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
mainProgram = "aranetctl";
};
}
pkgs/development/python-modules/ducc0/default.nix
+19 -6
View File
@@ -1,9 +1,19 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitLab, pythonOlder, pytestCheckHook, pybind11, numpy }:
{
stdenv,
lib,
buildPythonPackage,
fetchFromGitLab,
numpy,
pybind11,
pytestCheckHook,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "ducc0";
version = "0.33.0";
format = "setuptools";
version = "0.34.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -11,14 +21,17 @@ buildPythonPackage rec {
domain = "gitlab.mpcdf.mpg.de";
owner = "mtr";
repo = "ducc";
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
hash = "sha256-MezcqQRitBkK4/1rRQM2c9w+iZb2kIsDdcNd6I8CPoI=";
rev = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-lxNqB3Lt+n4vIH7cVW4DAwhjuPn49y+/3RLKVO8IuJM=";
};
buildInputs = [ pybind11 ];
propagatedBuildInputs = [ numpy ];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
setuptools
];
pytestFlagsArray = [ "python/test" ];
pythonImportsCheck = [ "ducc0" ];
pkgs/development/python-modules/influxdb-client/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "influxdb-client";
version = "1.41.0";
version = "1.42.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "refs/tags/v${version}";
hash = "sha256-wrgbc8sMISJvXxefGl2PBsJ3d308BXVH7wYIeaFmdZ8=";
hash = "sha256-PY0GpwO1OG4DKutMR3MF9HtTJbLFRCWypeoqVoiRD4o=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/jedi-language-server/default.nix
+7
View File
@@ -11,6 +11,7 @@
, pytestCheckHook
, python-lsp-jsonrpc
, pythonOlder
, stdenv
}:
buildPythonPackage rec {
@@ -49,6 +50,12 @@ buildPythonPackage rec {
HOME="$(mktemp -d)"
'';
disabledTests = lib.optionals stdenv.isDarwin [
# https://github.com/pappasam/jedi-language-server/issues/313
"test_publish_diagnostics_on_change"
"test_publish_diagnostics_on_save"
];
pythonImportsCheck = [
"jedi_language_server"
];
pkgs/development/python-modules/pipdeptree/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pipdeptree";
version = "2.16.2";
version = "2.18.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "tox-dev";
repo = "pipdeptree";
rev = "refs/tags/${version}";
hash = "sha256-g0O0ndHd2ehBUmHwb0HoWgCGSsqbjmlPFOd6KrkUv2Y=";
hash = "sha256-fzxshqh2QurpbilG0gC3NWnUntTRoxOHPpfpg6bPI98=";
};
build-system = [
pkgs/development/python-modules/pyfritzhome/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyfritzhome";
version = "0.6.10";
version = "0.6.11";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "hthiery";
repo = "python-fritzhome";
rev = "refs/tags/${version}";
hash = "sha256-jdv49cpd2ewfrhWzjWM5Uxhaj3UZfOXMMOZeobpXe0E=";
hash = "sha256-YzrRkFa4J3NXdc4W5CHrHvqSVJ8yBGtaf6gRqmiY7gI=";
};
nativeBuildInputs = [
pkgs/kde/frameworks/extra-cmake-modules/default.nix
+10 -2
View File
@@ -1,8 +1,16 @@
{mkKdeDerivation}:
{ mkKdeDerivation
, python3
}:
mkKdeDerivation {
pname = "extra-cmake-modules";
outputs = ["out"];
outputs = [ "out" ];
# Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
# See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
propagatedNativeBuildInputs = [
python3
];
setupHook = ./ecm-hook.sh;
}
pkgs/kde/frameworks/solid/default.nix
+12 -2
View File
@@ -1,5 +1,6 @@
{
mkKdeDerivation,
fetchpatch,
qttools,
bison,
flex,
@@ -8,8 +9,17 @@
mkKdeDerivation {
pname = "solid";
# Also search /run/wrappers for mount/umount
patches = [./fix-search-path.patch];
patches = [
# Also search /run/wrappers for mount/umount
./fix-search-path.patch
# Backport fix for mounting removable LUKS devices
# FIXME: remove in 6.2
(fetchpatch {
url = "https://invent.kde.org/frameworks/solid/-/commit/a3b18591ba144fae0cd0cfc087a45c64000d4e51.patch";
hash = "sha256-e7+amjOShUSzPb0pAxnAuuh/fbK/YLESqR0co1bs+wg=";
})
];
extraNativeBuildInputs = [qttools bison flex];
extraBuildInputs = [libimobiledevice];
pkgs/os-specific/linux/busybox/default.nix
+1 -1
View File
@@ -167,6 +167,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = with maintainers; [ TethysSvensson qyliss ];
platforms = platforms.linux;
priority = 10;
priority = 15; # below systemd (halt, init, poweroff, reboot) and coreutils
};
}
pkgs/servers/home-assistant/component-packages.nix
+2 -1
View File
@@ -97,7 +97,8 @@
airtouch4pyapi
];
"airtouch5" = ps: with ps; [
]; # missing inputs: airtouch5py
airtouch5py
];
"airvisual" = ps: with ps; [
pyairvisual
];
pkgs/servers/monitoring/prometheus/redis-exporter.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "redis_exporter";
version = "1.58.0";
version = "1.59.0";
src = fetchFromGitHub {
owner = "oliver006";
repo = "redis_exporter";
rev = "v${version}";
sha256 = "sha256-tZ09vQBFUWw2l6OYwT/bXhBEMOTSl5r/Hu732msPGkg=";
sha256 = "sha256-/nfAB4h5VvAzuludQ7Zx3OoJThyyD5nS6B5pOSbQYFs=";
};
vendorHash = "sha256-32EjLEPeFsihdG83ru4SSf03F2XJGD8+tbO9ANaI1hs=";
vendorHash = "sha256-Nns8hpKwxL1GQfjVt9+rnmjGjmdm2TB+8wob7ze4RrI=";
ldflags = [
"-X main.BuildVersion=${version}"
pkgs/tools/graphics/asymptote/default.nix
+58 -24
View File
@@ -4,29 +4,26 @@
, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
, python3, qtbase, qtsvg, boost
, zlib, perl, curl
, texliveSmall, texinfo
, texinfo
, texlive
, texliveSmall
, darwin
}:
stdenv.mkDerivation rec {
version = "2.88";
stdenv.mkDerivation (finalAttrs: {
version = "2.89";
pname = "asymptote";
outputs = [ "out" "man" "info" "doc" "tex" ];
src = fetchurl {
url = "mirror://sourceforge/asymptote/${version}/asymptote-${version}.src.tgz";
hash = "sha256-DecadD+m7pORuH3Sdcs/5M3vUbN6rhSkFoNN0Soq9bs=";
url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
hash = "sha256-9k5itO5PhfGnhkDE8eim+Y6R9U7ayrGXJ8fKvpSlf1s=";
};
patches = [
(fetchpatch {
# partial fix for macOS XDR/V3D support (LDFLAGS change seems like an unrelated bugfix)
name = "restore-LDFLAGS-dont-look-for-tirpc-under-MacOS.patch";
url = "https://github.com/vectorgraphics/asymptote/commit/7e17096b22d18d133d1bc5916b6e32c0cb24ad10.patch";
hash = "sha256-olCFzqfZwWOAjqlB5lDPXYRHU9i3VQNgoR0cO5TmW98=";
})
];
# override with TeX Live containers to avoid building sty, docs from source
texContainer = null;
texdocContainer = null;
nativeBuildInputs = [
autoreconfHook
@@ -37,13 +34,13 @@ stdenv.mkDerivation rec {
wrapQtAppsHook
cmake
pkg-config
];
] ++ lib.optional (finalAttrs.texContainer == null || finalAttrs.texdocContainer == null)
(texliveSmall.withPackages (ps: with ps; [ epsf cm-super ps.texinfo media9 ocgx2 collection-latexextra ]));
buildInputs = [
ghostscriptX imagemagick fftw eigen
boehmgc ncurses readline gsl libsigsegv
zlib perl curl qtbase qtsvg boost
(texliveSmall.withPackages (ps: with ps; [ epsf cm-super ps.texinfo media9 ocgx2 collection-latexextra ]))
(python3.withPackages (ps: with ps; [ cson numpy pyqt5 ]))
] ++ lib.optionals stdenv.isLinux [ libtirpc ];
@@ -57,12 +54,25 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
# Do not build $tex/ls-R which will be generated by texlive.combine
# do not build $tex/ls-R which will be generated by texlive.withPackages
# do not build and install sty and docs, if provided by tex/texdoc texlive containers
# (this is an optimisation to make texliveMedium and texliveFull independent of texliveSmall)
preConfigure = ''
HOME=$TMP
substituteInPlace Makefile.in \
--replace-fail 'install: install-notexhash install-texhash' 'install: install-notexhash install-asy'
prependToVar configureFlags "--with-latex=$tex/tex/latex" "--with-context=$tex/tex/context/third"
--replace-fail ' install-texhash' '''
if [[ -n $texContainer ]] ; then
sed -i Makefile.in -e '/(\(latex\|context\)dir)/d'
substituteInPlace Makefile.in \
--replace-fail 'asy sty' 'asy'
else
prependToVar configureFlags "--with-latex=$tex/tex/latex" "--with-context=$tex/tex/context/third"
fi
if [[ -n $texdocContainer ]] ; then
substituteInPlace Makefile.in \
--replace-fail ' install-man' ''' \
--replace-fail 'docdir = $(DESTDIR)@docdir@' 'docdir = $(TMP)/doc'
fi
'';
# do not use bundled libgc.so
@@ -76,12 +86,36 @@ stdenv.mkDerivation rec {
rm "$out"/bin/xasy
makeQtWrapper "$out"/share/asymptote/GUI/xasy.py "$out"/bin/xasy --prefix PATH : "$out"/bin
mv "$info"/share/info/asymptote/*.info "$info"/share/info/
sed -i -e 's|(asymptote/asymptote)|(asymptote)|' "$info"/share/info/asymptote.info
rmdir "$info"/share/info/asymptote
rm -f "$info"/share/info/dir
if [[ -z $texdocContainer ]] ; then
mv "$info"/share/info/asymptote/*.info "$info"/share/info/
sed -i -e 's|(asymptote/asymptote)|(asymptote)|' "$info"/share/info/asymptote.info
rmdir "$info"/share/info/asymptote
rm -f "$info"/share/info/dir
fi
install -Dt $out/share/emacs/site-lisp/${finalAttrs.pname} $out/share/asymptote/*.el
'';
install -Dt $out/share/emacs/site-lisp/${pname} $out/share/asymptote/*.el
# fixupPhase crashes if the outputs are not directories
preFixup = ''
if [[ -n $texContainer ]] ; then
mkdir -p "$tex"
fi
if [[ -n $texdocContainer ]] ; then
mkdir -p "$doc" "$man" "$info"
fi
'';
postFixup = ''
if [[ -n $texContainer ]] ; then
rmdir "$tex"
ln -s "$texContainer" "$tex"
fi
if [[ -n $texdocContainer ]] ; then
mkdir -p "$man/share" "$info/share"
ln -s "$texdocContainer" "$doc/share"
ln -s "$texdocContainer/doc/man" "$man/share"
ln -s "$texdocContainer/doc/info" "$info/share"
fi
'';
dontUseCmakeConfigure = true;
@@ -98,4 +132,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.raskin ];
platforms = platforms.linux ++ platforms.darwin;
};
}
})
pkgs/tools/security/exploitdb/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2024-04-20";
version = "2024-04-22";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
rev = "refs/tags/${version}";
hash = "sha256-mz82w3maizWnaWcBqMFYgCNN9uwhSgo9D4j+XCvZDW0=";
hash = "sha256-lWWAZwoUFA54uy0qo4H5+MgSv7tYJOerU9X3Or+AhSg=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/tools/system/gdu/default.nix
+17 -17
View File
@@ -1,28 +1,27 @@
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, installShellFiles
, testers
, gdu
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
testers,
gdu,
}:
buildGoModule rec {
pname = "gdu";
version = "5.27.0";
version = "5.28.0";
src = fetchFromGitHub {
owner = "dundee";
repo = "gdu";
rev = "refs/tags/v${version}";
hash = "sha256-hQyvYLegGimYTRz0J/2tmaC6N4LfjB1ivWgN29DwNhA=";
hash = "sha256-HfWJVO62UeKE513fq1PaXyaldmrnQ/Fh5bXWSa0xGls=";
};
vendorHash = "sha256-weNcJjofI7Aoy0Eya0KprXHAn7aTA0rQJYrJ4+t65hI=";
vendorHash = "sha256-SlVJDb24txy7DPsL0cG7LeGUjngXaUQ1SusgBfgf4PE=";
nativeBuildInputs = [
installShellFiles
];
nativeBuildInputs = [ installShellFiles ];
ldflags = [
"-s"
@@ -41,9 +40,7 @@ buildGoModule rec {
doCheck = !stdenv.isDarwin;
passthru.tests.version = testers.testVersion {
package = gdu;
};
passthru.tests.version = testers.testVersion { package = gdu; };
meta = with lib; {
description = "Disk usage analyzer with console interface";
@@ -55,7 +52,10 @@ buildGoModule rec {
homepage = "https://github.com/dundee/gdu";
changelog = "https://github.com/dundee/gdu/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab zowoq ];
maintainers = with maintainers; [
fab
zowoq
];
mainProgram = "gdu";
};
}
pkgs/tools/typesetting/tex/texlive/bin.nix
+27 -6
View File
@@ -8,7 +8,7 @@
, makeWrapper, shortenPerlShebang, useFixedHashes, asymptote
, biber-ms
, tlpdb
}:
}@args:
# Useful resource covering build options:
# http://tug.org/texlive/doc/tlbuild.html
@@ -420,7 +420,28 @@ pygmentex = python3Packages.buildPythonApplication rec {
};
};
inherit asymptote;
asymptote = args.asymptote.overrideAttrs (finalAttrs: prevAttrs: {
version = texlive.pkgs.asymptote.version;
# keep local src and patches even if duplicated in the top level asymptote
# so that top level updates do not break texlive
src = fetchurl {
url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
hash = "sha256-DecadD+m7pORuH3Sdcs/5M3vUbN6rhSkFoNN0Soq9bs=";
};
texContainer = texlive.pkgs.asymptote.tex;
texdocContainer = texlive.pkgs.asymptote.texdoc;
patches = [
(fetchpatch {
# partial fix for macOS XDR/V3D support (LDFLAGS change seems like an unrelated bugfix)
name = "restore-LDFLAGS-dont-look-for-tirpc-under-MacOS.patch";
url = "https://github.com/vectorgraphics/asymptote/commit/7e17096b22d18d133d1bc5916b6e32c0cb24ad10.patch";
hash = "sha256-olCFzqfZwWOAjqlB5lDPXYRHU9i3VQNgoR0cO5TmW98=";
})
];
});
inherit biber;
inherit biber-ms;
@@ -499,23 +520,23 @@ xindy = stdenv.mkDerivation {
postPatch = ''
substituteInPlace xindy-*/user-commands/xindy.in \
--replace-fail "our \$clisp = ( \$is_windows ? 'clisp.exe' : 'clisp' ) ;" \
"our \$clisp = '$(type -P clisp)';"
"our \$clisp = '$(type -P clisp)';" \
--replace-fail 'die "$cmd: Cannot locate xindy modules directory";' \
'$modules_dir = "${texlive.pkgs.xindy.tex}/xindy/modules"; die "$cmd: Cannot locate xindy modules directory" unless -d $modules_dir;'
'';
nativeBuildInputs = [
pkg-config perl
(texlive.combine { inherit (texlive) scheme-basic cyrillic ec; })
];
buildInputs = [ clisp libiconv perl ];
configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" ];
configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" "--disable-xindy-rules" ];
preInstall = ''mkdir -p "$out/bin" '';
# fixup various file-location errors of: lib/xindy/{xindy.mem,modules/}
postInstall = ''
mkdir -p "$out/lib/xindy"
mv "$out"/{bin/xindy.mem,lib/xindy/}
ln -s ../../share/texmf-dist/xindy/modules "$out/lib/xindy/"
'';
};
pkgs/top-level/all-packages.nix
+2 -13
View File
@@ -24071,16 +24071,7 @@ with pkgs;
pylode = callPackage ../misc/pylode { };
python-qt = (callPackage ../development/libraries/python-qt {
python = python3;
inherit (builtins.mapAttrs (_: pkg: pkg.override (previousArgs: lib.optionalAttrs (previousArgs ? stdenv) { stdenv = gcc12Stdenv; })) qt5)
qmake qttools qtwebengine qtxmlpatterns;
stdenv = gcc12Stdenv;
})
.overrideAttrs(previousAttrs: {
NIX_CFLAGS_COMPILE = "-w";
meta = previousAttrs.meta // { broken = true; };
});
python-qt = libsForQt5.callPackage ../development/libraries/python-qt { };
pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { };
@@ -30344,9 +30335,7 @@ with pkgs;
csound-manual = callPackage ../applications/audio/csound/csound-manual { };
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
python = python3;
};
csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
codeblocks = callPackage ../applications/editors/codeblocks { };
codeblocksFull = codeblocks.override { contribPlugins = true; };
pkgs/top-level/ocaml-packages.nix
-10
View File
@@ -830,16 +830,6 @@ let
ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { };
})).overrideScope liftJaneStreet;
janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
self = self.janeStreet_0_9_0;
super = self // {
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {
defaultVersion = "0.9.0";
};
};
inherit (pkgs) stdenv lib openssl;
};
javalib = callPackage ../development/ocaml-modules/javalib { };
jingoo = callPackage ../development/ocaml-modules/jingoo { };
pkgs/top-level/python-packages.nix
+2
View File
@@ -467,6 +467,8 @@ self: super: with self; {
airtouch4pyapi = callPackage ../development/python-modules/airtouch4pyapi { };
airtouch5py = callPackage ../development/python-modules/airtouch5py { };
ajpy = callPackage ../development/python-modules/ajpy { };
ajsonrpc = callPackage ../development/python-modules/ajsonrpc { };