mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 12:23:02 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
85f6ef0ee9
@ -8,6 +8,7 @@
|
||||
# derivation like fetchurl is allowed to do so since its result is
|
||||
# by definition pure.
|
||||
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
|
||||
"HTTP_PROXY" "HTTPS_PROXY" "FTP_PROXY" "ALL_PROXY" "NO_PROXY"
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
@ -814,6 +814,7 @@ with lib.maintainers; {
|
||||
aanderse
|
||||
drupol
|
||||
ma27
|
||||
patka
|
||||
talyz
|
||||
];
|
||||
githubTeams = [
|
||||
|
||||
@ -687,7 +687,7 @@ in {
|
||||
authentication = {
|
||||
mode = mkOption {
|
||||
default = "wpa3-sae";
|
||||
type = types.enum ["none" "wpa2-sha256" "wpa3-sae-transition" "wpa3-sae"];
|
||||
type = types.enum ["none" "wpa2-sha1" "wpa2-sha256" "wpa3-sae-transition" "wpa3-sae"];
|
||||
description = ''
|
||||
Selects the authentication mode for this AP.
|
||||
|
||||
@ -695,7 +695,9 @@ in {
|
||||
and create an open AP. Use {option}`settings` together with this option if you
|
||||
want to configure the authentication manually. Any password options will still be
|
||||
effective, if set.
|
||||
- {var}`"wpa2-sha256"`: WPA2-Personal using SHA256 (IEEE 802.11i/RSN). Passwords are set
|
||||
- {var}`"wpa2-sha1"`: Not recommended. WPA2-Personal using HMAC-SHA1. Passwords are set
|
||||
using {option}`wpaPassword` or preferably by {option}`wpaPasswordFile` or {option}`wpaPskFile`.
|
||||
- {var}`"wpa2-sha256"`: WPA2-Personal using HMAC-SHA256 (IEEE 802.11i/RSN). Passwords are set
|
||||
using {option}`wpaPassword` or preferably by {option}`wpaPasswordFile` or {option}`wpaPskFile`.
|
||||
- {var}`"wpa3-sae-transition"`: Use WPA3-Personal (SAE) if possible, otherwise fallback
|
||||
to WPA2-SHA256. Only use if necessary and switch to the newer WPA3-SAE when possible.
|
||||
@ -812,7 +814,7 @@ in {
|
||||
Warning: These entries will get put into a world-readable file in
|
||||
the Nix store! Using {option}`saePasswordFile` instead is recommended.
|
||||
|
||||
Not used when {option}`mode` is {var}`"wpa2-sha256"`.
|
||||
Not used when {option}`mode` is {var}`"wpa2-sha1"` or {var}`"wpa2-sha256"`.
|
||||
'';
|
||||
type = types.listOf (types.submodule {
|
||||
options = {
|
||||
@ -884,7 +886,7 @@ in {
|
||||
parameters doesn't matter:
|
||||
`<password>[|mac=<peer mac>][|vlanid=<VLAN ID>][|pk=<m:ECPrivateKey-base64>][|id=<identifier>]`
|
||||
|
||||
Not used when {option}`mode` is {var}`"wpa2-sha256"`.
|
||||
Not used when {option}`mode` is {var}`"wpa2-sha1"` or {var}`"wpa2-sha256"`.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -959,6 +961,9 @@ in {
|
||||
} // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae-transition") {
|
||||
wpa = 2;
|
||||
wpa_key_mgmt = "WPA-PSK-SHA256 SAE";
|
||||
} // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha1") {
|
||||
wpa = 2;
|
||||
wpa_key_mgmt = "WPA-PSK";
|
||||
} // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha256") {
|
||||
wpa = 2;
|
||||
wpa_key_mgmt = "WPA-PSK-SHA256";
|
||||
@ -1186,8 +1191,8 @@ in {
|
||||
message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option'';
|
||||
}
|
||||
{
|
||||
assertion = auth.mode == "wpa2-sha256" -> countWpaPasswordDefinitions == 1;
|
||||
message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-SHA256 which requires defining a wpa password option'';
|
||||
assertion = (auth.mode == "wpa2-sha1" || auth.mode == "wpa2-sha256") -> countWpaPasswordDefinitions == 1;
|
||||
message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option'';
|
||||
}
|
||||
])
|
||||
radioCfg.networks))
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, appimageTools, pkgs }:
|
||||
{ lib, fetchurl, appimageTools }:
|
||||
|
||||
let
|
||||
pname = "plexamp";
|
||||
@ -16,9 +16,6 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
|
||||
install -m 444 -D ${appimageContents}/plexamp.png \
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib, appimageTools, fetchurl, makeDesktopItem
|
||||
}:
|
||||
{ lib, appimageTools, fetchurl, makeDesktopItem }:
|
||||
|
||||
let
|
||||
pname = "MyCrypto";
|
||||
@ -24,12 +23,9 @@ let
|
||||
categories = [ "Finance" ];
|
||||
};
|
||||
|
||||
in appimageTools.wrapType2 rec {
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
multiArch = false; # no p32bit needed
|
||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share
|
||||
cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons
|
||||
|
||||
@ -839,6 +839,10 @@
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
};
|
||||
|
||||
luasnip = super.luasnip.overrideAttrs {
|
||||
dependencies = with self; [ luaPackages.jsregexp ];
|
||||
};
|
||||
|
||||
magma-nvim-goose = buildVimPlugin {
|
||||
pname = "magma-nvim-goose";
|
||||
version = "2023-03-13";
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flycast";
|
||||
version = "2.3";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o1Xnyts2+A3ZkzVN0o8E5nGPo2c2vYltMlHF4LZMppU=";
|
||||
sha256 = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader];
|
||||
extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/{applications,pixmaps}
|
||||
|
||||
@ -28,9 +28,7 @@ appimageTools.wrapAppImage rec {
|
||||
# taken from
|
||||
# https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6
|
||||
|
||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
|
||||
p.glib
|
||||
];
|
||||
extraPkgs = pkgs: [ pkgs.glib ];
|
||||
|
||||
# Also expose the udev rules here, so it can be used as:
|
||||
# services.udev.packages = [ pkgs.bazecor ];
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/pixmaps
|
||||
|
||||
@ -14,7 +14,7 @@ in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname src version;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ R zlib libusb-compat-0_1 ];
|
||||
extraPkgs = pkgs: [ pkgs.R pkgs.zlib pkgs.libusb-compat-0_1 ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${pname} $out/bin/GoldenCheetah
|
||||
|
||||
@ -49,8 +49,6 @@ let
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||
extraInstallCommands = ''
|
||||
source "${makeWrapper}/nix-support/setup-hook"
|
||||
wrapProgram $out/bin/${pname} \
|
||||
|
||||
@ -20,11 +20,7 @@ appimageTools.wrapType2 rec {
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
|
||||
p.libsecret
|
||||
p.xorg.libxkbfile
|
||||
];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret pkgs.xorg.libxkbfile ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop
|
||||
|
||||
@ -13,7 +13,7 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
|
||||
@ -13,8 +13,6 @@ let
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
|
||||
@ -24,8 +22,8 @@ appimageTools.wrapType2 rec {
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ];
|
||||
extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
|
||||
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \
|
||||
|
||||
@ -48,8 +48,6 @@ let
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
multiPkgs = null; # no 32bit needed
|
||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||
extraInstallCommands = ''
|
||||
install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications
|
||||
install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgmodeler";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmodeler";
|
||||
repo = "pgmodeler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-urKAsuYmK8dsXhP+I7p27PXXYRapPtkI8FqARfLwnEw=";
|
||||
sha256 = "sha256-LDgRv7Todyy2pnE21Z0O5JQ6mE4ZO3THv6rfEWU66Cc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
|
||||
|
||||
@ -22,9 +22,7 @@ in appimageTools.wrapAppImage {
|
||||
inherit pname version;
|
||||
src = appimageContents;
|
||||
|
||||
extraPkgs = { pkgs, ... }@args: [
|
||||
pkgs.hidapi
|
||||
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
|
||||
extraPkgs = pkgs: [ pkgs.hidapi ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
# Add desktop convencience stuff
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage, texliveMedium }:
|
||||
{ callPackage }:
|
||||
|
||||
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) {
|
||||
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||
zettlr = {
|
||||
version = "3.0.2";
|
||||
hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";
|
||||
|
||||
@ -4,8 +4,6 @@
|
||||
, appimageTools
|
||||
, lib
|
||||
, fetchurl
|
||||
, texliveMedium
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
@ -21,8 +19,8 @@ in
|
||||
appimageTools.wrapType2 rec {
|
||||
inherit pname version src;
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ];
|
||||
extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
|
||||
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
|
||||
|
||||
@ -17,9 +17,6 @@ appimageTools.wrapType2 rec {
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sylk WebRTC client";
|
||||
homepage = "https://sylkserver.com/";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,10 +3,10 @@
|
||||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "125.0.3";
|
||||
version = "126.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "18e705a3093290311ccb5f27f01e43fe243ece94c1769a9ccc4fa53d370e32a1ec6a107cdeb531e9468b9aca1a1fe668161adb7acc1ec65fd383837882c7d484";
|
||||
sha512 = "56025b051d544ca294911a1d6a66f09945f71012131881b64313dafb579730810a4b091950c90a21d4fd3f393ba23670d8409086e1677d80d0bbbe347c303527";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
@ -94,11 +94,11 @@
|
||||
|
||||
firefox-esr-115 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-115";
|
||||
version = "115.10.0esr";
|
||||
version = "115.11.0esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "0626e2c68ce43f24dfc2b9216e2565537ad8781daf4195d53420e1b78d57d0f6360fbe56b0ddbedae3818546c72472c85c1ff2b208c123d32a0543e666f42b65";
|
||||
sha512 = "0f3a87c99fb008088afd509d9259f893fdd44ea6bf6a5e69806fefb8d355415e81b9e8832a392acb9d0c1c50e4add7f1362a4aaadc35e1d9c2e55baf7136aed8";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -16,8 +16,7 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname src version;
|
||||
|
||||
multiArch = false;
|
||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
||||
extraPkgs = pkgs: [ pkgs.bash ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hubble";
|
||||
version = "0.13.3";
|
||||
version = "0.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tHkLUoccOUcUjODecy1QyeuDb/aXv67sK8JHJ1IspC8=";
|
||||
sha256 = "sha256-YordxRIZtlYQprAYnH9Qn5ha6y7D52sjEOaRTcd0Z8g=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.21.2";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
hash = "sha256-U0SCjozy968pcXMGyUgM47VGYYNwPq8wOzTnKp49ZY4=";
|
||||
hash = "sha256-xiIuCwzERvy7HFx9CZHen1tz1nwsTMryq5hB0om2dyo=";
|
||||
};
|
||||
vendorHash = "sha256-23t1xJPRip0ojXmUl1qlk6QJsYHT+9EAS080m6c0d6U=";
|
||||
vendorHash = "sha256-de9cPm2MuflsOhFZfZmvZpLYiwt3UBgW+MO1Z2QB4F4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }:
|
||||
{ pname, version, src, meta, appimageTools, makeWrapper }:
|
||||
let
|
||||
|
||||
name = "${pname}-${version}";
|
||||
@ -25,5 +25,5 @@ appimageTools.wrapType2 {
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
extraPkgs = _: [ nss_latest ];
|
||||
extraPkgs = pkgs: [ pkgs.nss_latest ];
|
||||
}
|
||||
|
||||
@ -15,9 +15,9 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minikube";
|
||||
version = "1.33.0";
|
||||
version = "1.33.1";
|
||||
|
||||
vendorHash = "sha256-eFIo9C9AEZksQolMlWKPJR2WWpU7Yu4eJb1OBwdqGhI=";
|
||||
vendorHash = "sha256-VHl6CKPWqahX70GHbZE6SVa8XPfiC912DvsOteH2B0w=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
owner = "kubernetes";
|
||||
repo = "minikube";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4OSChPgUD1oYnChAi7r2jgZpplR9ZaHpHPiTS6jSpME=";
|
||||
sha256 = "sha256-z0wNngEzddxpeeLyQVA2yRC5SfYvU5G66V95sVmW6bA=";
|
||||
};
|
||||
postPatch =
|
||||
(
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gnmic";
|
||||
version = "0.36.2";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openconfig";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PUOIKPkzM6riiXR8R1Io0QI/qr6HaexfFgbp2Hx2SOo=";
|
||||
hash = "sha256-PktDdwtdCHLgLVpCRLi+Rna7dO2JeAAT6myFesIhpYc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zrG/rNoYtfVNN50g41txLQIcBAKi1yE5p1TODrDiXzU=";
|
||||
vendorHash = "sha256-gxtVvh39VqJgS5VetnLpUyKJE8DcUZgn4MA8zdD/ccU=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
, libsecret
|
||||
, makeWrapper
|
||||
, writeShellApplication
|
||||
, curl
|
||||
@ -19,7 +18,7 @@ let
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit version pname src;
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
{ fetchurl
|
||||
, appimageTools
|
||||
, xorg
|
||||
, pname
|
||||
@ -27,8 +26,6 @@ in
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share
|
||||
"${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share"
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "rambox";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
|
||||
hash = "sha256-fSj/AX1uCUAC3Vg5+rtGF3IDPFTHRAgJ8CPVL8BYc+E=";
|
||||
hash = "sha256-9AGzhj4UL2rEe67qvkX5VYhQEMETGYSDWv5XOgABSEE=";
|
||||
};
|
||||
|
||||
desktopItem = (makeDesktopItem {
|
||||
@ -30,7 +30,7 @@ appimageTools.wrapType2 {
|
||||
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ procps ];
|
||||
extraPkgs = pkgs: [ pkgs.procps ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Workspace Simplifier - a cross-platform application organizing web services into Workspaces similar to browser profiles";
|
||||
|
||||
@ -16,7 +16,7 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ at-spi2-core ];
|
||||
extraPkgs = pkgs: [ pkgs.at-spi2-core ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ appimageTools, lib, fetchurl, libsecret }:
|
||||
{ appimageTools, lib, fetchurl }:
|
||||
|
||||
let
|
||||
pname = "electron-mail";
|
||||
@ -20,9 +20,9 @@ in appimageTools.wrapType2 {
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
libsecret
|
||||
libappindicator-gtk3
|
||||
extraPkgs = pkgs: [
|
||||
pkgs.libsecret
|
||||
pkgs.libappindicator-gtk3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -12,7 +12,7 @@ appimageTools.wrapType2 rec {
|
||||
hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands =
|
||||
let appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
||||
@ -19,22 +19,11 @@
|
||||
, lame
|
||||
, pixman
|
||||
, libjpeg_turbo
|
||||
, _experimental-update-script-combinators
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.9.25.1";
|
||||
patchedXrdpSrc = applyPatches {
|
||||
patches = [ ./dynamic_config.patch ];
|
||||
name = "xrdp-patched-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neutrinolabs";
|
||||
repo = "xrdp";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-oAs0oWkCyj3ObdJuHLfT25ZzkTrxNAXDiFU64OOP4Ow=";
|
||||
};
|
||||
};
|
||||
|
||||
xorgxrdp = stdenv.mkDerivation rec {
|
||||
pname = "xorgxrdp";
|
||||
version = "0.9.20";
|
||||
@ -62,16 +51,29 @@ let
|
||||
|
||||
preConfigure = "./bootstrap";
|
||||
|
||||
configureFlags = [ "XRDP_CFLAGS=-I${patchedXrdpSrc}/common" ];
|
||||
configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
};
|
||||
|
||||
xrdp = stdenv.mkDerivation {
|
||||
inherit version;
|
||||
xrdp = stdenv.mkDerivation rec {
|
||||
pname = "xrdp";
|
||||
version = "0.9.25.1";
|
||||
|
||||
src = patchedXrdpSrc;
|
||||
src = applyPatches {
|
||||
inherit version;
|
||||
patches = [ ./dynamic_config.patch ];
|
||||
name = "xrdp-patched-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neutrinolabs";
|
||||
repo = "xrdp";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-oAs0oWkCyj3ObdJuHLfT25ZzkTrxNAXDiFU64OOP4Ow=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ];
|
||||
|
||||
@ -150,6 +152,15 @@ let
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
inherit xorgxrdp;
|
||||
updateScript = _experimental-update-script-combinators.sequence (map (item: item.command) [
|
||||
(gitUpdater { rev-prefix = "v"; attrPath = "xrdp.src"; ignoredVersions = [ "beta" ]; })
|
||||
{ command = ["rm" "update-git-commits.txt"]; }
|
||||
(gitUpdater { rev-prefix = "v"; attrPath = "xrdp.xorgxrdp"; })
|
||||
]);
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open source RDP server";
|
||||
homepage = "https://github.com/neutrinolabs/xrdp";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, nix-update-script
|
||||
, pulseaudio
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, nixosTests
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
tests = {
|
||||
inherit (nixosTests) xrdp-with-audio-pulseaudio;
|
||||
};
|
||||
|
||||
@ -19,8 +19,6 @@ in appimageTools.wrapType2 rec {
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
multiArch = false;
|
||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop
|
||||
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "homebank";
|
||||
version = "5.7.4";
|
||||
version = "5.8";
|
||||
src = fetchurl {
|
||||
url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
|
||||
hash = "sha256-Qs5xRsh16gyjyTORtqm/RxTbRiHGP0oJTcxviYW7VOQ=";
|
||||
hash = "sha256-tgjcz4znnw++5lBoJDWtHKpRFENfM0xBpyhGf8nAACw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
, libsecret
|
||||
}:
|
||||
|
||||
let
|
||||
@ -19,9 +18,7 @@ let
|
||||
in appimageTools.wrapType2 rec {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
libsecret
|
||||
];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop
|
||||
|
||||
@ -31,8 +31,6 @@ in appimageTools.wrapType2 rec {
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
multiArch = false; # no 32bit needed
|
||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||
extraInstallCommands = ''
|
||||
mkdir "$out/share"
|
||||
ln -s "${desktopItem}/share/applications" "$out/share/"
|
||||
|
||||
@ -1,20 +1,47 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, coreutils, perlPackages, bicpl, libminc, zlib, minc_tools,
|
||||
makeWrapper }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
coreutils,
|
||||
perlPackages,
|
||||
bicpl,
|
||||
libminc,
|
||||
zlib,
|
||||
minc_tools,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conglomerate";
|
||||
version = "unstable-2017-09-10";
|
||||
version = "unstable-2023-01-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BIC-MNI";
|
||||
repo = pname;
|
||||
rev = "7343238bc6215942c7ecc885a224f24433a291b0";
|
||||
sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr";
|
||||
owner = "BIC-MNI";
|
||||
repo = pname;
|
||||
rev = "6fb26084f2871a85044e2e4afc868982702b40ed";
|
||||
hash = "sha256-Inr4b2bxguzkcRQBURObsQQ0Rb3H/Zz6hEzNRd+IX3w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [ libminc zlib bicpl ];
|
||||
propagatedBuildInputs = [ coreutils minc_tools ] ++ (with perlPackages; [ perl GetoptTabular MNI-Perllib ]);
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
libminc
|
||||
zlib
|
||||
bicpl
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
[
|
||||
coreutils
|
||||
minc_tools
|
||||
]
|
||||
++ (with perlPackages; [
|
||||
perl
|
||||
GetoptTabular
|
||||
MNI-Perllib
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBMINC_DIR=${libminc}/lib/cmake"
|
||||
@ -23,15 +50,20 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postFixup = ''
|
||||
for p in $out/bin/*; do
|
||||
wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${lib.makeBinPath [ coreutils minc_tools ]}";
|
||||
wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
minc_tools
|
||||
]
|
||||
}";
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/BIC-MNI/conglomerate";
|
||||
description = "More command-line utilities for working with MINC files";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.hpndUc;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.hpndUc;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitsign";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WaiGkbjqty/MsTWPvx5DmmaNwWTJAEFKwVqArt2oZZc=";
|
||||
hash = "sha256-JNCz5MVqn8PeTfYUVowIVZwtpfD+Gx9yBckter6PfXA=";
|
||||
};
|
||||
vendorHash = "sha256-p2E010k7uozpLvl9VpfG5/JyQR4mVUBKv2p78UdFlac=";
|
||||
vendorHash = "sha256-QW+ZWYEXkhSQR4HvmPLENzY/VEfjEX43mBPhmhsEBMI=";
|
||||
|
||||
subPackages = [
|
||||
"."
|
||||
|
||||
@ -15,9 +15,7 @@ appimageTools.wrapAppImage rec {
|
||||
};
|
||||
|
||||
# At runtime, Lbry likes to have access to Ffmpeg
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
ffmpeg
|
||||
];
|
||||
extraPkgs = pkgs: [ pkgs.ffmpeg ];
|
||||
|
||||
# General fixup
|
||||
extraInstallCommands = ''
|
||||
|
||||
@ -29,8 +29,6 @@ appimageTools.wrapType2 {
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
|
||||
extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps;
|
||||
|
||||
extraInstallCommands = ''
|
||||
(
|
||||
mkdir -p $out/share
|
||||
|
||||
@ -40,7 +40,7 @@ rec {
|
||||
|
||||
wrapAppImage = args@{
|
||||
src,
|
||||
extraPkgs,
|
||||
extraPkgs ? pkgs: [ ],
|
||||
meta ? {},
|
||||
...
|
||||
}: buildFHSEnv
|
||||
|
||||
@ -13,8 +13,7 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
|
||||
++ [ pkgs.libsecret ];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
|
||||
@ -23,7 +23,7 @@ appimageTools.wrapType2 {
|
||||
substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
|
||||
'';
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source electronics prototyping platform";
|
||||
|
||||
@ -16,7 +16,7 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname src version;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ];
|
||||
extraPkgs = pkgs: [ pkgs.libthai ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications
|
||||
|
||||
@ -14,8 +14,7 @@ let
|
||||
in appimageTools.wrapType2 rec {
|
||||
inherit name pname src;
|
||||
|
||||
multiArch = false;
|
||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ];
|
||||
extraPkgs = pkgs: [ pkgs.glib ];
|
||||
|
||||
# Also expose the udev rules here, so it can be used as:
|
||||
# services.udev.packages = [ pkgs.chrysalis ];
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dumbpipe";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pvAB3kvnyNZ6N7bC8NIaSNUxcn9AfpEozYcczA+5zmc=";
|
||||
hash = "sha256-NaN3r4Vk4SCdgfFgtyCgeMOyOCfxj15vLrXRmUKTAWM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aHuRG1mLb18bra/iTddU3B4XjS5shheBqW1Hs+QMcJs=";
|
||||
cargoHash = "sha256-Efuif2fIP20tXCq7bpa/n1lthvi0jcyYCpWM//qEHCY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
|
||||
@ -62,9 +62,6 @@ if stdenv.isDarwin then stdenv.mkDerivation
|
||||
else appimageTools.wrapType2 {
|
||||
inherit pname version src meta;
|
||||
|
||||
extraPkgs = pkgs:
|
||||
appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
|
||||
|
||||
extraInstallCommands =
|
||||
let
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@ -35,7 +35,6 @@ let
|
||||
appimage = appimageTools.wrapAppImage {
|
||||
inherit pname version;
|
||||
src = appimageContents;
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "1.25.2";
|
||||
version = "1.26.0";
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-w7tHLjIFnlvyuTw5yG6zxJtQ7oDNdKRXHIRKY638vTo=";
|
||||
hash = "sha256-jPVvKxTHTOFkjpTsnjy9/IxQtHLgv1fInKA6knKUmu8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VL2uNbEtqOv3xmLukhdCmo3lrfx5yFwOAMGwgBlgAVw=";
|
||||
cargoHash = "sha256-ssZ5JxOd0XVs4hsvnSz1IvtKE7ftEKX3nN2B8SsMesw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles mdbook ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
@ -16,7 +16,7 @@ in
|
||||
appimageTools.wrapType2 {
|
||||
inherit meta pname version src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ];
|
||||
extraPkgs = pkgs: [ pkgs.ocl-icd ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications
|
||||
|
||||
@ -31,8 +31,6 @@ in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: [ ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png
|
||||
|
||||
33
pkgs/by-name/no/nodeinfo/package.nix
Normal file
33
pkgs/by-name/no/nodeinfo/package.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
buildGoModule,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nodeinfo";
|
||||
version = "0.3.2";
|
||||
vendorHash = "sha256-4nHdz/Js8xBUMiH+hH+hSYP25cB4yHbe+QVk0RMqLgc=";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "thefederationinfo";
|
||||
repo = "nodeinfo-go";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NNrMv4AS7ybuJfTgs+p61btSIxo+iMvzH7Y5ct46Dag=";
|
||||
};
|
||||
|
||||
tags = "extension";
|
||||
|
||||
sourceRoot = "${src.name}/cli";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "nodeinfo";
|
||||
description = "A command line tool to query nodeinfo based on a given domain";
|
||||
homepage = "https://codeberg.org/thefederationinfo/nodeinfo-go";
|
||||
changelog = "https://codeberg.org/thefederationinfo/nodeinfo-go/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ _6543 ];
|
||||
};
|
||||
}
|
||||
@ -58,9 +58,9 @@ if stdenv.isDarwin then stdenv.mkDerivation {
|
||||
} else appimageTools.wrapType2 {
|
||||
inherit pname version src meta;
|
||||
|
||||
extraPkgs = ps: (appimageTools.defaultFhsEnvArgs.multiPkgs ps) ++ [
|
||||
extraPkgs = pkgs: [
|
||||
# Required to run DynamoDB locally
|
||||
ps.jdk21
|
||||
pkgs.jdk21
|
||||
];
|
||||
|
||||
extraInstallCommands = let
|
||||
|
||||
@ -20,9 +20,7 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
segger-jlink
|
||||
];
|
||||
extraPkgs = pkgs: [ pkgs.segger-jlink ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -Dm444 ${appimageContents}/nrfconnect.desktop -t $out/share/applications
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "46.1";
|
||||
version = "46.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "chergert";
|
||||
repo = "ptyxis";
|
||||
rev = version;
|
||||
hash = "sha256-4fdl6H0kxZwpEQp+sZJkO0auQDR327m7RDXf6tbB5x0=";
|
||||
hash = "sha256-/n/S2ws6qsVwTXX96MPa+/ISozDDu8A1wkD1g3dmAtQ=";
|
||||
};
|
||||
|
||||
vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: {
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sendme";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zUI9o3UWufl8NadwMeWsnoSuW8++tFw8NvzA6OdlkMI=";
|
||||
hash = "sha256-x4RN/C/XMvpfsbWJTX5wDj1K+ADz2YIb/esAIEpFVcs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NuPBoMSB4Dr26O9IspFLPBzoUJljDjGZCXRyUIxa3IU=";
|
||||
cargoHash = "sha256-yeexP6wfhg2Ir1oJzaxMwRMen9M409MB4cNZ8fd6cHc=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
|
||||
@ -19,10 +19,6 @@ let
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
extraBwrapArgs = [
|
||||
"--setenv _JAVA_AWT_WM_NONREPARENTING 1"
|
||||
];
|
||||
|
||||
@ -57,8 +57,7 @@ if stdenv.isDarwin then stdenv.mkDerivation
|
||||
else appimageTools.wrapType2 {
|
||||
inherit pname version src meta passthru;
|
||||
|
||||
extraPkgs = pkgs:
|
||||
(appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ];
|
||||
extraPkgs = pkgs: [ pkgs.libthai ];
|
||||
|
||||
extraInstallCommands =
|
||||
let
|
||||
|
||||
@ -17,7 +17,12 @@ buildGoModule rec {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IanaxFhD0nAabr9w6ARCVie+sYW9bvgHoahsuHQYeqE=";
|
||||
hash = "sha256-UmGyIZk5s5A8ModafWMZqeJHdZ4fa+hAHi62pdlfJ8I=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -27,6 +32,10 @@ buildGoModule rec {
|
||||
"-X main.channel=stable"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
ldflags+=" -X main.buildDate=$(cat SOURCE_DATE)"
|
||||
'';
|
||||
|
||||
buildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
1900
pkgs/by-name/ta/tabby/Cargo.lock
generated
1900
pkgs/by-name/ta/tabby/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -32,7 +32,7 @@ let
|
||||
# https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
|
||||
|
||||
pname = "tabby";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
|
||||
availableAccelerations = flatten [
|
||||
@ -78,7 +78,7 @@ let
|
||||
# to use a specific device type as it is relying on llama-cpp only being
|
||||
# built to use one type of device.
|
||||
#
|
||||
# See: https://github.com/TabbyML/tabby/blob/v0.10.0/crates/llama-cpp-bindings/include/engine.h#L20
|
||||
# See: https://github.com/TabbyML/tabby/blob/v0.11.0/crates/llama-cpp-bindings/include/engine.h#L20
|
||||
#
|
||||
llamaccpPackage = llama-cpp.override {
|
||||
rocmSupport = enableRocm;
|
||||
@ -108,13 +108,14 @@ rustPlatform.buildRustPackage {
|
||||
owner = "TabbyML";
|
||||
repo = "tabby";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Oi4KY2H6/dSBydjvPmycdinXUWCdbbhV32wKRvjjnuo=";
|
||||
hash = "sha256-7PHCvI2/QSFVs6SAXrx8rohU5Wu8QRaqsI1CimnUGQY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"apalis-0.5.1" = "sha256-hGvVuSy32lSTR5DJdiyf8q1sXbIeuLSGrtyq6m2QlUQ=";
|
||||
"tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4=";
|
||||
"tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA=";
|
||||
"tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0=";
|
||||
|
||||
@ -1,25 +1,26 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, llvmPackages
|
||||
, gobject-introspection
|
||||
, glib
|
||||
, unstableGitUpdater
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
llvmPackages,
|
||||
gobject-introspection,
|
||||
glib,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "tartan";
|
||||
version = "0.3.0-unstable-2021-12-23";
|
||||
version = "0.3.0-unstable-2023-10-11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "tartan";
|
||||
repo = "tartan";
|
||||
rev = "bd4ea95d8b3ce1258491e9fac7fcc37d2b241a16";
|
||||
sha256 = "l3duPt8Kh/JljzOV+Dm26XbS7gZ+mmFfYUYofWSJRyo=";
|
||||
rev = "4a7c945535d746d3d874ebebc0217715d674a862";
|
||||
hash = "sha256-DYvbBGgytf1JOYKejZB+ReehD8iKm1n4BhMmLQURay0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Tools and Clang plugins for developing code with GLib";
|
||||
homepage = "https://freedesktop.org/wiki/Software/tartan";
|
||||
homepage = "https://gitlab.freedesktop.org/tartan/tartan";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "vunnel";
|
||||
version = "0.22.2";
|
||||
version = "0.23.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "vunnel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g/dlo2M7TJRYAbk3HtGQlMUZhORxt+OsDgP8W7rf+NE=";
|
||||
hash = "sha256-pfR3LxC1sSvLKIwq0P/9DcNkGVIIDfwMiSOpwJ7km9Y=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "workout-tracker";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jovandeginste";
|
||||
repo = "workout-tracker";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hQPBptpsxksfILZXXAVIcFf+W7Eea3pcgnndHY4mO9c=";
|
||||
hash = "sha256-NGj3W6SYZauaAhMinPzsSXM8Dqy+B+am985JJjh6xTs=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, arcan
|
||||
, audit
|
||||
, dbus
|
||||
@ -30,21 +29,23 @@
|
||||
, systemd
|
||||
, xcbutil
|
||||
, xcbutilwm
|
||||
, xcbutilimage
|
||||
, xkbcomp
|
||||
, xkeyboard_config
|
||||
, xorgproto
|
||||
, xtrans
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalPackages: {
|
||||
pname = "xarcan";
|
||||
version = "unstable-2023-11-03";
|
||||
version = "0-unstable-2024-05-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "xarcan";
|
||||
rev = "380ea856307f593535dfc8b23799938db69e31b0";
|
||||
hash = "sha256-RdizezCbJylQDkOmUdqL0lBTNLsjyvo+lKAjfZXTXf4=";
|
||||
rev = "ecc4d0a6408dfeb19934e3bfd4c382b0862c03b4";
|
||||
hash = "sha256-PmaoeemQpin5NN8I6JYOumP+PrzkyTYrqAyxxwBO9K0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -79,6 +80,7 @@ stdenv.mkDerivation (finalPackages: {
|
||||
systemd
|
||||
xcbutil
|
||||
xcbutilwm
|
||||
xcbutilimage
|
||||
xkbcomp
|
||||
xkeyboard_config
|
||||
xorgproto
|
||||
@ -104,6 +106,8 @@ stdenv.mkDerivation (finalPackages: {
|
||||
"--with-xkb-path=${xkeyboard_config}/share/X11/xkb"
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/letoram/letoram";
|
||||
description = "Patched Xserver that bridges connections to Arcan";
|
||||
|
||||
@ -14,7 +14,6 @@ buildFHSEnv {
|
||||
pyserial
|
||||
]))
|
||||
]);
|
||||
multiArch = false;
|
||||
|
||||
extraInstallCommands = ''
|
||||
${lib.optionalString withGui ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "12.8.2";
|
||||
version = "12.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
hash = "sha256-A7YvjAnk9ddGQ7R4UgdBuOJ7VefkUll4/K4vXXkaw78=";
|
||||
hash = "sha256-KSJYn2OHeWUEs0Daa7lUvvPYdXTCmFFYkyie3S2JAVE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, cppunit
|
||||
, iconv
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeCheckInputs = [ cppunit ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4
|
||||
libiconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4
|
||||
];
|
||||
|
||||
cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, callPackage
|
||||
, fetchurl
|
||||
, testers
|
||||
|
||||
, ngspice
|
||||
, cmake
|
||||
}:
|
||||
|
||||
@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ ngspice ];
|
||||
|
||||
# https://github.com/libgeos/geos/issues/930
|
||||
cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
|
||||
@ -1,18 +1,38 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection
|
||||
, vala }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
glib,
|
||||
zlib,
|
||||
gnupg,
|
||||
gpgme,
|
||||
libidn2,
|
||||
libunistring,
|
||||
gobject-introspection,
|
||||
vala,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2.14";
|
||||
pname = "gmime";
|
||||
|
||||
src = fetchurl { # https://github.com/jstedfast/gmime/releases
|
||||
src = fetchurl {
|
||||
# https://github.com/jstedfast/gmime/releases
|
||||
url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz";
|
||||
sha256 = "sha256-pes91nX3LlRci8HNEhB+Sq0ursGQXre0ATzbH75eIxc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config gobject-introspection vala ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
vala
|
||||
];
|
||||
buildInputs = [
|
||||
zlib
|
||||
gpgme
|
||||
@ -21,22 +41,34 @@ stdenv.mkDerivation rec {
|
||||
vala # for share/vala/Makefile.vapigen
|
||||
];
|
||||
propagatedBuildInputs = [ glib ];
|
||||
configureFlags = [
|
||||
"--enable-introspection=yes"
|
||||
"--enable-vala=yes"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ];
|
||||
configureFlags =
|
||||
[
|
||||
"--enable-introspection=yes"
|
||||
"--enable-vala=yes"
|
||||
]
|
||||
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/testsuite.c \
|
||||
--replace /bin/rm rm
|
||||
'';
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace tests/testsuite.c \
|
||||
--replace /bin/rm rm
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
# This specific test fails on darwin for some unknown reason
|
||||
substituteInPlace tests/test-filters.c \
|
||||
--replace-fail 'test_charset_conversion (datadir, "japanese", "utf-8", "iso-2022-jp");' ""
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)"
|
||||
export PKG_CONFIG_VAPIGEN_VAPIGEN
|
||||
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
cp ${if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h} ./iconv-detect.h
|
||||
'';
|
||||
preConfigure =
|
||||
''
|
||||
PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)"
|
||||
export PKG_CONFIG_VAPIGEN_VAPIGEN
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
cp ${
|
||||
if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h
|
||||
} ./iconv-detect.h
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ gnupg ];
|
||||
|
||||
@ -44,11 +76,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/jstedfast/gmime/";
|
||||
description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,6 +22,10 @@ stdenv.mkDerivation {
|
||||
done
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
"-Wno-error=gnu-folding-constant"
|
||||
]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "C utility functions for OpenWrt";
|
||||
homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary";
|
||||
|
||||
@ -14,6 +14,10 @@ stdenv.mkDerivation {
|
||||
buildInputs = [ libubox libjson ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
"-Wno-error=gnu-folding-constant"
|
||||
]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenWrt system message/RPC bus";
|
||||
homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
|
||||
|
||||
@ -26,5 +26,6 @@ stdenv.mkDerivation {
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
mainProgram = "uclient-fetch";
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ustream-ssl";
|
||||
version = "unstable-2023-11-11";
|
||||
version = "0-unstable-2024-03-26";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.openwrt.org/project/ustream-ssl.git";
|
||||
rev = "263b9a97cf7e1e2467319c23832b705fc01190b5";
|
||||
hash = "sha256-RLHU6swNbS3DL3QbKnwU4BbD0EFGKCrHHp0hbnoSssw=";
|
||||
rev = "7621339d7694abef5da5e5353ac440f2d39dcecb";
|
||||
hash = "sha256-No0Pk8KbkT7W4Rav7W3rMKEJISbp7RRoRx7t6LPMxlk=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildDunePackage, fetchurl
|
||||
{ lib, buildDunePackage, fetchurl, fetchpatch
|
||||
, astring, cmdliner, fmt, re, stdlib-shims, uutf, ocaml-syntax-shims
|
||||
}:
|
||||
|
||||
@ -6,13 +6,17 @@ buildDunePackage rec {
|
||||
pname = "alcotest";
|
||||
version = "1.7.0";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";
|
||||
hash = "sha256-gSus2zS0XoiZXgfXMGvasvckee8ZlmN/HV0fQWZ5At8=";
|
||||
};
|
||||
|
||||
# Fix tests with OCaml 5.2
|
||||
patches = fetchpatch {
|
||||
url = "https://github.com/mirage/alcotest/commit/aa437168b258db97680021116af176c55e1bd53b.patch";
|
||||
hash = "sha256-cytuJFg4Mft47LsAEcz2zvzyy1wNzMdeLK+cjaFANpo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml-syntax-shims ];
|
||||
|
||||
propagatedBuildInputs = [ astring cmdliner fmt re stdlib-shims uutf ];
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:
|
||||
|
||||
if lib.versionAtLeast ocaml.version "5.2"
|
||||
then throw "ppx_tools is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let param =
|
||||
let v6_6 = {
|
||||
version = "6.6";
|
||||
@ -58,7 +62,6 @@ then
|
||||
buildDunePackage {
|
||||
inherit pname src meta;
|
||||
inherit (param) version buildInputs nativeBuildInputs;
|
||||
duneVersion = "3";
|
||||
}
|
||||
else
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
php82.buildComposerProject (finalAttrs: {
|
||||
pname = "box";
|
||||
version = "4.6.1";
|
||||
version = "4.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "box-project";
|
||||
repo = "box";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-58L0eWIuUleb90ICBrmeHEQDVYySX0TdSaJBnBtmBXc=";
|
||||
hash = "sha256-gYIAP9pTjahNkpNNXx0c8sQm+9Kaq6/IAo/xI5bNy7Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9kTqU+1i6ICLOlCZe+JCyKn8VN/67Uk9vmn8ng8+HdI=";
|
||||
vendorHash = "sha256-HCbjW4HdyQNWDEHXj9U1t3S3EKcrPV1z/9I1ClFsMsc=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}";
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
buildPecl rec {
|
||||
pname = "mongodb";
|
||||
version = "1.18.1";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-php-driver";
|
||||
rev = version;
|
||||
hash = "sha256-GstDJShuwzXZqlzhLWMEkvrNgCdmORAkGncpmPe879Q=";
|
||||
hash = "sha256-hog6bOKAhLwZMjrUD5yOJ607B1MLYaZJjq6CXIYPlH4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
1100
pkgs/development/php-packages/phpinsights/composer.lock
generated
1100
pkgs/development/php-packages/phpinsights/composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: {
|
||||
hash = "sha256-7ATlfAlCFv78JSKg5cD/VcYoq/EAM/6/GjH3lkfVCJ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ykAv7laYMvzd+uD6raMRQiZmCEa0ELQj1hJPb8UvjCk=";
|
||||
vendorHash = "sha256-MOq7xmX8wqDk9W3M2gkejyXXPTcVFFgU0ohmDpL0Tvg=";
|
||||
|
||||
composerLock = ./composer.lock;
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "1.10.67";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan-src";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-fa/bPOwZoYmnFBBmQofsFb8VphAfcTUwroSGCdnpNq8=";
|
||||
hash = "sha256-zf6u7fGMMx+DeXcS4SxyK3aQ53jnXzQ8YPrJ89vG65Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cTJWXfBjH6BiD/a2qQ60MFB/QuFaVm8vOLMQYPW+7TI=";
|
||||
vendorHash = "sha256-Uv2BoE/hTK59uxHsdm4M5hfozDw4LwwZH4MHd+vN60Y=";
|
||||
composerStrictValidation = false;
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,98 +1,73 @@
|
||||
{ lib
|
||||
, asdf-standard
|
||||
, asdf-transform-schemas
|
||||
, astropy
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, importlib-resources
|
||||
, fsspec
|
||||
, importlib-metadata
|
||||
, jmespath
|
||||
, jsonschema
|
||||
, lz4
|
||||
, numpy
|
||||
, packaging
|
||||
, pytest-astropy
|
||||
, psutil
|
||||
, pytest-remotedata
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, semantic-version
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf";
|
||||
version = "2.13.0";
|
||||
format = "pyproject";
|
||||
version = "3.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asdf-format/";
|
||||
repo = pname;
|
||||
owner = "asdf-format";
|
||||
repo = "asdf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u8e7ot5NDRqQFH0eLVnGinBQmQD73BlR5K9HVjA7SIg=";
|
||||
hash = "sha256-r+cEv6g7fq3I/h2mlszzJRQcazy7qP9pg0hfYG/Sa9E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix default validation, https://github.com/asdf-format/asdf/pull/1203
|
||||
(fetchpatch {
|
||||
name = "default-validation.patch";
|
||||
url = "https://github.com/asdf-format/asdf/commit/6f79f620b4632e20178d9bd53528702605d3e976.patch";
|
||||
hash = "sha256-h/dYhXRCf5oIIC+u6+8C91mJnmEzuNmlEzqc0UEhLy0=";
|
||||
excludes = [
|
||||
"CHANGES.rst"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/asdf-format/asdf/pull/1203
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "'jsonschema >=4.0.1, <4.10.0'," "'jsonschema >=4.0.1',"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
asdf-standard
|
||||
asdf-transform-schemas
|
||||
importlib-metadata
|
||||
jmespath
|
||||
jsonschema
|
||||
numpy
|
||||
packaging
|
||||
pyyaml
|
||||
semantic-version
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
attrs
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
astropy
|
||||
fsspec
|
||||
lz4
|
||||
pytest-astropy
|
||||
psutil
|
||||
pytest-remotedata
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PY_IGNORE_IMPORTMISMATCH=1
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asdf"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"config.rst"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python tools to handle ASDF files";
|
||||
homepage = "https://github.com/asdf-format/asdf";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
# Many tests fail, according to Hydra
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,19 +1,20 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, python-socks
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, tldextract
|
||||
, whodap
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
python-socks,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
tldextract,
|
||||
whodap,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncwhois";
|
||||
version = "1.1.0";
|
||||
version = "1.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,14 +23,17 @@ buildPythonPackage rec {
|
||||
owner = "pogzyb";
|
||||
repo = "asyncwhois";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rJwJhSOFrZZ3WXEZmPMfdosBBW/R5/PMqs0QLnsPMoI=";
|
||||
hash = "sha256-ESVgK4Z26OAamdHPEVxysnlJ0rEUlr8KNd24fawHuEg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "python-socks[asyncio]" "python-socks"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
python-socks
|
||||
tldextract
|
||||
whodap
|
||||
@ -41,11 +45,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "python-socks[asyncio]" "python-socks"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_pywhois_aio_get_hostname_from_ip"
|
||||
@ -63,9 +62,7 @@ buildPythonPackage rec {
|
||||
"test__get_top_level_domain"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asyncwhois"
|
||||
];
|
||||
pythonImportsCheck = [ "asyncwhois" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for retrieving WHOIS information";
|
||||
|
||||
84
pkgs/development/python-modules/avwx-engine/default.nix
Normal file
84
pkgs/development/python-modules/avwx-engine/default.nix
Normal file
@ -0,0 +1,84 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
geopy,
|
||||
httpx,
|
||||
numpy,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
python-dateutil,
|
||||
pythonOlder,
|
||||
rapidfuzz,
|
||||
scipy,
|
||||
shapely,
|
||||
time-machine,
|
||||
xmltodict,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "avwx-engine";
|
||||
version = "1.8.28";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avwx-rest";
|
||||
repo = "avwx-engine";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sxOLhcmTJg/dTrtemr9BcfcBoHTP1eGo8U1ab8iSvUM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "/--cov/d" -e "/--no-cov/d" pyproject.toml
|
||||
'';
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
geopy
|
||||
httpx
|
||||
python-dateutil
|
||||
xmltodict
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
all = [
|
||||
numpy
|
||||
rapidfuzz
|
||||
scipy
|
||||
shapely
|
||||
];
|
||||
fuzz = [ rapidfuzz ];
|
||||
scipy = [
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
shape = [ shapely ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
time-machine
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "avwx" ];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"fetch"
|
||||
"test_nbm_all"
|
||||
"test_station_nearest_ip"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Aviation Weather parsing engine";
|
||||
homepage = "https://github.com/avwx-rest/avwx-engine";
|
||||
changelog = "https://github.com/avwx-rest/avwx-engine/blob/${version}/changelog.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,30 +1,49 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, pytestCheckHook, nose, glibcLocales, fetchpatch
|
||||
, numpy, scipy, matplotlib, h5py }:
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
numpy,
|
||||
scipy,
|
||||
h5py,
|
||||
truncnorm,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bayespy";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
# Python 2 not supported and not some old Python 3 because MPL doesn't support
|
||||
# them properly.
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3N8w/LiTLsDZbHp3z26FvDg3vStB2l3XkIWx+Mma1G0=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bayespy";
|
||||
repo = "bayespy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-X7CwJBrKHlU1jqMkt/7XEzaiwul1Yzkb/V64lXG4Aqo=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook nose glibcLocales ];
|
||||
postPatch = ''
|
||||
substituteInPlace versioneer.py \
|
||||
--replace-fail SafeConfigParser ConfigParser \
|
||||
--replace-fail readfp read_file
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy matplotlib h5py ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
disabledTests = [
|
||||
# Assertion error
|
||||
"test_message_to_parents"
|
||||
dependencies = [
|
||||
numpy
|
||||
scipy
|
||||
h5py
|
||||
truncnorm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "bayespy" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak";
|
||||
version = "0.21.1";
|
||||
version = "0.22.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "hbldh";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-T0im8zKyNLbskAEDeUUFS/daJtvttlHlttjscqP8iSk=";
|
||||
hash = "sha256-kBKNBVbEq1xHLu/gKUL2SwlA2WKjzqFVC5o4N+qnqLM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -366,7 +366,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.103";
|
||||
version = "1.34.104";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -374,7 +374,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-MxMTEnOQKpgEYyL4wZkl7NUykk66ZOm/wFKNBGrrbYw=";
|
||||
hash = "sha256-GsQmm7pLMdSCQfAtLwa0WB+75hdC3O44MV4BQgwQMVs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "frozendict";
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Marco-Sulla";
|
||||
repo = "python-frozendict";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DGSHQbVfqkaHgxL2bBXSxKqshTdWqp1z2F+YA9lu20E=";
|
||||
hash = "sha256-TgXhffUvx74fU2SgDV04R1yS9xGbiP/ksQ+3KGT5bdQ=";
|
||||
};
|
||||
|
||||
# build C version if it exists
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-generativeai";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "google";
|
||||
repo = "generative-ai-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-R1ndVzGKXWRNkWvvuP4HFBXbuk54bCZZvMJY+yalJGU=";
|
||||
hash = "sha256-tJ04E69xNhDqxZ/0YVCIDFqWdA73rs57usyh3fDv8Ls=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "google-ai-generativelanguage" ];
|
||||
|
||||
@ -1,22 +1,23 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, emoji
|
||||
, fetchFromGitHub
|
||||
, freezegun
|
||||
, tzdata
|
||||
, pyparsing
|
||||
, pydantic
|
||||
, pytest-benchmark
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, python-dateutil
|
||||
, setuptools
|
||||
, syrupy
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
emoji,
|
||||
fetchFromGitHub,
|
||||
freezegun,
|
||||
tzdata,
|
||||
pyparsing,
|
||||
pydantic,
|
||||
pytest-benchmark,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
python-dateutil,
|
||||
setuptools,
|
||||
syrupy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ical";
|
||||
version = "8.0.1";
|
||||
version = "8.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -25,12 +26,10 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = "ical";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GA2Kn6OednhQtNzmIq5npN2qXVaMHCzy02Jwx7g3GBA=";
|
||||
hash = "sha256-NrnRId+bgRh31+ocWBjWE2Zo3gOvPJ2fYtOVWOWD5EY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
python-dateutil
|
||||
@ -47,9 +46,7 @@ buildPythonPackage rec {
|
||||
syrupy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ical"
|
||||
];
|
||||
pythonImportsCheck = [ "ical" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for handling iCalendar";
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "inform";
|
||||
version = "1.28";
|
||||
version = "1.29";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "KenKundert";
|
||||
repo = "inform";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RA8/or3HTS/rQmG4A/Eg5j24YElaTEpnHa1yksARVMQ=";
|
||||
hash = "sha256-quJGgXMvVZGqZA6M/AjU/cjYeL0R2nuPDoL0Ji0Ow6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-openai";
|
||||
version = "0.1.18";
|
||||
version = "0.1.19";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-jLdUahiFulWP9YCxFNY4VpoK7YGiZJYRFOcZvEKzcQA=";
|
||||
hash = "sha256-9htkqZeJLkJPs81UcJDSecWyEO8VthT8Od6FTTzKp+c=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-multi-modal-llms-openai";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_multi_modal_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-miN/T4htHiDCfpST6As+H4dThZSB/xtY/iW3qjmxmKI=";
|
||||
hash = "sha256-EN51qHekRK81MGOF+q2bnwYkOR5VMJlwVkEUoICgV4w=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lsassy";
|
||||
version = "3.1.10";
|
||||
version = "3.1.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Hackndo";
|
||||
repo = "lsassy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Eqparqj1O0gK0MvR4BBkGVNji2WXEnMsdWvKiR6XHFk=";
|
||||
hash = "sha256-boPFrmPqaHpezxXM3VM50i+n+n+gXkuwP4ErpMpN/AI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user