Merge master into staging-next
This commit is contained in:
github-actions[bot]
+3
-3
@@ -293,9 +293,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
/pkgs/development/compilers/dotnet @IvarWithoutBones
|
||||
|
||||
# Node.js
|
||||
/pkgs/build-support/node/build-npm-package @winterqt
|
||||
/pkgs/build-support/node/fetch-npm-deps @winterqt
|
||||
/doc/languages-frameworks/javascript.section.md @winterqt
|
||||
/pkgs/build-support/node/build-npm-package @lilyinstarlight @winterqt
|
||||
/pkgs/build-support/node/fetch-npm-deps @lilyinstarlight @winterqt
|
||||
/doc/languages-frameworks/javascript.section.md @lilyinstarlight @winterqt
|
||||
|
||||
# OCaml
|
||||
/pkgs/build-support/ocaml @ulrikstrid
|
||||
|
||||
@@ -37,7 +37,7 @@ even if networkd is disabled.
|
||||
Alternatively, we can use a plain old udev rule:
|
||||
|
||||
```nix
|
||||
services.udev.initrdRules = ''
|
||||
boot.initrd.services.udev.rules = ''
|
||||
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \
|
||||
ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan"
|
||||
'';
|
||||
@@ -45,7 +45,7 @@ services.udev.initrdRules = ''
|
||||
|
||||
::: {.warning}
|
||||
The rule must be installed in the initrd using
|
||||
`services.udev.initrdRules`, not the usual `services.udev.extraRules`
|
||||
`boot.initrd.services.udev.rules`, not the usual `services.udev.extraRules`
|
||||
option. This is to avoid race conditions with other programs controlling
|
||||
the interface.
|
||||
:::
|
||||
|
||||
@@ -76,6 +76,8 @@
|
||||
|
||||
- `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts.<name>.listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details.
|
||||
|
||||
- `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details.
|
||||
|
||||
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}
|
||||
|
||||
- The `qemu-vm.nix` module by default now identifies block devices via
|
||||
|
||||
@@ -26,6 +26,7 @@ in
|
||||
Identifier "DisplayLink"
|
||||
MatchDriver "evdi"
|
||||
Driver "modesetting"
|
||||
Option "TearFree" "true"
|
||||
Option "AccelMethod" "none"
|
||||
EndSection
|
||||
'';
|
||||
|
||||
@@ -65,6 +65,7 @@ let
|
||||
"redis"
|
||||
"rspamd"
|
||||
"rtl_433"
|
||||
"scaphandre"
|
||||
"script"
|
||||
"shelly"
|
||||
"snmp"
|
||||
@@ -301,6 +302,21 @@ in
|
||||
Please specify either 'services.prometheus.exporters.sql.configuration' or
|
||||
'services.prometheus.exporters.sql.configFile'
|
||||
'';
|
||||
} {
|
||||
assertion = cfg.scaphandre.enable -> (pkgs.stdenv.hostPlatform.isx86_64 == true);
|
||||
message = ''
|
||||
Only x86_64 host platform architecture is not supported.
|
||||
'';
|
||||
} {
|
||||
assertion = cfg.scaphandre.enable -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false;
|
||||
message = ''
|
||||
A kernel version newer than '5.11' is required. ${pkgs.linux.version}
|
||||
'';
|
||||
} {
|
||||
assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules);
|
||||
message = ''
|
||||
Please enable 'intel_rapl_common' in 'boot.kernelModules'.
|
||||
'';
|
||||
} ] ++ (flip map (attrNames exporterOpts) (exporter: {
|
||||
assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;
|
||||
message = ''
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, options
|
||||
}:
|
||||
|
||||
let
|
||||
logPrefix = "services.prometheus.exporter.scaphandre";
|
||||
cfg = config.services.prometheus.exporters.scaphandre;
|
||||
in {
|
||||
port = 8080;
|
||||
extraOpts = {
|
||||
telemetryPath = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "/metrics";
|
||||
description = lib.mdDoc ''
|
||||
Path under which to expose metrics.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.scaphandre}/bin/scaphandre prometheus \
|
||||
--address ${cfg.listenAddress} \
|
||||
--port ${toString cfg.port} \
|
||||
--suffix ${cfg.telemetryPath} \
|
||||
${lib.concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1085,6 +1085,22 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
scaphandre = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
};
|
||||
metricProvider = {
|
||||
boot.kernelModules = [ "intel_rapl_common" ];
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-scaphandre-exporter.service")
|
||||
wait_for_open_port(8080)
|
||||
wait_until_succeeds(
|
||||
"curl -sSf 'localhost:8080/metrics'"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
shelly = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
||||
@@ -24,6 +24,7 @@ in
|
||||
services.tmate-ssh-server = {
|
||||
enable = true;
|
||||
port = 2223;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
client = { ... }: {
|
||||
|
||||
@@ -5,19 +5,21 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lightning-pool";
|
||||
version = "0.5.3-alpha";
|
||||
version = "0.6.4-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightninglabs";
|
||||
repo = "pool";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nc3hksk9qcxrsyqpz9vcfc8x093rc8yx8ppfk177j9fhdnn8bk7";
|
||||
hash = "sha256-lSc/zOZ5VpmaZ7jrlGvSaczrgOtAMS9tDUxcMoFdBmQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "09yxaa74814l1rp0arqhqpplr2j0p8dj81zqcbxlwp5ckjv9r2za";
|
||||
vendorHash = "sha256-DD27zUW524qe9yLaVPEzw/c4sSzlH89HMw0PdtNYEhg=";
|
||||
|
||||
subPackages = [ "cmd/pool" "cmd/poold" ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightning Pool Client";
|
||||
homepage = "https://github.com/lightninglabs/pool";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, lndconnect }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "lndconnect";
|
||||
version = "0.2.1";
|
||||
@@ -7,10 +7,10 @@ buildGoModule rec {
|
||||
owner = "LN-Zap";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cuZkVeFUQq7+kQo/YjXCMPANUL5QooAWgegcoWo3M0c=";
|
||||
hash = "sha256-cuZkVeFUQq7+kQo/YjXCMPANUL5QooAWgegcoWo3M0c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iE0nht3PH2R9pTyyrySk759untC7snGt3wTXk4/pjrU=";
|
||||
vendorHash = "sha256-iE0nht3PH2R9pTyyrySk759untC7snGt3wTXk4/pjrU=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cherrytree";
|
||||
version = "0.99.55";
|
||||
version = "0.99.56";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giuspen";
|
||||
repo = "cherrytree";
|
||||
rev = version;
|
||||
hash = "sha256-1ytph2HTwIqVTD6+a5P1gvFG+2xsfZWRkmn7RpwuwKY=";
|
||||
hash = "sha256-kDbUn81YfSMAX7FKcw+nDSrsNvrhOX0+NmgZUYNqCqQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config
|
||||
, libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv
|
||||
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake
|
||||
, wrapQtAppsHook
|
||||
, withCC ? true, opencc
|
||||
, withEpwing ? true, libeb
|
||||
, withExtraTiff ? true, libtiff
|
||||
@@ -8,20 +9,19 @@
|
||||
, withMultimedia ? true
|
||||
, withZim ? true, zstd }:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goldendict";
|
||||
version = "2022-05-10";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goldendict";
|
||||
repo = pname;
|
||||
rev = "f810c6bd724e61977b4e94ca2d8abfa5bd766379";
|
||||
sha256 = "sha256-gNM+iahoGQy8TlNFLQx5ksITzQznv7MWMX/88QCTnL0";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-dont-check-for-updates.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
./0001-dont-use-maclibs.patch
|
||||
];
|
||||
|
||||
@@ -31,7 +31,7 @@ mkDerivation rec {
|
||||
--replace "opencc.2" "opencc"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
|
||||
buildInputs = [
|
||||
qtbase qtsvg qtwebkit qttools
|
||||
libvorbis hunspell xz lzo
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "115.0.5790.32",
|
||||
"sha256": "1zy4f57j047aw164s4x0904yazq6nvyy2wjjk9amiav9qyrfxzr6",
|
||||
"sha256bin64": "0qgciqrjnsb9vxnvvcaqn728x9l0s72v78a6f7zffjxps87rbaz5",
|
||||
"version": "115.0.5790.40",
|
||||
"sha256": "1ab034zrgyz0gwi0caz6y1nyr0p5yhbly50chnhvsr3k6gmidl58",
|
||||
"sha256bin64": "02vzlz5z87n9lwdhxnzdzr5w85l3b828j0y1z6fzq7br90yr0pcw",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-05-19",
|
||||
@@ -32,15 +32,15 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "116.0.5829.0",
|
||||
"sha256": "0ip0wha705nr7yr4fn25psb6r41a703b9n87v6q8k8vzax5492y6",
|
||||
"sha256bin64": "1fa2l7n8vdcnf6p0m7qqh05fimbwdh7p8a142l0vi8l9kx4n9z54",
|
||||
"version": "116.0.5845.4",
|
||||
"sha256": "0p3v4dzyrj1fn97s2grkc2x8lgfm14rgwalrnb3gx9syi8gdwkpw",
|
||||
"sha256bin64": "1wim32q9sq501wrnz1xx4s1r0gywz4pgf3r9d0zga3g86jp385ax",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-06-08",
|
||||
"version": "2023-06-09",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "1cd35c1b722472e714c30d12031af81443bb20ae",
|
||||
"sha256": "09y8jkxzkz87zp2js1j7yvqnck9n0182lm7c3x330d8agwrmdkrj"
|
||||
"rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d",
|
||||
"sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -51,11 +51,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opera";
|
||||
version = "99.0.4788.77";
|
||||
version = "100.0.4815.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
hash = "sha256-VdhUyXKqQaIpvwE4izQXIVdyDHfW7FQLfiiUBop70rI=";
|
||||
hash = "sha256-bDCj4ZtULO1JkuAsqy2ppcWOshgGRG03qlb3KV3CtSE=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "openlens";
|
||||
version = "6.5.2-309";
|
||||
version = "6.5.2-356";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage";
|
||||
sha256 = "sha256-APJYN5GBBw6FhF7NkRXip4coLY5Hxi+aE6r5IxzODFM=";
|
||||
sha256 = "sha256-ZOLfnAKZMqO/MkpjX2SQhtBIeWRGTkPBWdAw67a3l9Q=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cryptominisat";
|
||||
version = "5.11.4";
|
||||
version = "5.11.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msoos";
|
||||
repo = "cryptominisat";
|
||||
rev = version;
|
||||
hash = "sha256-7JNfFKSYWgyyNnWNzXGLqWRwSW+5r6PBMelKeAmx8sc=";
|
||||
hash = "sha256-TYuOgOOs1EsdNz7ctZMsArTlw3QzHjiPZVozuniiPcI=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 boost ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
|
||||
let
|
||||
pname = "geogebra";
|
||||
version = "5-0-745-0";
|
||||
version = "5-0-785-0";
|
||||
|
||||
srcIcon = fetchurl {
|
||||
url = "http://static.geogebra.org/images/geogebra-logo.svg";
|
||||
@@ -45,9 +45,9 @@ let
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
||||
"https://web.archive.org/web/20221126102702/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
||||
"https://web.archive.org/web/20230627211902/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
|
||||
];
|
||||
hash = "sha256-DhZ9inK/6Cc/vunYNHhyP4tI/9/toUOgV4lZWmFIj3c=";
|
||||
hash = "sha256-cL4ERKZpE9Y6IdOjvYiX3nIIW3E2qoqkpMyTszvFseM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -75,10 +75,10 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
|
||||
"https://web.archive.org/web/20221126102602/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}.zip"
|
||||
"https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}-x64.zip"
|
||||
"https://web.archive.org/web/20230627211427/https://download.geogebra.org/installers/5.0/GeoGebra-MacOS-Installer-withJava-${version}-x64.zip"
|
||||
];
|
||||
hash = "sha256-La7NzEoao4ExUw3mBGstvSHm94/JM5LHlhOE9ewJePY=";
|
||||
hash = "sha256-KHjNH8c3/aMJ5CcwCwW9z0QRxJwqYU5I610zpMMruBQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }:
|
||||
let
|
||||
pname = "geogebra";
|
||||
version = "6-0-745-0";
|
||||
version = "6-0-785-0";
|
||||
|
||||
srcIcon = geogebra.srcIcon;
|
||||
desktopItem = geogebra.desktopItem;
|
||||
@@ -30,9 +30,9 @@ let
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
|
||||
"https://web.archive.org/web/20221126110648/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
|
||||
"https://web.archive.org/web/20230627211859/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
|
||||
];
|
||||
hash = "sha256-UksHZt7bEs/aRzFiJrT1Quz/SFSvA88sdhoi1IEVdBc=";
|
||||
hash = "sha256-Yv8pTCKkyM7XMUNV2Pcn/YxWo1MbOTNMQBFuJFhB/uE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -65,9 +65,9 @@ let
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
|
||||
"https://web.archive.org/web/20221126111123/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
|
||||
"https://web.archive.org/web/20230627214413/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
|
||||
];
|
||||
hash = "sha256-Qn2MD3W5icX45Tfs19oRV8J3lYmL8T+hp7A+crRb9tQ=";
|
||||
hash = "sha256-HtIhhq8E1Q5B6xZ7q6Ok95Rt53VWLoGf8PbY+UEOSKg=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, rake
|
||||
@@ -56,15 +55,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "t+kfFS5c8w+c9wxNh59nceFesfdMy8qvHlUqDbZAxkk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compatiblity with fmt 10.0. Remove with the next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/24716ce95bf5b10d685611de23489045cf2ca5cc.patch";
|
||||
hash = "sha256-vOm3FmXL3mHzs3RHCJ9gbTLSe3xhSXo8IfgA+s0cFjY=";
|
||||
includes = [ "src/common/codec.h" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
docbook_xsl
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-gradient-source";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exeldro";
|
||||
repo = "obs-gradient-source";
|
||||
rev = version;
|
||||
sha256 = "sha256-4u7RzF2b7EWwsfEtRvGDifue34jJM4MaYpwumu0MFpQ=";
|
||||
sha256 = "sha256-5pll84UZYOTESrid2UuC1aWlaLrWf1LpXqlV09XKLug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prefetch dependencies from npm (for use with `fetchNpmDeps`)";
|
||||
maintainers = with maintainers; [ winter ];
|
||||
maintainers = with maintainers; [ lilyinstarlight winter ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
--- a/src/passes/02-parsing/cameligo/dune
|
||||
+++ b/src/passes/02-parsing/cameligo/dune
|
||||
@@ -20,7 +20,9 @@
|
||||
(action
|
||||
(with-stdout-to
|
||||
%{targets}
|
||||
- (run menhir-recover --external-tokens Lexing_cameligo.Token Parser.cmly))))
|
||||
+ (run menhir-recover
|
||||
+ --external-tokens Lexing_cameligo.Token.MenhirInterpreter
|
||||
+ Parser.cmly))))
|
||||
|
||||
;; Build of the CameLIGO parser as a library
|
||||
|
||||
diff --git a/src/passes/02-parsing/jsligo/dune b/src/passes/02-parsing/jsligo/dune
|
||||
index d691ab0af0fe6ae87119405c19e49e2b5c2d1a23..3b13a06e69737037df0df12aa087506f402d8430 100644
|
||||
--- a/src/passes/02-parsing/jsligo/dune
|
||||
+++ b/src/passes/02-parsing/jsligo/dune
|
||||
@@ -20,7 +20,9 @@
|
||||
(action
|
||||
(with-stdout-to
|
||||
%{targets}
|
||||
- (run menhir-recover --external-tokens Lexing_jsligo.Token Parser.cmly))))
|
||||
+ (run menhir-recover
|
||||
+ --external-tokens Lexing_jsligo.Token.MenhirInterpreter
|
||||
+ Parser.cmly))))
|
||||
|
||||
;; Build of the JsLIGO parser as a library
|
||||
|
||||
diff --git a/src/passes/02-parsing/pascaligo/dune b/src/passes/02-parsing/pascaligo/dune
|
||||
index 0516a8b790d2eb3ebdb833051bd66241ca44832c..e650decc7ba9907551e1016fee1a53b806fb593e 100644
|
||||
--- a/src/passes/02-parsing/pascaligo/dune
|
||||
+++ b/src/passes/02-parsing/pascaligo/dune
|
||||
@@ -20,7 +20,9 @@
|
||||
(action
|
||||
(with-stdout-to
|
||||
%{targets}
|
||||
- (run menhir-recover --external-tokens Lexing_pascaligo.Token Parser.cmly))))
|
||||
+ (run menhir-recover
|
||||
+ --external-tokens Lexing_pascaligo.Token.MenhirInterpreter
|
||||
+ Parser.cmly))))
|
||||
|
||||
;; Build of the PascaLIGO parser as a library
|
||||
|
||||
diff --git a/src/passes/02-parsing/pyligo/dune b/src/passes/02-parsing/pyligo/dune
|
||||
index abb0165f6f185d21ea4a52a152cef188ae9dde4b..5930d86ab721e9dd683e5c4f2873b196ac5859b4 100644
|
||||
--- a/src/passes/02-parsing/pyligo/dune
|
||||
+++ b/src/passes/02-parsing/pyligo/dune
|
||||
@@ -20,7 +20,9 @@
|
||||
(action
|
||||
(with-stdout-to
|
||||
%{targets}
|
||||
- (run menhir-recover --external-tokens Lexing_pyligo.Token Parser.cmly))))
|
||||
+ (run menhir-recover
|
||||
+ --external-tokens Lexing_pyligo.Token.MenhirInterpreter
|
||||
+ Parser.cmly))))
|
||||
|
||||
;; Build of the PyLIGO parser as a library
|
||||
|
||||
@@ -24,6 +24,9 @@ ocamlPackages.buildDunePackage rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# https://gitlab.com/ligolang/ligo/-/merge_requests/2706.diff
|
||||
patches = [ ./2706.diff ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "vendors/tezos-ligo/src/lib_hacl/hacl.ml" \
|
||||
--replace \
|
||||
|
||||
@@ -103,6 +103,9 @@ in {
|
||||
|
||||
./nixbuild.patch
|
||||
# Load libraries at runtime by absolute path
|
||||
|
||||
./extra-mangling.patch
|
||||
# Mangle store paths of modules to prevent runtime dependence.
|
||||
] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch;
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim
|
||||
index e80ea3fa6..8ecf27a85 100644
|
||||
--- a/compiler/modulepaths.nim
|
||||
+++ b/compiler/modulepaths.nim
|
||||
@@ -70,6 +70,13 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex =
|
||||
else:
|
||||
result = fileInfoIdx(conf, fullPath)
|
||||
|
||||
+proc rot13(result: var string) =
|
||||
+ for i, c in result:
|
||||
+ case c
|
||||
+ of 'a'..'m', 'A'..'M': result[i] = char(c.uint8 + 13)
|
||||
+ of 'n'..'z', 'N'..'Z': result[i] = char(c.uint8 - 13)
|
||||
+ else: discard
|
||||
+
|
||||
proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
|
||||
## Mangle a relative module path to avoid path and symbol collisions.
|
||||
##
|
||||
@@ -78,9 +85,11 @@ proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
|
||||
##
|
||||
## Example:
|
||||
## `foo-#head/../bar` becomes `@foo-@hhead@s..@sbar`
|
||||
- "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
|
||||
+ result = "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
|
||||
{$os.DirSep: "@s", $os.AltSep: "@s", "#": "@h", "@": "@@", ":": "@c"})
|
||||
+ rot13(result)
|
||||
|
||||
proc demangleModuleName*(path: string): string =
|
||||
## Demangle a relative module path.
|
||||
result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"})
|
||||
+ rot13(result)
|
||||
diff --git a/compiler/msgs.nim b/compiler/msgs.nim
|
||||
index 3f386cc61..054f7f647 100644
|
||||
--- a/compiler/msgs.nim
|
||||
+++ b/compiler/msgs.nim
|
||||
@@ -659,8 +659,10 @@ proc uniqueModuleName*(conf: ConfigRef; fid: FileIndex): string =
|
||||
for i in 0..<trunc:
|
||||
let c = rel[i]
|
||||
case c
|
||||
- of 'a'..'z':
|
||||
- result.add c
|
||||
+ of 'a'..'m':
|
||||
+ result.add char(c.uint8 + 13)
|
||||
+ of 'n'..'z':
|
||||
+ result.add char(c.uint8 - 13)
|
||||
of {os.DirSep, os.AltSep}:
|
||||
result.add 'Z' # because it looks a bit like '/'
|
||||
of '.':
|
||||
@@ -2,20 +2,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "typescript";
|
||||
version = "5.1.3";
|
||||
version = "5.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "TypeScript";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c+ZI58Zk6TXwJoWUAXeIMToT+e7Ozdn7hxiDpPjeQJg=";
|
||||
hash = "sha256-HdDzkDhlaTDUNmAsWlLUHuGAIgXGcgZW4dZAweaXrL0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RHiUhhkzkr2Ra3wc1d13gE2WIZL49w7IEFEAZuBDTDI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A superset of JavaScript that compiles to clean JavaScript output";
|
||||
homepage = "https://github.com/microsoft/TypeScript";
|
||||
homepage = "https://www.typescriptlang.org/";
|
||||
changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sentry-native";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-native";
|
||||
rev = version;
|
||||
hash = "sha256-GefuMsMFmNyAn+xmnRqUjyWFHqiF/kIzqBCF6mk3vx0=";
|
||||
hash = "sha256-AMGp2tfYMocIdnqHXqxPBoNH+6E8MtCuNTYlt9CigcY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+6618
-4675
File diff suppressed because it is too large
Load Diff
@@ -8,14 +8,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "awa";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz";
|
||||
hash = "sha256-hsmTuoubBdsEyGe8zmfG7JihY0LFM4lErpPKUVobIX8=";
|
||||
hash = "sha256-BtbReSnnAN+u1Vy63afO1yheoDqsIRU2rig0y1QDtuw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
{ buildDunePackage, awa
|
||||
, cstruct, mtime, lwt, cstruct-unix, mirage-crypto-rng
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "awa-lwt";
|
||||
|
||||
inherit (awa) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awa cstruct mtime lwt mirage-crypto-rng
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ awa ];
|
||||
checkInputs = [ cstruct-unix ];
|
||||
|
||||
meta = awa.meta // { mainProgram = "awa_lwt_server"; };
|
||||
}
|
||||
@@ -21,7 +21,9 @@ buildDunePackage {
|
||||
bigstringaf
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Tests fail with git 2.41
|
||||
# see https://github.com/mirage/ocaml-git/issues/617
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
git-binary
|
||||
];
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "menhirLib";
|
||||
version = "20220210";
|
||||
version = "20230608";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "fpottier";
|
||||
repo = "menhir";
|
||||
rev = version;
|
||||
sha256 = "sha256:0f31isr3cyiishflz6qr4xc3gp9xwf32r3vxdvm5wnr2my1fnn1n";
|
||||
sha256 = "sha256-dUPoIUVr3gqvE5bniyQh/b37tNfRsZN8X3e99GFkyLY=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.56";
|
||||
version = "9.2.57";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J2O/g9q7xeEiP/XMMiOrTbA1IHBaxRFT3WASI+StG9E=";
|
||||
hash = "sha256-W9JvxUkQeHOKCvGeOLWHjyN53NEsiQ+3wDvi0z0VrO0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone-cloud";
|
||||
version = "0.1.9";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = "aioairzone-cloud";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-E6lwh+AQ+SZm0ODFdApwyq5OB2qO9KBdFo9vVgpiy3M=";
|
||||
hash = "sha256-mfygibuKSkBrVZ+zILCAYnfzEvrzD7ZXbUtTSZ54rVk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.56";
|
||||
version = "9.2.57";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LjXQG5L8VwrxC5WJupBS9eqKnQ7t8gi7ug9uTG2v8W4=";
|
||||
hash = "sha256-s3wlTsm97hn2RNsB22eBzbPqQCl19QDeAa5E39qikL4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.56";
|
||||
version = "9.2.57";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-t2zhQz+IaWm4Y5BDkKwNk9ptAyA7Prs5m7v8HJ8Aob4=";
|
||||
hash = "sha256-6w8xl0lqu8JUfPpMhx57WA5kzX+bgW05i2nAGwQBkcQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.56";
|
||||
version = "9.2.57";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QhbXcvO3HR9ffrI7KwSIQeVPfs6RIWoHllCaS6hC3JI=";
|
||||
hash = "sha256-Wm+rRhrylnIat2L3MvvjKBayYlzi28rcQ+1KR/Zam/U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.56";
|
||||
version = "9.2.57";
|
||||
|
||||
# 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-c4uuM7ZZPfykGkYrpuE2JJqe5/pTZuR+IvPC+HA7laA=";
|
||||
hash = "sha256-xROJl7Mpdpcz1Mio7ChHR/9hHTgp+SQkawGkl6F+NDM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "5.12.0";
|
||||
version = "6.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fJRGtes5EdGHiTJ5SDOyZT9NEnghbu+7I9OD2h4JOjw=";
|
||||
hash = "sha256-gIjb8+UEMf/wQSJOassMc9MBysTtieExFTIiSq1m/3Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "discord.py";
|
||||
version = "2.2.3";
|
||||
version = "2.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "Rapptz";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Rh3gijm67LVyOaliP7w3YwKviKydnxXvu4snNrM5H1c=";
|
||||
hash = "sha256-vbbTnmzYI6cbF7GWjPVGqy7KKDGpWQ+4q96/kGFjQ8Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glances-api";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-glances-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fcQgwOYGhpwxSXfa1PYFOe2UDTEu+2YGIQmuSa5J0g4=";
|
||||
hash = "sha256-VfiAJuSmzFVgDTThtsTy7/caRmJKZuD5YwHjMspeB0A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-i18n-address";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "mirumee";
|
||||
repo = "google-i18n-address";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eh0NcGJfIjCmgTyfSOlDNLrCvMnZKzkJkQb3txVmFAo=";
|
||||
hash = "sha256-dW/1wwnFDjYpym1ZaSZ7mOLpkHxsvuAHC8zBRekxWaw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "huawei-lte-api";
|
||||
version = "1.7";
|
||||
version = "1.7.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Salamek";
|
||||
repo = "huawei-lte-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-/2puuWdmVvq90/UAEKPMD6wjkdxzzCdukSH4VQia4qA=";
|
||||
hash = "sha256-a01oNfUivbCzTd5auu+EXj+yvcC1vKyktIFK+zPQGy4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.1.8";
|
||||
version = "2.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZIUR9YMoXhbpIDWXxKr6TyNkANuRiJvhkJILx7mWSrw=";
|
||||
hash = "sha256-fqBg0IHwREkDOEPIxMVBCcGH8dSyKIkOeYga3Jc+qQs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.104.3";
|
||||
version = "2.105.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1C5+h1w6ACYmzDjgeS7Xvy/xBQnrpEmLJAhNq9bVs4k=";
|
||||
hash = "sha256-EiyvAVFEC/hVPTagV4CsyrMRyc89cEzG2NIS2nJg+NU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatv";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "postlund";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2hRpjv9Yf4vpkZCYh2W0Lt6AlaO/RfpW3tNiovkwOnU=";
|
||||
hash = "sha256-7jXxnZLruwNzYVOn3c+YlF2olwezwjpwXInDem44/vE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Mo28QpPJqfzzb/bq4W+OUcyptWCaLJSon99VdJ9Ss80=";
|
||||
hash = "sha256-Xvwu4Npt9mCmeiQAqj8+s3bHnLBs1o595zdfkjnyaUc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.56";
|
||||
version = "9.2.57";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8F33AoKh79tgly4gbvoUswjv49KzNYDh/xsh4viIcWM=";
|
||||
hash = "sha256-UM4/ZDV6S/YVhrViUgv4w6U37ktgwxn/wuCK+weBtBs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,13 +5,14 @@
|
||||
, promise
|
||||
, python-socketio
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, websockets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tago";
|
||||
version = "3.0.0";
|
||||
version = "3.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,10 +20,16 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "tago-io";
|
||||
repo = "tago-sdk-python";
|
||||
rev = version;
|
||||
hash = "sha256-eu6n83qmo1PQKnR/ellto04xi/3egl+LSKMOG277X1k=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-q1xcPF+oeQsCAZjeYTVY2aaKFmb8rCTWVikGxdpPQ28=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
promise
|
||||
@@ -41,6 +48,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python module for interacting with Tago.io";
|
||||
homepage = "https://github.com/tago-io/tago-sdk-python";
|
||||
changelog = "https://github.com/tago-io/tago-sdk-python/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, python-socketio
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, requests-mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tagoio-sdk";
|
||||
version = "4.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tago-io";
|
||||
repo = "sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GHjkw7B/T+XZ3F3XCI0INpx9NWjORr0lbuGse/W25wY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"requests"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
python-dateutil
|
||||
python-socketio
|
||||
requests
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
requests-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tagoio_sdk"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for interacting with Tago.io";
|
||||
homepage = "https://github.com/tago-io/sdk-python";
|
||||
changelog = "https://github.com/tago-io/sdk-python/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dbmate";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amacneil";
|
||||
repo = "dbmate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EwGyRDgd9di1gjefq9G3u+lVD2XEfdCULuLhtDAFDkY=";
|
||||
hash = "sha256-s3J5Mf+eCChIGmm89nq1heoJKscCA9nINGAGe0/qxaI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t5GPbDBwq92erEpbkfIc/RMWkDr6Mb4oQ4BWmhCLrSc=";
|
||||
vendorHash = "sha256-ohSwDFisNXnq+mqGD2v4X58lumHvpyTyJxME418GSMY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strace";
|
||||
version = "6.3";
|
||||
version = "6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-4Xh44wFQbBzDAWERGK0U7+5/i872Oyes5dKQrM57tzE=";
|
||||
sha256 = "sha256-J5h9usV/39JgxttNyDKN81yVxoZ8ij1DcdWc3PTrkjg=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rain";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l+iTQo5rLb+IYQ3DLugnLAw/q3pO5dh0Et8Ha3HCK+4=";
|
||||
sha256 = "sha256-j+7SjmDhLoMUoUv5mtCpsLo8BgAeuQiLhOJ1EFqbtmQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n1Hxd2SE8JhLqII+neOzeB94KQ7b/Gm1kXCtP8AuWYk=";
|
||||
|
||||
@@ -1,20 +1,22 @@
|
||||
{ lib, rustPlatform, fetchCrate }:
|
||||
{ lib, rustPlatform, fetchFromSourcehut }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-depgraph";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-D8g6xsmYvN1IWUFpkpo4/OKT70WqCCkRqcGFBOE8uXA=";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~jplatte";
|
||||
repo = "cargo-depgraph";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q9a7O6lSsQz9nJ82uG1oNyNyNebzXEanVWh3xkypqqM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qpd/uvnQzrPc+dbBloxyYNCEjaRWlTicgNC8Z9Z0t88=";
|
||||
cargoHash = "sha256-gmSNYxyizaVvz38R0nTdUp9nP/f4hxgHO9hVV3RFP6U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz";
|
||||
homepage = "https://sr.ht/~jplatte/cargo-depgraph";
|
||||
changelog = "https://git.sr.ht/~jplatte/cargo-depgraph/tree/v${version}/item/CHANGELOG.md";
|
||||
changelog = "https://git.sr.ht/~jplatte/cargo-depgraph/tree/${src.rev}/item/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tf2pulumi";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "tf2pulumi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4sEsWMkGRpB3gMGUOPh7n/nNwEp+ErKQK0qcT5ImaZ4=";
|
||||
sha256 = "sha256-i6nK1AEnQY47ro6tNDBExdcb9WvltY/21FVrVaiSTvo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wsgNrDnFXbpanEULEjf6OxOeMYmWzjE7vpVUB/UFNp8=";
|
||||
vendorHash = "sha256-x7GAkbvhML2VUQ9/zitrTBBiy9lISb3iTx6yn5WbEig=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X=github.com/pulumi/tf2pulumi/version.Version=${src.rev}"
|
||||
|
||||
@@ -20,22 +20,22 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "displaylink";
|
||||
version = "5.6.1-59.184";
|
||||
version = "5.7.0-61.129";
|
||||
|
||||
src = requireFile rec {
|
||||
name = "displaylink-561.zip";
|
||||
sha256 = "1hihsz35ccydzx04r8r9kz0hvqwj5fgr8zpzvwyhfxp2m549f9w9";
|
||||
name = "displaylink-570.zip";
|
||||
sha256 = "807f1c203ac1e71c6f1f826493b9bb32e277f07cb2cf48537bf8cfdc68dd1515";
|
||||
message = ''
|
||||
In order to install the DisplayLink drivers, you must first
|
||||
comply with DisplayLink's EULA and download the binaries and
|
||||
sources from here:
|
||||
|
||||
https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.6.1
|
||||
https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.7
|
||||
|
||||
Once you have downloaded the file, please use the following
|
||||
commands and re-run the installation:
|
||||
|
||||
mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.6.1-EXE.zip" \$PWD/${name}
|
||||
mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.7-EXE.zip" \$PWD/${name}
|
||||
nix-prefetch-url file://\$PWD/${name}
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Electrical power consumption metrology agent";
|
||||
homepage = "https://github.com/hubblo-org/scaphandre";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
platforms = with platforms; [ "x86_64-linux"];
|
||||
maintainers = with maintainers; [ gaelreyrol ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,26 +10,45 @@
|
||||
, libevent
|
||||
, ncurses
|
||||
, ruby
|
||||
, msgpack
|
||||
, msgpack-c
|
||||
, libssh
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "tmate-ssh-server";
|
||||
version = "unstable-2021-10-17";
|
||||
version = "unstable-2023-06-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmate-io";
|
||||
repo = "tmate-ssh-server";
|
||||
rev = "1f314123df2bb29cb07427ed8663a81c8d9034fd";
|
||||
sha256 = "sha256-9/xlMvtkNWUBRYYnJx20qEgtEcjagH2NtEKZcDOM1BY=";
|
||||
rev = "d7334ee4c3c8036c27fb35c7a24df3a88a15676b";
|
||||
sha256 = "sha256-V3p0vagt13YjQPdqpbSatx5DnIEXL4t/kfxETSFYye0=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace 'msgpack >= 1.2.0' 'msgpack-c >= 1.2.0'
|
||||
'';
|
||||
|
||||
buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ];
|
||||
nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libtool
|
||||
zlib
|
||||
openssl
|
||||
libevent
|
||||
ncurses
|
||||
ruby
|
||||
msgpack-c
|
||||
libssh
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
passthru.tests.tmate-ssh-server = nixosTests.tmate-ssh-server;
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "unstable-2023-05-19";
|
||||
version = "unstable-2023-06-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "d867bf17e6d2f9a7c83c9a1ffafda5184a24c0e3";
|
||||
sha256 = "sha256-W7/8/3FzwErPkRlfuyqajova6LRKarANPtc6L/z20CI=";
|
||||
rev = "da7c30291dcf53cc5b3d98f9aada5615cd1593a9";
|
||||
sha256 = "sha256-kbNw/YgcBZNkmn2nmsnEnc9Y8MJg3zGFdW1x9GIo+dM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
jinja2
|
||||
lxml
|
||||
pygments
|
||||
pytomlpp
|
||||
pyyaml
|
||||
redis
|
||||
uvloop
|
||||
@@ -50,6 +51,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# Create a symlink for easier access to static data
|
||||
mkdir -p $out/share
|
||||
ln -s ../${python3.sitePackages}/searx/static $out/share/
|
||||
|
||||
# copy config schema for the limiter
|
||||
cp searx/botdetection/limiter.toml $out/${python3.sitePackages}/searx/botdetection/limiter.toml
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -39,11 +39,6 @@ python3Packages.buildPythonApplication rec {
|
||||
"--prefix PYTHONPATH : ${placeholder "out"}/lib/${python3Packages.python.libPrefix}/site-packages"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/xonsh \
|
||||
$makeWrapperArgs
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# fails on sandbox
|
||||
"test_colorize_file"
|
||||
|
||||
@@ -4,13 +4,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pure-prompt";
|
||||
version = "1.21.0";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sindresorhus";
|
||||
repo = "pure";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YfasTKCABvMtncrfoWR1Su9QxzCqPED18/BTXaJHttg=";
|
||||
sha256 = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
Generated
+8
-8
@@ -4595,7 +4595,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uk-content"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"indexmap",
|
||||
@@ -4632,7 +4632,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uk-editor"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"eframe",
|
||||
@@ -4659,7 +4659,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uk-manager"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"anyhow_ext",
|
||||
@@ -4697,7 +4697,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uk-mod"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"anyhow_ext",
|
||||
@@ -4738,7 +4738,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uk-reader"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"anyhow_ext",
|
||||
@@ -4763,7 +4763,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uk-ui"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"catppuccin-egui",
|
||||
"color-hex",
|
||||
@@ -4796,14 +4796,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uk-util"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ukmm"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"anyhow_ext",
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ukmm";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NiceneNerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cdbwb+YHAjGI8Sshb5dxHiCrm7QvLXRqkpEWJdvBA2Y=";
|
||||
hash = "sha256-suxUiJ++39aJe5XmAqh5sQajLzYoXo06k9mYw9rLU9E=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -33,7 +33,7 @@ xorg,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.37.0";
|
||||
version = "1.38.0";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
@@ -82,7 +82,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
|
||||
sha256 = "sha256-SeglhwIKsxhmhA3rNcg6paSBwlB4a4Aiq9L2DFR9/d4=";
|
||||
sha256 = "sha256-bTt4gdkKaR8OESzPwUHZ9C21uf/Lcy/eSya2oeAtgNA=";
|
||||
}
|
||||
else
|
||||
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -1,7 +1,20 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config
|
||||
, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, cmake
|
||||
, libtool
|
||||
, pkg-config
|
||||
, zlib
|
||||
, openssl
|
||||
, libevent
|
||||
, ncurses
|
||||
, ruby
|
||||
, msgpack-c
|
||||
, libssh
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "tmate";
|
||||
version = "unstable-2022-08-07";
|
||||
|
||||
@@ -12,10 +25,29 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-t96gfmAMcsjkGf8pvbEx2fNx4Sj3W6oYoQswB3Dklb8=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace 'msgpack >= 1.1.0' 'msgpack-c >= 1.1.0'
|
||||
'';
|
||||
|
||||
buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ];
|
||||
nativeBuildInputs = [ autoreconfHook cmake pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libtool
|
||||
zlib
|
||||
openssl
|
||||
libevent
|
||||
ncurses
|
||||
ruby
|
||||
msgpack-c
|
||||
libssh
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tmate.io/";
|
||||
|
||||
@@ -409,7 +409,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
|
||||
]
|
||||
examples = (
|
||||
'<div class="list-of-examples">'
|
||||
'<p><strong>List of Examples</strong><p>'
|
||||
'<p><strong>List of Examples</strong></p>'
|
||||
f'<dl>{"".join(examples_entries)}</dl>'
|
||||
'</div>'
|
||||
)
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, lib
|
||||
, nettle
|
||||
, nix-update-script
|
||||
, installShellFiles
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sequoia-sqop";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sequoia-pgp";
|
||||
# From some reason the repository is not sequoia-sqop - like the command
|
||||
# generated etc
|
||||
repo = "sequoia-sop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4A0eZMXzFtojRD5cXQQUVoS32sQ2lWtFll+q6yhnwG4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gH5WM+PmciViD+eFVlp8tzdc0KdYy1WZLQi92UEWVG4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nettle
|
||||
];
|
||||
buildFeatures = [ "cli" ];
|
||||
|
||||
# Install manual pages
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/man
|
||||
cp -r man-sqop $out/share/man/man1
|
||||
installShellCompletion --cmd sqop \
|
||||
--bash target/*/release/build/sequoia-sop*/out/sqop.bash \
|
||||
--fish target/*/release/build/sequoia-sop*/out/sqop.fish \
|
||||
--zsh target/*/release/build/sequoia-sop*/out/_sqop
|
||||
# Also elv and powershell are generated there
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "An implementation of the Stateless OpenPGP Command Line Interface using Sequoia";
|
||||
homepage = "https://docs.sequoia-pgp.org/sqop/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
mainProgram = "sqop";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, lib
|
||||
, nettle
|
||||
, nix-update-script
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sequoia-sqv";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sequoia-pgp";
|
||||
repo = "sequoia-sqv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KoB9YnPNE2aB5MW5G9r6Bk+1QnANVSKA2dp3ufSJ44M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uwOU/yyh3eoD10El7Oe9E97F3dvPuXMHQhpnWEJ1gnI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nettle
|
||||
];
|
||||
# Otherwise, the shell completion files are not built
|
||||
cargoBuildFlags = [
|
||||
"--package" "sequoia-sqv"
|
||||
];
|
||||
# Use a predictable target directory, to access it when installing shell
|
||||
# completion files.
|
||||
preBuild = ''
|
||||
export CARGO_TARGET_DIR="$(pwd)/target"
|
||||
'';
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd sqv \
|
||||
--zsh target/_sqv \
|
||||
--bash target/sqv.bash \
|
||||
--fish target/sqv.fish
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line OpenPGP signature verification tool";
|
||||
homepage = "https://docs.sequoia-pgp.org/sqv/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
mainProgram = "sqv";
|
||||
};
|
||||
}
|
||||
@@ -12449,6 +12449,10 @@ with pkgs;
|
||||
|
||||
sequoia-sq = callPackage ../tools/security/sequoia-sq { };
|
||||
|
||||
sequoia-sqv = callPackage ../tools/security/sequoia-sqv { };
|
||||
|
||||
sequoia-sqop = callPackage ../tools/security/sequoia-sqop { };
|
||||
|
||||
sequoia-chameleon-gnupg = callPackage ../tools/security/sequoia-chameleon-gnupg { };
|
||||
|
||||
sewer = callPackage ../tools/admin/sewer { };
|
||||
@@ -36800,6 +36804,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
devilutionx = callPackage ../games/devilutionx {
|
||||
fmt = fmt_9;
|
||||
SDL2 = SDL2.override {
|
||||
withStatic = true;
|
||||
};
|
||||
@@ -38937,9 +38942,7 @@ with pkgs;
|
||||
gap-full = lowPrio (gap.override { packageSet = "full"; });
|
||||
|
||||
geogebra = callPackage ../applications/science/math/geogebra { };
|
||||
geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix {
|
||||
electron = electron_14;
|
||||
};
|
||||
geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { };
|
||||
|
||||
maxima = callPackage ../applications/science/math/maxima {
|
||||
lisp-compiler = sbcl;
|
||||
@@ -40621,7 +40624,9 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
|
||||
};
|
||||
|
||||
spdlog = callPackage ../development/libraries/spdlog { };
|
||||
spdlog = callPackage ../development/libraries/spdlog {
|
||||
fmt = fmt_9;
|
||||
};
|
||||
|
||||
dart = callPackage ../development/compilers/dart { };
|
||||
|
||||
|
||||
@@ -56,8 +56,6 @@ let
|
||||
|
||||
awa = callPackage ../development/ocaml-modules/awa { mtime = mtime_1; };
|
||||
|
||||
awa-lwt = callPackage ../development/ocaml-modules/awa/lwt.nix { mtime = mtime_1; };
|
||||
|
||||
awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { mtime = mtime_1; };
|
||||
|
||||
### B ###
|
||||
|
||||
@@ -12012,6 +12012,8 @@ self: super: with self; {
|
||||
|
||||
tago = callPackage ../development/python-modules/tago { };
|
||||
|
||||
tagoio-sdk = callPackage ../development/python-modules/tagoio-sdk { };
|
||||
|
||||
tahoma-api = callPackage ../development/python-modules/tahoma-api { };
|
||||
|
||||
tailer = callPackage ../development/python-modules/tailer { };
|
||||
|
||||
Reference in New Issue
Block a user