Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
b2a9a8a7be
1
.gitattributes
vendored
1
.gitattributes
vendored
|
|
@ -1,5 +1,6 @@
|
|||
**/deps.nix linguist-generated
|
||||
**/deps.json linguist-generated
|
||||
**/deps.toml lingust-generated
|
||||
**/node-packages.nix linguist-generated
|
||||
|
||||
pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
|
||||
|
|
|
|||
|
|
@ -8187,6 +8187,12 @@
|
|||
github = "konradmalik";
|
||||
githubId = 13033392;
|
||||
};
|
||||
konst-aa = {
|
||||
email = "konstantin.astafurov@gmail.com";
|
||||
github = "konst-aa";
|
||||
githubId = 40547702;
|
||||
name = "Konstantin Astafurov";
|
||||
};
|
||||
koozz = {
|
||||
email = "koozz@linux.com";
|
||||
github = "koozz";
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra
|
|||
# Git can only handle a single index operation at a time
|
||||
async with merge_lock:
|
||||
await check_subprocess('git', 'add', *change['files'], cwd=worktree)
|
||||
commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change)
|
||||
commit_message = '{attrPath}: {oldVersion} -> {newVersion}'.format(**change)
|
||||
if 'commitMessage' in change:
|
||||
commit_message = change['commitMessage']
|
||||
elif 'commitBody' in change:
|
||||
|
|
|
|||
|
|
@ -294,6 +294,9 @@ with lib.maintainers; {
|
|||
zowoq
|
||||
qbit
|
||||
];
|
||||
githubTeams = [
|
||||
"golang"
|
||||
];
|
||||
scope = "Maintain Golang compilers.";
|
||||
shortName = "Go";
|
||||
enableFeatureFreezePing = true;
|
||||
|
|
@ -723,6 +726,9 @@ with lib.maintainers; {
|
|||
winter
|
||||
zowoq
|
||||
];
|
||||
githubTeams = [
|
||||
"rust"
|
||||
];
|
||||
scope = "Maintain the Rust compiler toolchain and nixpkgs integration.";
|
||||
shortName = "Rust";
|
||||
enableFeatureFreezePing = true;
|
||||
|
|
|
|||
|
|
@ -132,6 +132,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall.
|
||||
|
||||
- The option `i18n.inputMethod.fcitx5.enableRimeData` has been removed. Default RIME data is now included in `fcitx5-rime` by default, and can be customized using `fcitx5-rime.override { rimeDataPkgs = [ pkgs.rime-data, package2, ... ]; }`
|
||||
|
||||
- Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead.
|
||||
|
||||
- `tut` has been updated from 1.0.34 to 2.0.0, and now uses the TOML format for the configuration file instead of INI. Additional information can be found [here](https://github.com/RasmusLindroth/tut/releases/tag/2.0.0).
|
||||
|
|
|
|||
|
|
@ -5,10 +5,9 @@ with lib;
|
|||
let
|
||||
im = config.i18n.inputMethod;
|
||||
cfg = im.fcitx5;
|
||||
addons = cfg.addons ++ optional cfg.enableRimeData pkgs.rime-data;
|
||||
fcitx5Package = pkgs.fcitx5-with-addons.override { inherit addons; };
|
||||
whetherRimeDataDir = any (p: p.pname == "fcitx5-rime") cfg.addons;
|
||||
in {
|
||||
fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
|
||||
in
|
||||
{
|
||||
options = {
|
||||
i18n.inputMethod.fcitx5 = {
|
||||
addons = mkOption {
|
||||
|
|
@ -19,30 +18,23 @@ in {
|
|||
Enabled Fcitx5 addons.
|
||||
'';
|
||||
};
|
||||
|
||||
enableRimeData = mkEnableOption (lib.mdDoc "default rime-data with fcitx5-rime");
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx5" "enableRimeData" ] ''
|
||||
RIME data is now included in `fcitx5-rime` by default, and can be customized using `fcitx5-rime.override { rimeDataPkgs = ...; }`
|
||||
'')
|
||||
];
|
||||
|
||||
config = mkIf (im.enabled == "fcitx5") {
|
||||
i18n.inputMethod.package = fcitx5Package;
|
||||
|
||||
environment = mkMerge [{
|
||||
variables = {
|
||||
GTK_IM_MODULE = "fcitx";
|
||||
QT_IM_MODULE = "fcitx";
|
||||
XMODIFIERS = "@im=fcitx";
|
||||
QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
|
||||
};
|
||||
}
|
||||
(mkIf whetherRimeDataDir {
|
||||
pathsToLink = [
|
||||
"/share/rime-data"
|
||||
];
|
||||
|
||||
variables = {
|
||||
NIX_RIME_DATA_DIR = "/run/current-system/sw/share/rime-data";
|
||||
};
|
||||
})];
|
||||
environment.variables = {
|
||||
GTK_IM_MODULE = "fcitx";
|
||||
QT_IM_MODULE = "fcitx";
|
||||
XMODIFIERS = "@im=fcitx";
|
||||
QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -159,6 +159,15 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
options.relay_api.database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:relayapi.db";
|
||||
description = lib.mdDoc ''
|
||||
Database for the Relay Server.
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.media_api = {
|
||||
database = {
|
||||
connection_string = lib.mkOption {
|
||||
|
|
@ -294,7 +303,7 @@ in
|
|||
-o /run/dendrite/dendrite.yaml
|
||||
''];
|
||||
ExecStart = lib.strings.concatStringsSep " " ([
|
||||
"${pkgs.dendrite}/bin/dendrite-monolith-server"
|
||||
"${pkgs.dendrite}/bin/dendrite"
|
||||
"--config /run/dendrite/dendrite.yaml"
|
||||
] ++ lib.optionals (cfg.httpPort != null) [
|
||||
"--http-bind-address :${builtins.toString cfg.httpPort}"
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1cwxb6713hlgbrp4yhaky18r05ykb2ljxkldpj3hlgiz8x9l3n8r";
|
||||
x86_64-darwin = "14j7jsy7ldgkjpfb6acyv86nqfg6mip27rq0d9zfg26n4m0qm3s9";
|
||||
aarch64-linux = "080qqc9bacgs655sz32vdczdlkylycgzf5l584il9xyn7bp8xyk1";
|
||||
aarch64-darwin = "0ifzwjalwskxm4phf9c4v6sfyxhdh63vzdippcwh0r7fx0gcj6g8";
|
||||
armv7l-linux = "1gchynk0i05jkan47773fdlkbppwvdim73qwpcxbl0ck2giy7q9z";
|
||||
x86_64-linux = "1dz0fppcbb1cbrq7lp72fdm53ss85bp7i9y5yk3l0yzlmb737syv";
|
||||
x86_64-darwin = "1m7j4fnlcjjfpx551svh67sj45zln798dsjc1b4hlwcn6qh65kfk";
|
||||
aarch64-linux = "0ym6l1zkqwwj7jx2k1765094krq6cw562hyvliv1cy6079xkahiy";
|
||||
aarch64-darwin = "14zq18s68nh8jq542kjn0pf92s7ld5x2p220z71xg3mywmlsgjqf";
|
||||
armv7l-linux = "05h96x5nngli7zv2yh8a2yp8z5d8mqq1a6427sdpg3aybyj7ij2d";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
|
|
@ -29,7 +29,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.76.2.23074";
|
||||
version = "1.77.0.23093";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@ assert svgSupport -> enableCairo;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fuzzel";
|
||||
version = "1.8.2";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "fuzzel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5uXf5HfQ8bDQSMNCHHaC9sCX5P/D89T2ZOUiXTDx3bQ=";
|
||||
hash = "sha256-Va/Rm35jqxDlIfQdrpZ41qrW8YzWmm1LWra76AW1xUw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ttdl";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VladimirMarkelov";
|
||||
repo = "ttdl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4XmOFoj2kynQZzos/vf0rciJCGfnFLN7f1MG9NU53os=";
|
||||
sha256 = "sha256-Bhi1d01VqeLmxsiyIG8HXD6AgabgsKgZoKYgnGNpk/8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9TyEHAlxTNx/ildlqEjuFIKfmUQQFQSVoxcrb2Tg9Ps=";
|
||||
cargoHash = "sha256-A/5DS7b7Dgj+GlCPu6fx0t14BfMm4XjkpcDjSpeDSnE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI tool to manage todo lists in todo.txt format";
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@
|
|||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, vala
|
||||
, wrapGAppsHook4
|
||||
, evolution-data-server-gtk4
|
||||
, glib
|
||||
, glib-networking
|
||||
, gnutls
|
||||
, gst_all_1
|
||||
, json-glib
|
||||
|
|
@ -20,14 +22,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "valent";
|
||||
version = "unstable-2023-03-02";
|
||||
version = "unstable-2023-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andyholmes";
|
||||
repo = "valent";
|
||||
rev = "4b60f28f46bc948c5f3b30189bb9b5fbe29d2745";
|
||||
rev = "bb9fc25a58eeb81abea2bb651accc9538a3a82fd";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ltf/srQLqtqE71sxEh7VTQqXy2wOpTSdGDsjITOt3f8=";
|
||||
sha256 = "sha256-3pEPE96gFjDGesFs/EZswuv6D3JQEpnAnlCw0IWYkR0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,12 +37,14 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
vala
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server-gtk4
|
||||
glib
|
||||
glib-networking
|
||||
gnutls
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinny-desktop";
|
||||
version = "2.2.4";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb";
|
||||
sha256 = "sha256-ibUXNGgc23ndTqQKD0np5EH1T3xipVAmETbIy7akqkg=";
|
||||
sha256 = "sha256-Bh7qBlHh2bQ6y2HnI4TtxMU6N3t04tr1Juoul2KMrqs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Yet another matrix client for desktop";
|
||||
homepage = "https://github.com/cinnyapp/cinny-desktop";
|
||||
maintainers = [ maintainers.aveltras ];
|
||||
license = licenses.mit;
|
||||
license = licenses.agpl3Only;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "cinny";
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
let
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "23.2.4";
|
||||
version = "23.4.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname appname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-ZliVhnO9fK/6k4Ga86ZSmhzQ3YKziAab19oZs9Pteic=";
|
||||
sha256 = "sha256-8gSy7WL0wpLAXxVo3oOA9X12qd/R7P3MgmlwXxpJSUs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ args@{
|
|||
, bazelBuildFlags ? []
|
||||
, bazelTestFlags ? []
|
||||
, bazelFetchFlags ? []
|
||||
, bazelTarget
|
||||
, bazelTargets
|
||||
, bazelTestTargets ? []
|
||||
, buildAttrs
|
||||
, fetchAttrs
|
||||
|
|
@ -69,11 +69,11 @@ let
|
|||
'';
|
||||
in
|
||||
stdenv.mkDerivation (fBuildAttrs // {
|
||||
inherit name bazelFlags bazelBuildFlags bazelTestFlags bazelFetchFlags bazelTarget bazelTestTargets;
|
||||
inherit name bazelFlags bazelBuildFlags bazelTestFlags bazelFetchFlags bazelTargets bazelTestTargets;
|
||||
|
||||
deps = stdenv.mkDerivation (fFetchAttrs // {
|
||||
name = "${name}-deps.tar.gz";
|
||||
inherit bazelFlags bazelBuildFlags bazelTestFlags bazelFetchFlags bazelTarget bazelTestTargets;
|
||||
inherit bazelFlags bazelBuildFlags bazelTestFlags bazelFetchFlags bazelTargets bazelTestTargets;
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ fFetchAttrs.impureEnvVars or [];
|
||||
|
||||
|
|
@ -94,21 +94,18 @@ stdenv.mkDerivation (fBuildAttrs // {
|
|||
buildPhase = fFetchAttrs.buildPhase or ''
|
||||
runHook preBuild
|
||||
|
||||
# See footnote called [USER and BAZEL_USE_CPP_ONLY_TOOLCHAIN variables].
|
||||
# We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads:
|
||||
# https://github.com/bazelbuild/bazel/issues/6502
|
||||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
|
||||
USER=homeless-shelter \
|
||||
bazel \
|
||||
--batch \
|
||||
--output_base="$bazelOut" \
|
||||
--output_user_root="$bazelUserRoot" \
|
||||
${if fetchConfigured then "build --nobuild" else "fetch"} \
|
||||
--loading_phase_threads=1 \
|
||||
$bazelFlags \
|
||||
$bazelFetchFlags \
|
||||
${bazelTarget} \
|
||||
${lib.strings.concatStringsSep " " bazelTestTargets}
|
||||
${
|
||||
bazelCmd {
|
||||
cmd = if fetchConfigured then "build --nobuild" else "fetch";
|
||||
additionalFlags = [
|
||||
# We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads:
|
||||
# https://github.com/bazelbuild/bazel/issues/6502
|
||||
"--loading_phase_threads=1"
|
||||
"$bazelFetchFlags"
|
||||
];
|
||||
targets = bazelTargets ++ bazelTestTargets;
|
||||
}
|
||||
}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
@ -232,7 +229,7 @@ stdenv.mkDerivation (fBuildAttrs // {
|
|||
bazelCmd {
|
||||
cmd = "build";
|
||||
additionalFlags = bazelBuildFlags;
|
||||
targets = [bazelTarget];
|
||||
targets = bazelTargets;
|
||||
}
|
||||
}
|
||||
runHook postBuild
|
||||
|
|
|
|||
25
pkgs/data/fonts/linja-sike/default.nix
Normal file
25
pkgs/data/fonts/linja-sike/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
pname = "linja-sike";
|
||||
version = "5.0";
|
||||
|
||||
url = "https://wyub.github.io/tokipona/linja-sike-5.otf";
|
||||
|
||||
downloadToTemp = true;
|
||||
recursiveHash = true;
|
||||
postFetch = ''
|
||||
install -D $downloadedFile $out/share/fonts/opentype/linja-sike.otf
|
||||
'';
|
||||
|
||||
sha256 = "sha256-LkjG1Oao/LqKwI+eRZPzShTh7lz5DkooltXm7vxZC9w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extensive sitelen pona font by lipamanka";
|
||||
homepage = "https://docs.google.com/document/d/1d8kUIAVlB-JNgK3LWr_zVCuUOZTh2hF7CfC6xQgxsBs/edit?usp=sharing";
|
||||
downloadPage = "https://wyub.github.io/tokipona/linjasike";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ somasis ];
|
||||
};
|
||||
}
|
||||
|
|
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://call-cc.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ corngood ];
|
||||
maintainers = with lib.maintainers; [ corngood nagy konst-aa ];
|
||||
platforms = lib.platforms.unix;
|
||||
description = "A portable compiler for the Scheme programming language";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
{ lib, newScope } :
|
||||
{ lib, newScope, fetchurl }:
|
||||
let
|
||||
callPackage = newScope self;
|
||||
|
||||
self = {
|
||||
self = with lib; {
|
||||
pkgs = self;
|
||||
|
||||
fetchegg = callPackage ./fetchegg { };
|
||||
fetchegg = { pname, version, sha256, ... }:
|
||||
fetchurl {
|
||||
inherit sha256;
|
||||
url =
|
||||
"https://code.call-cc.org/egg-tarballs/5/${pname}/${pname}-${version}.tar.gz";
|
||||
};
|
||||
|
||||
eggDerivation = callPackage ./eggDerivation.nix { };
|
||||
|
||||
|
|
@ -13,7 +18,21 @@ let
|
|||
bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; };
|
||||
};
|
||||
|
||||
chickenEggs = lib.recurseIntoAttrs (callPackage ./eggs.nix { });
|
||||
chickenEggs = recurseIntoAttrs (mapAttrs (pname:
|
||||
eggData@{ version, synopsis, dependencies, license, ... }:
|
||||
self.eggDerivation {
|
||||
name = "${pname}-${version}";
|
||||
src = self.fetchegg (eggData // { inherit pname; });
|
||||
buildInputs = map (x: self.chickenEggs.${x}) dependencies;
|
||||
meta.homepage =
|
||||
"https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}";
|
||||
meta.description = synopsis;
|
||||
meta.license = (licenses // {
|
||||
"bsd-2-clause" = licenses.bsd2;
|
||||
"bsd-3-clause" = licenses.bsd3;
|
||||
"public-domain" = licenses.publicDomain;
|
||||
}).${license} or license;
|
||||
}) (importTOML ./deps.toml));
|
||||
|
||||
egg2nix = callPackage ./egg2nix.nix { };
|
||||
};
|
||||
|
|
|
|||
3879
pkgs/development/compilers/chicken/5/deps.toml
Normal file
3879
pkgs/development/compilers/chicken/5/deps.toml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,551 +0,0 @@
|
|||
{ pkgs, stdenv }:
|
||||
rec {
|
||||
inherit (pkgs) eggDerivation fetchegg;
|
||||
|
||||
address-info = eggDerivation {
|
||||
name = "address-info-1.0.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "address-info";
|
||||
version = "1.0.5";
|
||||
sha256 = "1nv87ghfv8szmi2l0rybrgrds6fs5w6jxafqslnzw0mw5sfj6jyk";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
];
|
||||
};
|
||||
|
||||
apropos = eggDerivation {
|
||||
name = "apropos-3.6.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "apropos";
|
||||
version = "3.6.0";
|
||||
sha256 = "0jq5d4zijbf5dw2vsfn89smp7zjpgp82y5hs10xkysf831x7l551";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
srfi-13
|
||||
check-errors
|
||||
string-utils
|
||||
symbol-utils
|
||||
];
|
||||
};
|
||||
|
||||
args = eggDerivation {
|
||||
name = "args-1.6.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "args";
|
||||
version = "1.6.0";
|
||||
sha256 = "1y9sznh4kxqxvhd8k44bjx0s7xspp52sx4bn8i8i0f8lwch6r2g4";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-37
|
||||
];
|
||||
};
|
||||
|
||||
base64 = eggDerivation {
|
||||
name = "base64-1.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "base64";
|
||||
version = "1.0";
|
||||
sha256 = "01lid9wxf94nr7gmskamxlfngack1hyxig8rl9swwgnbmz9qgysi";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-13
|
||||
];
|
||||
};
|
||||
|
||||
check-errors = eggDerivation {
|
||||
name = "check-errors-3.2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "check-errors";
|
||||
version = "3.2.0";
|
||||
sha256 = "0d0hpq1nmwyvbg162bqzgk62f70rin0pxsr5a3pgx6xin5i3ngah";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
defstruct = eggDerivation {
|
||||
name = "defstruct-2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "defstruct";
|
||||
version = "2.0";
|
||||
sha256 = "0q1v1gdwqlpmwcsa4jnqldfqky9k7kvb83qgkhdyqym52bm5aln8";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
];
|
||||
};
|
||||
|
||||
feature-test = eggDerivation {
|
||||
name = "feature-test-0.2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "feature-test";
|
||||
version = "0.2.0";
|
||||
sha256 = "1dxdisv64d8alg6r45cwxf5gmdpcvql1hvlq808lgwphd7kvfpgr";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
foreigners = eggDerivation {
|
||||
name = "foreigners-1.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "foreigners";
|
||||
version = "1.5";
|
||||
sha256 = "1mm91y61nlawgb7iqdrkz2fi9sc3fic07f5m1ig541b2hbscfiqy";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
matchable
|
||||
];
|
||||
};
|
||||
|
||||
intarweb = eggDerivation {
|
||||
name = "intarweb-2.0.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "intarweb";
|
||||
version = "2.0.1";
|
||||
sha256 = "0md226jikqhj993cw17588ipmnz0v7l34zrvylamyrs6zbvj3scm";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-14
|
||||
defstruct
|
||||
uri-common
|
||||
base64
|
||||
];
|
||||
};
|
||||
|
||||
iset = eggDerivation {
|
||||
name = "iset-2.2";
|
||||
|
||||
src = fetchegg {
|
||||
name = "iset";
|
||||
version = "2.2";
|
||||
sha256 = "0yfkcd07cw6xnnqfbbvjy81x0vc54k40vdjp2m7gwxx64is6m3rz";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
json = eggDerivation {
|
||||
name = "json-1.6";
|
||||
|
||||
src = fetchegg {
|
||||
name = "json";
|
||||
version = "1.6";
|
||||
sha256 = "0sb8285dqrm27c8zaqfzc0gixvfmvf0cq2nbza8c4z7j5snxzs2w";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
packrat
|
||||
srfi-1
|
||||
srfi-69
|
||||
];
|
||||
};
|
||||
|
||||
matchable = eggDerivation {
|
||||
name = "matchable-1.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "matchable";
|
||||
version = "1.1";
|
||||
sha256 = "084hm5dvbvgnpb32ispkp3hjili8z02hamln860r99jx68jx6j2v";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
r7rs = eggDerivation {
|
||||
name = "r7rs-1.0.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "r7rs";
|
||||
version = "1.0.5";
|
||||
sha256 = "0zyi1z4m1995hm2wfc5wpi8jjgxcwk03qknq5v2ygff3akxazsf6";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
matchable
|
||||
srfi-1
|
||||
srfi-13
|
||||
];
|
||||
};
|
||||
|
||||
memory-mapped-files = eggDerivation {
|
||||
name = "memory-mapped-files-0.4";
|
||||
|
||||
src = fetchegg {
|
||||
name = "memory-mapped-files";
|
||||
version = "0.4";
|
||||
sha256 = "0by3r18bj9fs0bs9w5czx84vssmr58br3x7pz1m3myb4mns3mpsc";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
message-digest-primitive = eggDerivation {
|
||||
name = "message-digest-primitive-4.3.2";
|
||||
|
||||
src = fetchegg {
|
||||
name = "message-digest-primitive";
|
||||
version = "4.3.2";
|
||||
sha256 = "1wfmyyp1fv0sz70m0rgzbhkiqgzjc15ppz7fwmpnxg12rvfzdvq0";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
check-errors
|
||||
];
|
||||
};
|
||||
|
||||
miscmacros = eggDerivation {
|
||||
name = "miscmacros-1.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "miscmacros";
|
||||
version = "1.0";
|
||||
sha256 = "0n2ia4ib4f18hcbkm5byph07ncyx61pcpfp2qr5zijf8ykp8nbvr";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
packrat = eggDerivation {
|
||||
name = "packrat-1.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "packrat";
|
||||
version = "1.5";
|
||||
sha256 = "0hfnh57a8yga3byrk8522al5wdj7dyz48lixvvcgnsn3vdy333hq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
];
|
||||
};
|
||||
|
||||
regex = eggDerivation {
|
||||
name = "regex-2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "regex";
|
||||
version = "2.0";
|
||||
sha256 = "0qgqrrdr95yqggw8xyvb693nhizwqvf1fp9cjx9p3z80c4ih8j4j";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
sendfile = eggDerivation {
|
||||
name = "sendfile-1.8.3";
|
||||
|
||||
src = fetchegg {
|
||||
name = "sendfile";
|
||||
version = "1.8.3";
|
||||
sha256 = "0acmydjxlrbq7bdspmrzv9q9l3gh4xxnbpi5g1d5mz1g2mjwgm63";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
memory-mapped-files
|
||||
];
|
||||
};
|
||||
|
||||
sha2 = eggDerivation {
|
||||
name = "sha2-4.0.5";
|
||||
|
||||
src = fetchegg {
|
||||
name = "sha2";
|
||||
version = "4.0.5";
|
||||
sha256 = "020yc41gkpg2s48v5n1nnq02dii340yly2y1zsi71bbfbkai2vcs";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
message-digest-primitive
|
||||
];
|
||||
};
|
||||
|
||||
socket = eggDerivation {
|
||||
name = "socket-0.3.3";
|
||||
|
||||
src = fetchegg {
|
||||
name = "socket";
|
||||
version = "0.3.3";
|
||||
sha256 = "04wfxrwjizvf1jdpfqp3r7381rp9lscrm3z21ihq2dc2lfzjgrxw";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-13
|
||||
srfi-18
|
||||
foreigners
|
||||
feature-test
|
||||
];
|
||||
};
|
||||
|
||||
spiffy = eggDerivation {
|
||||
name = "spiffy-6.3";
|
||||
|
||||
src = fetchegg {
|
||||
name = "spiffy";
|
||||
version = "6.3";
|
||||
sha256 = "0f22gfdyysgbm3q6cjibn1z1yavks3imxi1mxcyfmms3x91k5k3c";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
intarweb
|
||||
uri-common
|
||||
uri-generic
|
||||
sendfile
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-14
|
||||
srfi-18
|
||||
];
|
||||
};
|
||||
|
||||
srfi-1 = eggDerivation {
|
||||
name = "srfi-1-0.5.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-1";
|
||||
version = "0.5.1";
|
||||
sha256 = "15x0ajdkw5gb3vgs8flzh5g0pzl3wmcpf11iimlm67mw6fxc8p7j";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
srfi-13 = eggDerivation {
|
||||
name = "srfi-13-0.3.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-13";
|
||||
version = "0.3.1";
|
||||
sha256 = "12ryxs3w3las0wjdh0yp52g1xmyq1fb48xi3i26l5a9sfx7gbilp";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-14
|
||||
];
|
||||
};
|
||||
|
||||
srfi-14 = eggDerivation {
|
||||
name = "srfi-14-0.2.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-14";
|
||||
version = "0.2.1";
|
||||
sha256 = "0gc33cx4xll9vsf7fm8jvn3gc0604kn3bbi6jfn6xscqp86kqb9p";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
srfi-145 = eggDerivation {
|
||||
name = "srfi-145-0.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-145";
|
||||
version = "0.1";
|
||||
sha256 = "1r4278xhpmm8gww64j6akpyv3qjnn14b6nsisyb9qm7yx3pkpim9";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
srfi-189 = eggDerivation {
|
||||
name = "srfi-189-0.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-189";
|
||||
version = "0.1";
|
||||
sha256 = "1nmrywpi9adi5mm1vcbxxsgw0j3v6m7s4j1mii7icj83xn81cgvx";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
r7rs
|
||||
srfi-1
|
||||
srfi-145
|
||||
];
|
||||
};
|
||||
|
||||
srfi-18 = eggDerivation {
|
||||
name = "srfi-18-0.1.6";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-18";
|
||||
version = "0.1.6";
|
||||
sha256 = "00lykm5lqbrcxl3dab9dqwimpgm36v4ys2957k3vdlg4xdb1abfa";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
srfi-37 = eggDerivation {
|
||||
name = "srfi-37-1.4";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-37";
|
||||
version = "1.4";
|
||||
sha256 = "17f593497n70gldkj6iab6ilgryiqar051v6azn1szhnm1lk7dwd";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
srfi-69 = eggDerivation {
|
||||
name = "srfi-69-0.4.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "srfi-69";
|
||||
version = "0.4.1";
|
||||
sha256 = "1l102kppncz27acsr4jyi46q0r7g2lb6gdbkd6p3h1xmvwcnk2hl";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
];
|
||||
};
|
||||
|
||||
string-utils = eggDerivation {
|
||||
name = "string-utils-2.4.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "string-utils";
|
||||
version = "2.4.0";
|
||||
sha256 = "09m3s0p199r2nmvc8qnqvbxjbq967gvwqrzp236wsw3hdcil6p8v";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-69
|
||||
miscmacros
|
||||
check-errors
|
||||
utf8
|
||||
];
|
||||
};
|
||||
|
||||
symbol-utils = eggDerivation {
|
||||
name = "symbol-utils-2.1.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "symbol-utils";
|
||||
version = "2.1.0";
|
||||
sha256 = "17nq8bj18f3bbf3mdfx1m8agy97izn1xcl8ymvgvvd5g384b2xil";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
check-errors
|
||||
];
|
||||
};
|
||||
|
||||
tcp6 = eggDerivation {
|
||||
name = "tcp6-0.2.1";
|
||||
|
||||
src = fetchegg {
|
||||
name = "tcp6";
|
||||
version = "0.2.1";
|
||||
sha256 = "14dynnjgac28f46v781hi6kam326q6rh57pf0pvl0chdva4hlf3q";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
socket
|
||||
srfi-1
|
||||
];
|
||||
};
|
||||
|
||||
uri-common = eggDerivation {
|
||||
name = "uri-common-2.0";
|
||||
|
||||
src = fetchegg {
|
||||
name = "uri-common";
|
||||
version = "2.0";
|
||||
sha256 = "07rq7ppkyk3i85vqspc048pnj6gmjhj236z00chslli9xybqkgrd";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
uri-generic
|
||||
defstruct
|
||||
matchable
|
||||
srfi-1
|
||||
srfi-13
|
||||
srfi-14
|
||||
];
|
||||
};
|
||||
|
||||
uri-generic = eggDerivation {
|
||||
name = "uri-generic-3.2";
|
||||
|
||||
src = fetchegg {
|
||||
name = "uri-generic";
|
||||
version = "3.2";
|
||||
sha256 = "1lpvnk1mnhmrga149km7ygpy7fkq7z2pvw0mvpx2aql03l8gpdsj";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
matchable
|
||||
srfi-1
|
||||
srfi-14
|
||||
];
|
||||
};
|
||||
|
||||
utf8 = eggDerivation {
|
||||
name = "utf8-3.6.2";
|
||||
|
||||
src = fetchegg {
|
||||
name = "utf8";
|
||||
version = "3.6.2";
|
||||
sha256 = "10wzp3qmwik4gx3hhaqm2n83wza0rllgy57363h5ccv8fga5nnm6";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
srfi-69
|
||||
iset
|
||||
regex
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
;; Eggs used by egg2nix
|
||||
args
|
||||
matchable
|
||||
apropos
|
||||
spiffy
|
||||
json
|
||||
tcp6
|
||||
sha2
|
||||
|
||||
;; other eggs to include in nixpkgs
|
||||
srfi-189
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
if [ -e .attrs.sh ]; then source .attrs.sh; fi
|
||||
source $stdenv/setup
|
||||
|
||||
echo "exporting egg ${eggName} (version $version) into $out"
|
||||
|
||||
mkdir -p $out
|
||||
CHICKEN_EGG_CACHE=. chicken-install -r "${eggName}:${version}"
|
||||
rm ${eggName}/{STATUS,TIMESTAMP}
|
||||
cp -r ${eggName}/* $out/
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
# Fetches a chicken egg from henrietta using `chicken-install -r'
|
||||
# See: http://wiki.call-cc.org/chicken-projects/egg-index-5.html
|
||||
|
||||
{ lib, stdenvNoCC, chicken }:
|
||||
{ name, version, md5 ? "", sha256 ? "" }:
|
||||
|
||||
if md5 != "" then
|
||||
throw "fetchegg does not support md5 anymore, please use sha256"
|
||||
else
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "chicken-${name}-export";
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = [ chicken ];
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = sha256;
|
||||
|
||||
inherit version;
|
||||
|
||||
eggName = name;
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
}
|
||||
|
||||
40
pkgs/development/compilers/chicken/5/read-egg.scm
Executable file
40
pkgs/development/compilers/chicken/5/read-egg.scm
Executable file
|
|
@ -0,0 +1,40 @@
|
|||
(import (chicken process-context)
|
||||
(chicken format)
|
||||
(chicken string))
|
||||
|
||||
(define env-var get-environment-variable)
|
||||
(define ref alist-ref)
|
||||
|
||||
(define egg (read))
|
||||
|
||||
(printf "[~A]\n" (env-var "EGG_NAME"))
|
||||
|
||||
(define dependencies
|
||||
(map (lambda (dep)
|
||||
(->string (if (list? dep)
|
||||
(car dep)
|
||||
dep)))
|
||||
(ref 'dependencies egg eqv? '())))
|
||||
(printf "dependencies = [~A]\n"
|
||||
(string-intersperse (map (lambda (dep) (sprintf "~S" dep))
|
||||
dependencies)
|
||||
", "))
|
||||
|
||||
(define license (ref 'license egg))
|
||||
(printf "license = ~S\n"
|
||||
(if (not license)
|
||||
""
|
||||
(string-translate (->string (car license))
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ "
|
||||
"abcdefghijklmnopqrstuvwxyz-")))
|
||||
|
||||
(printf "sha256 = ~S\n" (env-var "EGG_SHA256"))
|
||||
|
||||
(define synopsis (ref 'synopsis egg))
|
||||
(printf "synopsis = ~S\n"
|
||||
(if (not synopsis)
|
||||
""
|
||||
(car synopsis)))
|
||||
|
||||
(printf "version = ~S\n" (env-var "EGG_VERSION"))
|
||||
(print)
|
||||
19
pkgs/development/compilers/chicken/5/update.sh
Executable file
19
pkgs/development/compilers/chicken/5/update.sh
Executable file
|
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i oil -p oil chicken
|
||||
|
||||
export URL_PREFIX="https://code.call-cc.org/egg-tarballs/5/"
|
||||
cd $(nix-prefetch-url \
|
||||
'https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=snapshot;h=master;sf=tgz' \
|
||||
--name chicken-eggs-5-latest --unpack --print-path | tail -1)
|
||||
|
||||
echo "# THIS IS A GENERATED FILE. DO NOT EDIT!" > $_this_dir/deps.toml
|
||||
for i, item in */*/*.egg {
|
||||
var EGG_NAME=$(dirname $(dirname $item))
|
||||
var EGG_VERSION=$(basename $(dirname $item))
|
||||
var EGG_URL="${URL_PREFIX}${EGG_NAME}/${EGG_NAME}-${EGG_VERSION}.tar.gz"
|
||||
var EGG_SHA256=$(nix-prefetch-url $EGG_URL)
|
||||
export EGG_NAME
|
||||
export EGG_VERSION
|
||||
export EGG_SHA256
|
||||
csi -s $_this_dir/read-egg.scm < $item
|
||||
} >> $_this_dir/deps.toml
|
||||
|
|
@ -112,6 +112,6 @@ stdenv.mkDerivation rec {
|
|||
binaryNativeCode
|
||||
];
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = "ngtcp2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00=";
|
||||
sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -1,19 +1,23 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
let
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "restinio";
|
||||
version = "0.6.17";
|
||||
in
|
||||
fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-8A13r3Qsn5S+kVWLPENoOjqz2tPMxSo6EWBvHG1cTAE=";
|
||||
|
||||
stripRoot = false;
|
||||
postFetch = ''
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2";
|
||||
hash = "sha256-zqDEaQYZbpfDCyv++/1JV4yfhwqJUB185c05u9N2FCo=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/include
|
||||
mv $out/restinio-*/dev/restinio $out/include
|
||||
rm -r $out/restinio-*
|
||||
mv restinio-*/dev/restinio $out/include
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ buildDunePackage {
|
|||
pname = "caqti-async";
|
||||
inherit (caqti) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ];
|
||||
|
||||
meta = caqti.meta // { description = "Async support for Caqti"; };
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ buildDunePackage rec {
|
|||
version = "1.9.1";
|
||||
|
||||
minimalOCamlVersion = "4.04";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ buildDunePackage {
|
|||
|
||||
propagatedBuildInputs = [ caqti mariadb ];
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
meta = caqti.meta // {
|
||||
description = "MariaDB driver for Caqti using C bindings";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ buildDunePackage {
|
|||
pname = "caqti-driver-postgresql";
|
||||
inherit (caqti) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ caqti postgresql ];
|
||||
|
||||
meta = caqti.meta // {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{ lib, buildDunePackage, caqti }:
|
||||
{ lib, buildDunePackage, caqti, findlib }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "caqti-dynload";
|
||||
inherit (caqti) version src;
|
||||
|
||||
propagatedBuildInputs = [ caqti ];
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ caqti findlib ];
|
||||
|
||||
meta = caqti.meta // {
|
||||
description = "Dynamic linking of Caqti drivers using findlib.dynload";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ buildDunePackage {
|
|||
pname = "caqti-lwt";
|
||||
inherit (caqti) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ caqti logs lwt ];
|
||||
|
||||
meta = caqti.meta // { description = "Lwt support for Caqti"; };
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ buildDunePackage {
|
|||
pname = "caqti-type-calendar";
|
||||
inherit (caqti) src version;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ calendar caqti ];
|
||||
|
||||
meta = caqti.meta // {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ buildDunePackage rec {
|
|||
pname = "iter";
|
||||
version = "1.6";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c-cube";
|
||||
repo = pname;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ buildDunePackage rec {
|
|||
pname = "pratter";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrielhdt";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
buildDunePackage {
|
||||
pname = "qcheck-alcotest";
|
||||
|
||||
inherit (qcheck-core) version src;
|
||||
inherit (qcheck-core) version src patches;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ qcheck-core alcotest ];
|
||||
|
||||
|
|
|
|||
36
pkgs/development/ocaml-modules/qcheck/bytes.patch
Normal file
36
pkgs/development/ocaml-modules/qcheck/bytes.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
diff --git a/src/alcotest/dune b/src/alcotest/dune
|
||||
index 220a8b3..df1ffe0 100644
|
||||
--- a/src/alcotest/dune
|
||||
+++ b/src/alcotest/dune
|
||||
@@ -3,6 +3,6 @@
|
||||
(name qcheck_alcotest)
|
||||
(public_name qcheck-alcotest)
|
||||
(wrapped false)
|
||||
- (libraries unix bytes qcheck-core qcheck-core.runner alcotest)
|
||||
+ (libraries unix qcheck-core qcheck-core.runner alcotest)
|
||||
(flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
|
||||
)
|
||||
diff --git a/src/core/dune b/src/core/dune
|
||||
index ad0939f..42dc8ac 100644
|
||||
--- a/src/core/dune
|
||||
+++ b/src/core/dune
|
||||
@@ -3,6 +3,6 @@
|
||||
(name qcheck_core)
|
||||
(public_name qcheck-core)
|
||||
(wrapped false)
|
||||
- (libraries unix bytes)
|
||||
+ (libraries unix)
|
||||
(flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
|
||||
)
|
||||
diff --git a/src/ounit/dune b/src/ounit/dune
|
||||
index 2fadb7a..41f8d4b 100644
|
||||
--- a/src/ounit/dune
|
||||
+++ b/src/ounit/dune
|
||||
@@ -3,6 +3,6 @@
|
||||
(name qcheck_ounit)
|
||||
(public_name qcheck-ounit)
|
||||
(wrapped false)
|
||||
- (libraries unix bytes qcheck-core qcheck-core.runner ounit2)
|
||||
+ (libraries unix qcheck-core qcheck-core.runner ounit2)
|
||||
(flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
|
||||
)
|
||||
|
|
@ -5,6 +5,7 @@ buildDunePackage rec {
|
|||
version = "0.20";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c-cube";
|
||||
|
|
@ -13,6 +14,8 @@ buildDunePackage rec {
|
|||
sha256 = "sha256-d3gleiaPEDJTbHtieL4oAq1NlA/0NtzdW9SA1sItFeQ=";
|
||||
};
|
||||
|
||||
patches = [ ./bytes.patch ];
|
||||
|
||||
meta = {
|
||||
description = "Core qcheck library";
|
||||
homepage = "https://c-cube.github.io/qcheck/";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
buildDunePackage {
|
||||
pname = "qcheck";
|
||||
|
||||
inherit (qcheck-ounit) version src;
|
||||
inherit (qcheck-ounit) version src patches;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ qcheck-ounit ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@
|
|||
buildDunePackage {
|
||||
pname = "qcheck-ounit";
|
||||
|
||||
inherit (qcheck-core) version src;
|
||||
inherit (qcheck-core) version src patches;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ qcheck-core ounit ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ buildDunePackage rec {
|
|||
pname = "qtest";
|
||||
version = "2.11.2";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vincent-hugot";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "rdbg";
|
||||
version = "1.196.12";
|
||||
version = "1.199.0";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
minimalOCamlVersion = "4.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/rdbg.1.196.12.tgz";
|
||||
sha512 = "8e88034b1eda8f1233b4990adc9746782148254c93d8d0c99c246c0d50f306eeb6aa4afcfca8834acb3e268860647f47a24cc6a2d29fb45cac11f098e2ede275";
|
||||
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/rdbg.v${version}.tgz";
|
||||
hash = "sha512:6076eaa3608a313f8ac71a4f5aa4fcc64aeb0c646d581e5035110d4c80f94de34f2ba26f90a9a1e92a7f788c9e799f1f7b0e3728c853a21983ad732f0ee60352";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let version = "1.6.0"; in
|
|||
buildDunePackage {
|
||||
pname = "stringext";
|
||||
version = version;
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rgrinberg/stringext/releases/download/${version}/stringext-${version}.tbz";
|
||||
sha256 = "1sh6nafi3i9773j5mlwwz3kxfzdjzsfqj2qibxhigawy5vazahfv";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, ocaml
|
||||
, astring, ptime, rresult, qcheck
|
||||
}:
|
||||
|
||||
|
|
@ -7,13 +6,12 @@ buildDunePackage rec {
|
|||
pname = "syslog-message";
|
||||
version = "1.1.0";
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/verbosemode/${pname}/releases/download/${version}/${pname}-${version}.tbz";
|
||||
sha256 = "0vy4dkl2q2fa6rzyfsvjyc9r1b9ymfqd6j35z2kp5vdc4r87053g";
|
||||
hash = "sha256:0vy4dkl2q2fa6rzyfsvjyc9r1b9ymfqd6j35z2kp5vdc4r87053g";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -22,7 +20,7 @@ buildDunePackage rec {
|
|||
rresult
|
||||
];
|
||||
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
qcheck
|
||||
];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.03";
|
||||
pname = "uri";
|
||||
version = "4.2.0";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ else
|
|||
|
||||
buildDunePackage {
|
||||
pname = "uri-sexp";
|
||||
inherit (uri) version useDune2 src meta;
|
||||
inherit (uri) version src meta;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
checkInputs = [ ounit ];
|
||||
propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.44";
|
||||
version = "9.2.45";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KgQX8uVLnRZj2u2gkClX0PkaAPxgJR0D6E4lviZF1gk=";
|
||||
hash = "sha256-bdsLpV9S7S9ZL6wKlkqQy++jrxVhQUw9wBtfzqrLkwo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.44";
|
||||
version = "9.2.45";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o2jTRh8N7FfyewGy77+PuOMNZi+8BuuSwS88iTPWNxs=";
|
||||
hash = "sha256-Wx+0C+Vx9D+uYlJm+TY5QF2KeESGPVvBGcC/lIm63L0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.44";
|
||||
version = "9.2.45";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/3H6Ieq5Qt0BKlgexvJLQ/DtZn+s+k+QV2sraeoioUk=";
|
||||
hash = "sha256-KbjWZlci6VNH6mXE35RVNIkXgGobZy50QAliLfZwhMc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.44";
|
||||
version = "9.2.45";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+PGCPM3EbdeS7ftqmJBd2F5HOdoXNtBWHvEEWq7JKTs=";
|
||||
hash = "sha256-L+XokobPBHUeaIkWCIZ4cXWMHEZMCqZoRvWDqrWRlvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.44";
|
||||
version = "9.2.45";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
|
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yA7Wh+8ClPl+Eythk9i6cFZnFF481e/UkKMGzmZxdYA=";
|
||||
hash = "sha256-J612keZr91sqrTxE5evYWp3cb8idq/iHfPn95caWEh0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "db-dtypes";
|
||||
version = "1.0.5";
|
||||
version = "1.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "googleapis";
|
||||
repo = "python-db-dtypes-pandas";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RlSze0e2NNHJ6kAbj9TX58MaEPutyjcLXIOYjpugO6o=";
|
||||
hash = "sha256-OAVHx/a4uupVGXSWN2/3uem9/4i+TUkzTX4kp0uLY44=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "docstring-to-markdown";
|
||||
version = "0.11";
|
||||
version = "0.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "python-lsp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4Jl1XJpxwbxGWxdF4bOerjHyzHCIHtrydklwwk1WGs4=";
|
||||
hash = "sha256-c0gk1s/+25+pWUpi8geDQZ0f9JBeuvvFQ9MFskRnY6U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ let
|
|||
rm -f .bazelversion
|
||||
'';
|
||||
|
||||
bazelTarget = "//build:build_wheel";
|
||||
bazelTargets = [ "//build:build_wheel" ];
|
||||
|
||||
removeRulesCC = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mwdblib";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "CERT-Polska";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HQzfa5UmPo+Ccs2eRDwQA9EMzDg7+Nd4jIjBt+7qwzE=";
|
||||
hash = "sha256-WwSKWfnSDJT8kIAk4e8caeL2UztFaIpNCDy1j46IbzM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -45,6 +45,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python client library for the mwdb service";
|
||||
homepage = "https://github.com/CERT-Polska/mwdblib";
|
||||
changelog = "https://github.com/CERT-Polska/mwdblib/releases/tag/v${version}";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, paho-mqtt
|
||||
, poetry-core
|
||||
, psutil
|
||||
, pytestCheckHook
|
||||
, python-gnupg
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, sentry-sdk
|
||||
, tomli
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "notus-scanner";
|
||||
version = "unstable-2021-09-05";
|
||||
version = "22.4.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,37 +22,40 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "049f9a5e6439e4e5113e3b8f30b25ead12d42a56";
|
||||
sha256 = "1fjxyn8wg2kf6xy3pbh7d7yn20dk529p03xpqyz7s40n9nsxhnza";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bGuD3uDteXQdj3pfnRemKWffWVbQSHda/RrfhAXB3fM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"python-gnupg"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
paho-mqtt
|
||||
psutil
|
||||
python-gnupg
|
||||
sentry-sdk
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/greenbone/notus-scanner/pull/31
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/greenbone/notus-scanner/commit/b52eea317faca30d411096044f9e5ea20b58da65.patch";
|
||||
sha256 = "0q11aslhva47kkpsnpayra7spa849j894vqv34pjqhcnlyipqw6d";
|
||||
})
|
||||
pythonImportsCheck = [
|
||||
"notus.scanner"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "notus.scanner" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Helper to create results from local security checks";
|
||||
homepage = "https://github.com/greenbone/notus-scanner";
|
||||
changelog = "https://github.com/greenbone/notus-scanner/releases/tag/v${version}";
|
||||
license = with licenses; [ agpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.44";
|
||||
version = "9.2.45";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BJw1c9X+rRNiM10Fo514ZybbvM++Ph7te2LuFNNJFTk=";
|
||||
hash = "sha256-KRB3JLIny9mVVbS1kAGwaG+SmH9tHtEbbswB5nzJ7u4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ let
|
|||
|
||||
bazel = bazel_6;
|
||||
|
||||
bazelTarget = ":pip_pkg";
|
||||
bazelTargets = [ ":pip_pkg" ];
|
||||
LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";
|
||||
|
||||
fetchAttrs = {
|
||||
|
|
|
|||
|
|
@ -385,7 +385,7 @@ let
|
|||
]
|
||||
++ lib.optionals (mklSupport) [ "--config=mkl" ];
|
||||
|
||||
bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow";
|
||||
bazelTargets = [ "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow" ];
|
||||
|
||||
removeRulesCC = false;
|
||||
# Without this Bazel complaints about sandbox violations.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ buildRubyGem
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, lib
|
||||
, bundler
|
||||
|
|
@ -13,23 +12,15 @@ buildRubyGem rec {
|
|||
|
||||
name = "${gemName}-${version}";
|
||||
gemName = "bundix";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "bundix";
|
||||
rev = version;
|
||||
sha256 = "sha256-iMp6Yj7TSWDqge3Lw855/igOWdTIuFH1LGeIN/cpq7U=";
|
||||
sha256 = "sha256-QnNdseCSwQYhO/ybzWsflMEk68TMgPU3HqXJ7av3SHE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/nix-community/bundix/pull/80
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nix-community/bundix/commit/3d7820efdd77281234182a9b813c2895ef49ae1f.patch";
|
||||
hash = "sha256-ShluCWfRQxR+vkXqa7Fh7+WHKf6vAsa9/DVeXjpAXLk=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ ruby bundler ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ buildBazelPackage rec {
|
|||
bazel = bazel_5;
|
||||
bazelFlags = [ "--override_repository=rules_proto=${rulesProto}" ];
|
||||
bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ];
|
||||
bazelTarget = "//cmd/ibazel";
|
||||
bazelTargets = [ "//cmd/ibazel" ];
|
||||
|
||||
fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system
|
||||
fetchAttrs = {
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ buildBazelPackage rec {
|
|||
|
||||
bazel = bazel_4;
|
||||
removeRulesCC = false;
|
||||
bazelTarget = ":install-binaries";
|
||||
bazelTargets = [ ":install-binaries" ];
|
||||
bazelTestTargets = [ "//..." ];
|
||||
bazelBuildFlags = [
|
||||
"-c opt"
|
||||
|
|
|
|||
26
pkgs/development/tools/license-scanner/default.nix
Normal file
26
pkgs/development/tools/license-scanner/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "license-scanner";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CycloneDX";
|
||||
repo = "license-scanner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X7omSecbb85dtxPJtgdjLLgJQRJ7dh12DGwzIG0tYcE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7xa2tdCDCXkOZCLL8YPtO7i1VqD61Mow7un0690I8mM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utility that provides an API and CLI to identify licenses and legal terms";
|
||||
homepage = "https://github.com/CycloneDX/license-scanner";
|
||||
changelog = "https://github.com/CycloneDX/license-scanner/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,14 +3,14 @@
|
|||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "6.1.20";
|
||||
hash = "sha256-ni3AsoiDh/MZBhB0dQKFwcPnKSFvw8nhaX/09QCSQd8=";
|
||||
version = "6.1.22";
|
||||
hash = "sha256-eom3vlcbTTnVk+zcKja82mKmSmO8v0uqxccdA1VRj6s=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.2.7";
|
||||
hash = "sha256-nxyEz+xXcr8tK8q+LWqNE3kYdWq4CXSy2vJfnlqKKRk=";
|
||||
version = "6.2.9";
|
||||
hash = "sha256-Nwd3C5YSfEO4/2fOzkQmNAqettvt6bM2Gz0k8a9O/DI=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,22 +3,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+REY5an0gTbADEozCI6bkUWbW9VWTtWZ4xXj9qcIkwc=";
|
||||
hash = "sha256-syOLrw4ig8rmFDkxJ9KSAuzUVO8UokekV17mT1bJNNM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/O7zzXYM03K+MresuXIHtgMuD9yS2+NIaLEnm/WRYeA=";
|
||||
vendorHash = "sha256-nvGhKCUiyHSD0VpE4OtT9YQSHxv0d7iwOChCJl2D3zk=";
|
||||
|
||||
subPackages = [
|
||||
# The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith
|
||||
"cmd/dendrite-monolith-server"
|
||||
# The server as a polylith: https://matrix-org.github.io/dendrite/installation/install/polylith
|
||||
"cmd/dendrite-polylith-multi"
|
||||
# The server
|
||||
"cmd/dendrite"
|
||||
# admin tools
|
||||
"cmd/create-account"
|
||||
"cmd/generate-config"
|
||||
|
|
@ -31,7 +29,6 @@ buildGoModule rec {
|
|||
## tech demos
|
||||
# "cmd/dendrite-demo-pinecone"
|
||||
# "cmd/dendrite-demo-yggdrasil"
|
||||
# "cmd/dendritejs-pinecone"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.2.5";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "c6b122e92baa179d09ba4c8ce5b0d42fb7475805f4ff9c81d5036acfaa161820";
|
||||
sha256 = "ac124fb17dbc4ac5310a30a396245a6ba304b3c89abed0f8a47d727462c8da4d";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ buildBazelPackage rec {
|
|||
removeRulesCC = false;
|
||||
removeLocalConfigCc = true;
|
||||
removeLocal = false;
|
||||
bazelTarget = "//source/exe:envoy-static";
|
||||
bazelTargets = [ "//source/exe:envoy-static" ];
|
||||
bazelBuildFlags = [
|
||||
"-c opt"
|
||||
"--spawn_strategy=standalone"
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
# This file was generated by pkgs.mastodon.updateScript.
|
||||
{ fetchgit, applyPatches, fetchpatch }: let
|
||||
{ fetchgit, applyPatches }: let
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mastodon/mastodon.git";
|
||||
rev = "v4.1.1";
|
||||
sha256 = "1c0mxz45pkgmyw81z025n1ps1dkdq92337h7sd865w2fbgmzg50l";
|
||||
rev = "v4.1.2";
|
||||
sha256 = "18yzpc2rz9sa04y2sdxzsfkndbqqsfqvji47imwc3yj40l8hciws";
|
||||
};
|
||||
in applyPatches {
|
||||
inherit src;
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mastodon/mastodon/commit/e7b81d7d9625893b1323e12215a2a98c0f19f58f.patch";
|
||||
hash = "sha256-cF0wtbjTNbsyqHb3uy5zYFaACIcziJ2ulJpOT5VoDO0=";
|
||||
})
|
||||
];
|
||||
patches = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
"4.1.1"
|
||||
"4.1.2"
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
:100644 100644 fac4f53 aed9617 M src/rimeengine.cpp
|
||||
|
||||
diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp
|
||||
index fac4f53..aed9617 100644
|
||||
--- a/src/rimeengine.cpp
|
||||
+++ b/src/rimeengine.cpp
|
||||
@@ -164,7 +164,10 @@ void RimeEngine::rimeStart(bool fullcheck) {
|
||||
RIME_ERROR() << "Failed to create user directory: " << userDir;
|
||||
}
|
||||
}
|
||||
- const char *sharedDataDir = RIME_DATA_DIR;
|
||||
+ const char *sharedDataDir = getenv("NIX_RIME_DATA_DIR");
|
||||
+ if (!sharedDataDir) {
|
||||
+ sharedDataDir = RIME_DATA_DIR;
|
||||
+ }
|
||||
|
||||
RIME_STRUCT(RimeTraits, fcitx_rime_traits);
|
||||
fcitx_rime_traits.shared_data_dir = sharedDataDir;
|
||||
|
|
@ -6,6 +6,9 @@
|
|||
, gettext
|
||||
, fcitx5
|
||||
, librime
|
||||
, rime-data
|
||||
, symlinkJoin
|
||||
, rimeDataPkgs ? [ rime-data ]
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -35,7 +38,14 @@ stdenv.mkDerivation rec {
|
|||
librime
|
||||
];
|
||||
|
||||
patches = [ ./fcitx5-rime-with-nix-env-variable.patch ];
|
||||
rimeDataDrv = symlinkJoin {
|
||||
name = "fcitx5-rime-data";
|
||||
paths = rimeDataPkgs;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
cp -r "${rimeDataDrv}/share/rime-data/." $out/share/rime-data/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "RIME support for Fcitx5";
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
, librime
|
||||
, pkg-config
|
||||
, rime-data
|
||||
, symlinkJoin
|
||||
, rimeDataPkgs ? [ rime-data ]
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -22,15 +24,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0gdxg6ia0i31jn3cvh1nrsjga1j31hf8a2zfgg8rzn25chrfr319";
|
||||
};
|
||||
|
||||
buildInputs = [ gdk-pixbuf glib ibus libnotify librime rime-data ];
|
||||
buildInputs = [ gdk-pixbuf glib ibus libnotify librime ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
cmakeFlags = [ "-DRIME_DATA_DIR=${rime-data}/share/rime-data" ];
|
||||
cmakeFlags = [ "-DRIME_DATA_DIR=${placeholder "out"}/share/rime-data" ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'DESTINATION "''${RIME_DATA_DIR}"' \
|
||||
'DESTINATION "''${CMAKE_INSTALL_DATADIR}/rime-data"'
|
||||
rimeDataDrv = symlinkJoin {
|
||||
name = "ibus-rime-data";
|
||||
paths = rimeDataPkgs;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
cp -r "${rimeDataDrv}/share/rime-data/." $out/share/rime-data/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -12,17 +12,17 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector";
|
||||
version = "0.71.0";
|
||||
version = "0.74.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y6HSz81edWklXhTbaK9LvdwmgNPRMtI1BD0IfcjWl3I=";
|
||||
sha256 = "sha256-A2xiYCU2Lq/F59pQhgQD8sf1BcRvuaWKvGdxNGQ938E=";
|
||||
};
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "source/cmd/otelcorecol";
|
||||
vendorHash = "sha256-Zi9Rkfm+y0jZySwMJxAa5Sx/r5WAYvOVez3J0yQza2w=";
|
||||
vendorHash = "sha256-VTPywVGs56lJxYLwmz71jBJ5ltxCZYUw0z6RslN2ZOE=";
|
||||
|
||||
preBuild = ''
|
||||
# set the build version, can't be done via ldflags
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, rustPlatform, fetchCrate, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scraper";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "causal-agent";
|
||||
repo = "scraper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-K0MeZeS60gxo0/kBCaffNVQrR5S1HDoq77hnC//LMQg=";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-3FxEfrScOetB1raiT9xjq9G2xLrLZqVlkqbVAFCIhZ0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2IvfJaYyX7ZA1y3TETydb7wXRER4CfH69xEvnxKCFTc=";
|
||||
cargoHash = "sha256-Pf8+vvOvOHpuJ2v7iwdVzHwneqvhk2E4nbGO4TL/FAM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -17978,6 +17978,8 @@ with pkgs;
|
|||
|
||||
license_finder = callPackage ../development/tools/license_finder { };
|
||||
|
||||
license-scanner = callPackage ../development/tools/license-scanner { };
|
||||
|
||||
Literate = callPackage ../development/tools/literate-programming/Literate { };
|
||||
|
||||
md-tangle = callPackage ../development/tools/literate-programming/md-tangle { };
|
||||
|
|
@ -26257,7 +26259,7 @@ with pkgs;
|
|||
# Even though this is a set of packages not single package, use `callPackage`
|
||||
# not `callPackages` so the per-package callPackages don't have their
|
||||
# `.override` clobbered. C.F. `llvmPackages` which does the same.
|
||||
darwin = callPackage ./darwin-packages.nix { };
|
||||
darwin = recurseIntoAttrs (callPackage ./darwin-packages.nix { });
|
||||
|
||||
defaultbrowser = callPackage ../os-specific/darwin/defaultbrowser {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
|
|
@ -27996,6 +27998,8 @@ with pkgs;
|
|||
|
||||
linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin { };
|
||||
|
||||
linja-sike = callPackage ../data/fonts/linja-sike { };
|
||||
|
||||
linux-manual = callPackage ../data/documentation/linux-manual { };
|
||||
|
||||
lklug-sinhala = callPackage ../data/fonts/lklug-sinhala { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue