mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 01:24:47 +00:00
Merge branch master into haskell-updates
This commit is contained in:
commit
50848d126c
@ -285,7 +285,7 @@ in
|
||||
KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
|
||||
'';
|
||||
hardware.opengl = {
|
||||
extraPackages = [ nvidia_x11.out ] ++ (lib.optional (builtins.hasAttr "libXNVCtrl" nvidia_x11.settings) nvidia_x11.settings.libXNVCtrl);
|
||||
extraPackages = [ nvidia_x11.out ];
|
||||
extraPackages32 = [ nvidia_x11.lib32 ];
|
||||
};
|
||||
environment.systemPackages = [ nvidia_x11.bin ];
|
||||
|
@ -77,6 +77,8 @@ in
|
||||
environment = {
|
||||
STATIC_DIR = ".";
|
||||
DATA_DIR = ".";
|
||||
HF_HOME = ".";
|
||||
SENTENCE_TRANSFORMERS_HOME = ".";
|
||||
} // cfg.environment;
|
||||
|
||||
serviceConfig = {
|
||||
|
@ -20,14 +20,10 @@ let
|
||||
else toString value;
|
||||
|
||||
configFile = pkgs.writeText "davfs2.conf" (
|
||||
if (cfg.settings != { }) then
|
||||
(toINIWithGlobalSection {
|
||||
mkSectionName = escapeString;
|
||||
mkKeyValue = k: v: "${k} ${formatValue v}";
|
||||
} cfg.settings)
|
||||
else
|
||||
cfg.extraConfig
|
||||
);
|
||||
toINIWithGlobalSection {
|
||||
mkSectionName = escapeString;
|
||||
mkKeyValue = k: v: "${k} ${formatValue v}";
|
||||
} cfg.settings);
|
||||
in
|
||||
{
|
||||
|
||||
@ -53,29 +49,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = lines;
|
||||
default = "";
|
||||
example = ''
|
||||
proxy foo.bar:8080
|
||||
use_locks 0
|
||||
|
||||
[/media/dav]
|
||||
use_locks 1
|
||||
|
||||
[/home/otto/mywebspace]
|
||||
gui_optimize 1
|
||||
'';
|
||||
description = ''
|
||||
Extra lines appended to the configuration of davfs2.
|
||||
See {manpage}`davfs2.conf(5)` for available settings.
|
||||
|
||||
**Note**: Please pass structured settings via
|
||||
{option}`settings` instead, this option
|
||||
will get deprecated in the future.
|
||||
'' ;
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = submodule {
|
||||
freeformType = let
|
||||
@ -109,21 +82,6 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.extraConfig != "" -> cfg.settings == { };
|
||||
message = ''
|
||||
services.davfs2.extraConfig and services.davfs2.settings cannot be used together.
|
||||
Please prefer using services.davfs2.settings.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
warnings = optional (cfg.extraConfig != "") ''
|
||||
services.davfs2.extraConfig will be deprecated in future releases;
|
||||
please use services.davfs2.settings instead.
|
||||
'';
|
||||
|
||||
environment.systemPackages = [ pkgs.davfs2 ];
|
||||
environment.etc."davfs2/davfs2.conf".source = configFile;
|
||||
|
||||
|
@ -60,6 +60,8 @@ in
|
||||
networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ 9651 ];
|
||||
networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 9650 9651 ];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
systemd.services.mycelium = {
|
||||
description = "Mycelium network";
|
||||
after = [ "network.target" ];
|
||||
|
@ -51,6 +51,9 @@ in
|
||||
peer1.wait_for_unit("mycelium.service")
|
||||
peer2.wait_for_unit("mycelium.service")
|
||||
|
||||
peer1.succeed("mycelium peers list | grep 192.168.1.12")
|
||||
peer2.succeed("mycelium peers list | grep 192.168.1.11")
|
||||
|
||||
peer1.succeed("ping -c5 ${peer2-ip}")
|
||||
peer2.succeed("ping -c5 ${peer1-ip}")
|
||||
'';
|
||||
|
@ -120,12 +120,14 @@ in {
|
||||
{ type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
|
||||
];
|
||||
settings = {
|
||||
# Must not specify the OpenSSL provided algorithms.
|
||||
Ciphers = [ "chacha20-poly1305@openssh.com" ];
|
||||
KexAlgorithms = [
|
||||
"curve25519-sha256"
|
||||
"curve25519-sha256@libssh.org"
|
||||
];
|
||||
# Since this test is against an OpenSSH-without-OpenSSL,
|
||||
# we have to override NixOS's defaults ciphers (which require OpenSSL)
|
||||
# and instead set these to null, which will mean OpenSSH uses its defaults.
|
||||
# Expectedly, OpenSSH's defaults don't require OpenSSL when it's compiled
|
||||
# without OpenSSL.
|
||||
Ciphers = null;
|
||||
KexAlgorithms = null;
|
||||
Macs = null;
|
||||
};
|
||||
};
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
|
@ -7,17 +7,17 @@
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "13c9fa22155066acfb5a2e444fe76245738e7fb7";
|
||||
rev = "53c40d2395e04761a510aa7007336939538678c0";
|
||||
in
|
||||
melpaBuild {
|
||||
pname = "edraw";
|
||||
version = "20240529.1009";
|
||||
version = "20240606.457";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "misohena";
|
||||
repo = "el-easydraw";
|
||||
inherit rev;
|
||||
hash = "sha256-h2auwVIWjrOBPHPCuLdJv5y3FpoV4V+MEOPf4xprfYg=";
|
||||
hash = "sha256-gJboLPEMTFC3rP0PiJ679Nj8SmfI+qXYkX7kBLU6ywQ=";
|
||||
};
|
||||
|
||||
commit = rev;
|
||||
|
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1n3gb12asid2qwwzf9fj974ws9n7has9l23ni8jscx9cp63l5rbl";
|
||||
x86_64-darwin = "0gkplg2c5g7964m58fmv7b70d69g4yqrax5zn1rm4rl2agxgwyff";
|
||||
aarch64-linux = "0412222l9r81f3aa3zlzrg42hzslvvck5kds7zrmpssjrd41jxfh";
|
||||
aarch64-darwin = "1iv49m646vsbcgaxydxhpjbxspz7918brdk51gmbqf258shf8rii";
|
||||
armv7l-linux = "1sblaigrxscx4l1kln1zxzm5da5lr50y1k6qb4igq6wxbdx55iay";
|
||||
x86_64-linux = "1zmgvadhsnsbmqb559kvf66i7h6iq7vw99m7vdxcfmdl6c1pwyvb";
|
||||
x86_64-darwin = "061h423vay3d28d2015llz7pwlqcrjy0lmw47xgy3iy6hfadrra2";
|
||||
aarch64-linux = "0n288h6369bazykp6jyapi6yz0k7nivql6wz68fgkagfdyxzl1yb";
|
||||
aarch64-darwin = "13k9hvbzj8xyfi29g0x4nz80gmjq3s693zi5fi4lbf4bj7jmcamq";
|
||||
armv7l-linux = "19p6k1rgy83vs76hksjx5d4v32jq31r6aw5kzcc8gsq114xj9c2a";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.88.1.24104";
|
||||
version = "1.90.0.24158";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
@ -47,12 +47,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "retroarch-bare";
|
||||
version = "1.19.0";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "RetroArch";
|
||||
hash = "sha256-xn6lFknL5y9WozGZtqiZVyVzOuNheGhwxWlfFOYVFzU=";
|
||||
hash = "sha256-NVe5dhH3w7RL1C7Z736L5fdi/+aO+Ah9Dpa4u4kn0JY=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
@ -1,54 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, extra-cmake-modules
|
||||
, cmake
|
||||
, kio
|
||||
, ki18n
|
||||
, kxmlgui
|
||||
, kconfig
|
||||
, karchive
|
||||
, kcoreaddons
|
||||
, kconfigwidgets
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mangareader";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-fb";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-YZZcp+HS/P/GxWYyOpO35nByJSzv4HahzzrZSVRcCRs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kio
|
||||
ki18n
|
||||
kxmlgui
|
||||
kconfig
|
||||
karchive
|
||||
kcoreaddons
|
||||
kconfigwidgets
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt manga reader for local files";
|
||||
homepage = "https://github.com/g-fb/mangareader";
|
||||
changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl3Plus cc-by-nc-sa-40 ];
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
@ -4,12 +4,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ganttproject-bin";
|
||||
version = "3.3.3300";
|
||||
version = "3.3.3309";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.ganttproject.biz/ganttproject-${version}/ganttproject-${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-U9x64UIBuVtW44zbsdWuMRZyEJhZ8VUWbDVtapTGPMo=";
|
||||
hash = "sha256-ysK+q9r8pbf9MBv7ck24joPR/ywyHnDCBHeOLfljYNw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "printrun";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kliment";
|
||||
repo = "Printrun";
|
||||
rev = "refs/tags/printrun-${version}";
|
||||
hash = "sha256-GmTA/C45MuptN/Y0KjpFjaLV3sWoM4rHz8AMfV9sf4U=";
|
||||
hash = "sha256-MANgxE3z8xq8ScxdxhwfEVsLMF9lgcdSjJZ0qu5p3ps=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "terminal-stocks";
|
||||
version = "1.0.18";
|
||||
version = "1.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shweshi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f/ccGh31qT+euuGA3RRyiUYl+wpxazZHs5R8xehX3Zk=";
|
||||
hash = "sha256-6eDBcQfo6M+Z31ILLM4BbiOxoTD6t4LQJxawoJFEzhg=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-t71SfoPYVFLWcrjv2ErWazDeaVTO4W46g4lFler86Sc=";
|
||||
npmDepsHash = "sha256-0k2+vdfOUF0zV6Tl7VGXS2dNLnCHgSdI12LqvGkbv+k=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {};
|
||||
|
@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
||||
if stdenv.isAarch64 then
|
||||
{
|
||||
pname = "brave";
|
||||
version = "1.66.115";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.66.115/brave-browser_1.66.115_arm64.deb";
|
||||
hash = "sha256-zOrulR0a/iRYtjdFiyN0V6q0KktD7G0ZrEYSXfIwaL8=";
|
||||
version = "1.66.118";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.66.118/brave-browser_1.66.118_arm64.deb";
|
||||
hash = "sha256-H2f6i86lDToHEkJ9JZCBp3tlpnI+zoFHY3YzLdp5lE4=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.isx86_64 then
|
||||
{
|
||||
pname = "brave";
|
||||
version = "1.66.115";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.66.115/brave-browser_1.66.115_amd64.deb";
|
||||
hash = "sha256-TMQips7dyxKfYEin7QJCV0ru4NHi4j3DjLh2fmzuYeQ=";
|
||||
version = "1.66.118";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.66.118/brave-browser_1.66.118_amd64.deb";
|
||||
hash = "sha256-r7lpEOxECOqJ23XxTHqSy6KhyNPRwOkuJvnZUuuBN4k=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
@ -165,5 +165,12 @@ in stdenv.mkDerivation rec {
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ dan4ik605743 ionutnechita ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
knownVulnerabilities = [
|
||||
''
|
||||
Trusts a Russian government issued CA certificate for some websites.
|
||||
See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.11.12";
|
||||
version = "0.11.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
hash = "sha256-tioWLZ1Bd+gC2FvbhrxFPIkOJb9ycx9sGVmh+a/4hwo=";
|
||||
hash = "sha256-mXT0/cDfvzE9fBCy4rY1epeOolXmc50QNNXSn3bHi1I=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
@ -1,10 +0,0 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
|
||||
sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
|
||||
sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
|
||||
};
|
||||
}
|
@ -1,14 +0,0 @@
|
||||
{
|
||||
k3sVersion = "1.27.14+k3s1";
|
||||
k3sCommit = "b0b34e4d927369147a37f95ee8ba6441e4b4102b";
|
||||
k3sRepoSha256 = "0vvglvh8hl83jrpn9i2fgbck6cp7fbbwn292w76nmckmpclm47ap";
|
||||
k3sVendorHash = "sha256-eDzBpvaK1rHp28A5zvSsxnk0CNhy4oBSifBT98M7JWc=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
k3sRootVersion = "0.12.2";
|
||||
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
|
||||
k3sCNIVersion = "1.4.0-k3s2";
|
||||
k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
|
||||
containerdVersion = "1.7.15-k3s1.27";
|
||||
containerdSha256 = "0bjxw174prhq8izmgrmpyljfxzrj0lh5d0w04g3lyn0rp3kwxqsl";
|
||||
criCtlVersion = "1.26.0-rc.0-k3s1";
|
||||
}
|
@ -338,6 +338,7 @@ buildGoModule rec {
|
||||
util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
|
||||
conntrack-tools
|
||||
runc
|
||||
bash
|
||||
];
|
||||
|
||||
k3sKillallDeps = [
|
||||
|
@ -12,17 +12,6 @@ let
|
||||
extraArgs = builtins.removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
{
|
||||
# 1_27 can be built with the same builder as 1_30
|
||||
k3s_1_27 = common (
|
||||
(import ./1_27/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"27"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
|
||||
# 1_28 can be built with the same builder as 1_30
|
||||
k3s_1_28 = common (
|
||||
(import ./1_28/versions.nix)
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kaniko";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "kaniko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HHnPO2ItQKtodTxdZzxVU9GS45cd6fnlY8PLTTfqCVg=";
|
||||
hash = "sha256-0FHhyUPZFddruZ3YV5SYB0b/bb0C+IVQpgIRaCoA1z8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "temporal";
|
||||
version = "1.23.1";
|
||||
version = "1.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "temporal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yu5EfW5ThTJx6ouCBoEEq9wU4MtlFGqqRaHMgIPaRqY=";
|
||||
hash = "sha256-GEmlmVTxQPoKsb9RtS6RcHY/0iDZsj3jG/Les2VPMAc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-INmc/qbayjI+umkoGL8ih/iC7xqUkO1kfIZN5cQn/bw=";
|
||||
vendorHash = "sha256-u9xQFTwVKEGRPhBwcBgexCQhlNO91yP4m4vchCdBt9E=";
|
||||
|
||||
excludedPackages = [ "./build" ];
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
{
|
||||
"version" = "1.11.67";
|
||||
"version" = "1.11.68";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-oM4/PKydmIBp2zVbzJRbVYnklYO2IHH7ZBV4MfLxnQo=";
|
||||
"desktopYarnHash" = "04dbsacigq5jrh7gpyxj31grwzsg58cy6d4y7k3hmcwd4gj68iid";
|
||||
"webSrcHash" = "sha256-faJiuAmEIEkNrwjgU06XT9J2NxJrJNIsPb1K5WXR0Lc=";
|
||||
"webYarnHash" = "14sy3by840gbxqyvhwaj5k07hvhcsj300s39qjfsg1sx9fnfzck3";
|
||||
"desktopSrcHash" = "sha256-L3rto0V0RIf5ILWYGFnuGpwciwc55rR2+Zqj/azuWlo=";
|
||||
"desktopYarnHash" = "0awz1dscksx4zvp99p08mdl2h6i7gbwjddanl3bhxkysxqdnwqb1";
|
||||
"webSrcHash" = "sha256-IRgEV4H0fYo0ijLWF8ICdewqencgTJlqstzsGzlJI0k=";
|
||||
"webYarnHash" = "092m0bhc3pp9dpaz6kri3hi723kqq1pbja4vf2xbxyx4x4yf0vlz";
|
||||
};
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ let
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "6.0.11.35001";
|
||||
versions.x86_64-darwin = "6.0.11.35001";
|
||||
versions.x86_64-linux = "6.0.10.5325";
|
||||
versions.x86_64-linux = "6.0.12.5501";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
@ -64,7 +64,7 @@ let
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-EStiiTUwSZFM9hyYXHDErlb0m6yjRwNl7O7XLXtkvjI=";
|
||||
hash = "sha256-h9gjVd7xqChaoC2BZWEhR5WdyfQrPiBjM2WHXMgp8uQ=";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -36,14 +36,14 @@ let
|
||||
in
|
||||
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.3.1";
|
||||
version = "4.3.2";
|
||||
pname = "weechat";
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
|
||||
hash = "sha256-FX4ioX3MMDxmVzljGgRHDXhkdOgF/r7S7S1bYlDRhlM=";
|
||||
hash = "sha256-4fMd490+4ZiRVvTATp9L9hOdpq1Qwk9pH8EFfkz8N8Y=";
|
||||
};
|
||||
|
||||
# Why is this needed? https://github.com/weechat/weechat/issues/2031
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "juju";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juju";
|
||||
repo = "juju";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-35m6e7AWhYnCl+s/i78krYA8As14inI3os8HMBJwCJY=";
|
||||
hash = "sha256-VOGkAv42dus2uxoffffIn6dwC18idwF2tycEHLd6I4s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4G4GspvNMVbfJJ8MfQtrhp5MRcDw0nhHvdlNdRJgpIM=";
|
||||
vendorHash = "sha256-2JNEN8fmxflEyP5lHAv75Bjt9sbKoWL5O+87hxK89vU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/juju"
|
||||
|
@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-YMNf6v40GuyP7Z3ksKh13A9cFnTF9YBP9xkKbGxT3AE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-clang-build.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ];
|
||||
buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme];
|
||||
|
||||
|
23
pkgs/applications/office/homebank/fix-clang-build.diff
Normal file
23
pkgs/applications/office/homebank/fix-clang-build.diff
Normal file
@ -0,0 +1,23 @@
|
||||
C Standard says in 6.8.1:
|
||||
|
||||
labeled-statement:
|
||||
identifier : statement
|
||||
case constant-expression : statement
|
||||
default : statement
|
||||
|
||||
Notably, only expressions and no declarations are allowed. A common workaround for this
|
||||
is adding an empty statement.
|
||||
|
||||
diff --git a/src/rep-budget.c b/src/rep-budget.c
|
||||
index eb5cce6..61e2e77 100644
|
||||
--- a/src/rep-budget.c
|
||||
+++ b/src/rep-budget.c
|
||||
@@ -255,7 +255,7 @@ gint tmpmode;
|
||||
}
|
||||
else
|
||||
{
|
||||
-libname:
|
||||
+libname: ;
|
||||
gchar *name;
|
||||
|
||||
gtk_tree_model_get(model, iter,
|
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "8.11.6";
|
||||
version = "8.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-00Zh8NenBikdingmx34WYYH5SF+yazeAs+7h1/3UIJY=";
|
||||
hash = "sha256-Xd8mZ8tsemJ53hAMED2biRyDlEw/gG/Hh1iZSwSB1vY=";
|
||||
# https://github.com/python-versioneer/python-versioneer/issues/217
|
||||
postFetch = ''
|
||||
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'
|
||||
|
1084
pkgs/applications/system/coolercontrol/Cargo.lock
generated
1084
pkgs/applications/system/coolercontrol/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tauri-plugin-localhost-0.1.0" = "sha256-z+cxkNtaaV7m7Rt2mpdw0Rm0oDR4VZPKwtdhY5V/HlI=";
|
||||
"tauri-plugin-localhost-0.1.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -11,7 +11,7 @@ buildNpmPackage {
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/coolercontrol-ui";
|
||||
|
||||
npmDepsHash = "sha256-ZnuTtksB+HVYobL48S3RI8Ibe3pvDaF+YFAJJumiNxA=";
|
||||
npmDepsHash = "sha256-gnJvNQCbqFfPfsqi008HW4kBTpxiVpN7eHyn9bU6if8=";
|
||||
|
||||
postBuild = ''
|
||||
cp -r dist $out
|
||||
|
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/coolercontrold";
|
||||
|
||||
cargoHash = "sha256-qXZ/LXbKkLvnEQibGyMvkkYhz2eEGUHsYxVF3EbCpFc=";
|
||||
cargoHash = "sha256-CuA8r54O33csmSY67/AOlQQqUniAWkgWSewIBdeq7X4=";
|
||||
|
||||
postPatch = ''
|
||||
# copy the frontend static resources to a directory for embedding
|
||||
|
@ -4,13 +4,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "coolercontrol";
|
||||
repo = "coolercontrol";
|
||||
rev = version;
|
||||
hash = "sha256-c+MM8MAM8WSKSKECSfy/Iw7KWiWHxG75YShtv9d2Sjc=";
|
||||
hash = "sha256-0NYDPJNX0kWIBHv+b4GuK6efgHCBNDu3rBXaQ/iSxFk=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.12.203";
|
||||
version = "5.12.205";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8sxC8peASy13Q582DbHHpQUj0AZN0soJrOocuPyJeHI=";
|
||||
hash = "sha256-I9tIw7ZtQ85L1Pt0+/CxugtmnClbEbn4xKjSkBqBa0o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zDUANe5zQNufPepbFoADkfjtEAE48GkMCpmG41OP2og=";
|
||||
cargoHash = "sha256-GWoh//sHhIVxmFuyAHRot/JG5wL3Zn2yIeRncaPENN4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
@ -22,7 +22,7 @@ buildLua rec {
|
||||
longDescription = ''
|
||||
mpv-manga-reader is a script aimed at making mpv a usable manga reader.
|
||||
'';
|
||||
homepage = "https://github.com//mpv-manga-reader";
|
||||
homepage = "https://github.com/Dudemanguy/mpv-manga-reader";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ idlip ];
|
||||
};
|
||||
|
@ -5,18 +5,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crosvm";
|
||||
version = "124.0";
|
||||
version = "125.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
|
||||
rev = "bc2900b9ccbdf37b780a63888ca94437fd7dd6af";
|
||||
hash = "sha256-t/47u5BlSC5vbRc7OQSbGBF+wnhcDFOMjrRQc/p2HcQ=";
|
||||
rev = "6a7ff1ecb7fad6820d3bbfe8b11e65854059aba5";
|
||||
hash = "sha256-y/vHU8i9YNbzSHla853z/2w914mVMFOryyaHE1uxlvM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
cargoHash = "sha256-7zx0k7HXequpwcURHx+Ml3cDhdvLkXTg+V71F6TO/d0=";
|
||||
cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner
|
||||
|
@ -65,13 +65,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jmg/Yq80MasbW93BTo6p5EcEfNQVadeDmkYtiX7Ov1E=";
|
||||
hash = "sha256-3u4QOX7K0bMcbvwkXVoCpq7p5rKkvmOlOIRSUEbjFOY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ad-miner";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mazars-Tech";
|
||||
repo = "AD_Miner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MoU38UEhk9eUa+slXnYG1eOyDW79J0q5XiM+1UYIGaM=";
|
||||
hash = "sha256-SBFPGlP5hDKNuE5sYGL6PE1nYMmOCmMZji0AtNEBkAQ=";
|
||||
};
|
||||
|
||||
# All requirements are pinned
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2024-05-28";
|
||||
version = "0-unstable-2024-06-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "5718579addbd733a4ab190fb9355a78e8b19b0b4";
|
||||
hash = "sha256-SD15wFUWryL3sRBbREr94A8oKf8KXVBaiI2bmWxbMx4=";
|
||||
rev = "38b3e8c12801df68ba15c2d96ee96d7d2362b576";
|
||||
hash = "sha256-yVKzkASMzJDmgzS0CxEFky2Y4Bs4vlbRJgUI+uG3muY=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -1,14 +1,12 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoPackage
|
||||
, buildGoModule
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "assetfinder";
|
||||
version = "0.1.1";
|
||||
|
||||
goPackagePath = "github.com/tomnomnom/assetfinder";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomnomnom";
|
||||
repo = "assetfinder";
|
||||
@ -16,6 +14,12 @@ buildGoPackage rec {
|
||||
hash = "sha256-7+YF1VXBcFehKw9JzurmXNu8yeZPdqfQEuaqwtR4AuA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
go mod init github.com/tomnomnom/assetfinder
|
||||
'';
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tomnomnom/assetfinder";
|
||||
description = "Find domains and subdomains related to a given domain";
|
||||
|
@ -44,13 +44,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cockpit";
|
||||
version = "316";
|
||||
version = "317";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AoRdeAA+K6VhRxgAF7t2COJtovk8U9B9j8MaBwMjJgw=";
|
||||
hash = "sha256-faTV9gOzPZMCLHoohzwOJ7v0gStavhUL6JQ1hFjcvhA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "corrscope";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "corrscope";
|
||||
repo = "corrscope";
|
||||
rev = version;
|
||||
hash = "sha256-kOPhVm4epIhBSsgQVKNCoQ7DZcMG/b3sapxwwKo/V+U=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SKsPe68CNaoUzGjMZn4azGFM3SbBipHK8gJcrm4+T+I=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "attrs" "ruamel.yaml" ];
|
||||
|
@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dillo";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dillo-browser";
|
||||
repo = "dillo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-AqffkUPLvVSGq9iYksyvHf3HQ3DLWNlB3CYw4GCAAEI=";
|
||||
hash = "sha256-bGIOYONMtIN4IhSobOeSLiRDR13mo4W/DBX4kQ2S+hg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
25
pkgs/by-name/dn/dnss/package.nix
Normal file
25
pkgs/by-name/dn/dnss/package.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "dnss";
|
||||
version = "0-unstable-2024-03-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "albertito";
|
||||
repo = "dnss";
|
||||
rev = "da8986dd432870f5710e3e8652c92c95f34b830b";
|
||||
hash = "sha256-YjBt+22fc9yHcORRmd//rejNVvf6eK+FAYAcT0fABuI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-d9aGSBRblkvH5Ixw3jpbgC8lMW/qEYNJfLTVeUlos7A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A daemon for using DNS over HTTPS";
|
||||
homepage = "https://blitiri.com.ar/git/r/dnss/";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "dnss";
|
||||
maintainers = with maintainers; [ raspher ];
|
||||
};
|
||||
}
|
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dumbpipe";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-el7cP00qWEAujtBtkMdF3/F09LQ0xMi6A140wErjzKk=";
|
||||
hash = "sha256-Pv7GySqKD3G1eryq6YwVL159XuuWB8DmQ0d1fPuFcmc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ucNMoKF9c5TFyFv8HYH3wypGQGTuZ6BT5/cuEIsyykI=";
|
||||
cargoHash = "sha256-MKJCpSdf9MzpBmgWImYO5+uSVN9uTLaLl4khizVGoig=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
|
@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.14.0";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RJDRxH9VKNxBSfoFl1rDTeKKyLC3C09F0Z3ksJoMDRk=";
|
||||
hash = "sha256-0kReN7FKrcRhxUuwZoArLTW2F1q40Wbp9/hRoDjKZHs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
, alsa-lib
|
||||
, libfmvoice
|
||||
, libjack2
|
||||
, pkg-config
|
||||
, zlib
|
||||
@ -11,19 +10,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fmtoy";
|
||||
version = "0-unstable-2024-04-18";
|
||||
version = "0-unstable-2024-06-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vampirefrog";
|
||||
repo = "fmtoy";
|
||||
rev = "aca005c770724f21c8a91dc6a482738871e78c9f";
|
||||
hash = "sha256-vrd7Eg3Bh8ll2yCfD1rAJpotEe+Zq+JuF4VMhiYsbDw=";
|
||||
rev = "1339600e2f5a4357f7a50f5c6ad49f3c7635adec";
|
||||
hash = "sha256-1kjUPEklZyue/DYn0jSfmXLjF22C+im6klY+S5KCvhc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rmdir libfmvoice
|
||||
cp --no-preserve=all -r ${libfmvoice.src} libfmvoice
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace 'pkg-config' "$PKG_CONFIG"
|
||||
'';
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, godot3-server
|
||||
}:
|
||||
|
||||
let
|
||||
@ -23,15 +22,15 @@ let
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "gdtoolkit";
|
||||
version = "3.3.1";
|
||||
pname = "gdtoolkit3";
|
||||
version = "3.5.0";
|
||||
|
||||
# If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?)
|
||||
src = fetchFromGitHub {
|
||||
owner = "Scony";
|
||||
repo = "godot-gdscript-toolkit";
|
||||
rev = version;
|
||||
sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn";
|
||||
hash = "sha256-cMGD5Xdf9ElS1NT7Q0NPB//EvUO0MI0VTtps5JRisZ4=";
|
||||
};
|
||||
|
||||
disabled = python.pythonOlder "3.7";
|
||||
@ -48,35 +47,18 @@ python.pkgs.buildPythonApplication rec {
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
pytestCheckHook
|
||||
hypothesis
|
||||
godot3-server
|
||||
];
|
||||
|
||||
preCheck =
|
||||
let
|
||||
godotServerMajorVersion = lib.versions.major godot3-server.version;
|
||||
gdtoolkitMajorVersion = lib.versions.major version;
|
||||
msg = ''
|
||||
gdtoolkit major version ${gdtoolkitMajorVersion} does not match godot-server major version ${godotServerMajorVersion}!
|
||||
gdtoolkit needs a matching godot-server for its tests.
|
||||
If you see this error, you can either:
|
||||
- disable doCheck for gdtoolkit, or
|
||||
- provide a compatible godot-server version to gdtoolkit"
|
||||
'';
|
||||
in lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg ''
|
||||
# The tests want to run the installed executables
|
||||
export PATH=$out/bin:$PATH
|
||||
preCheck = ''
|
||||
# The tests want to run the installed executables
|
||||
export PATH=$out/bin:$PATH
|
||||
|
||||
# gdtoolkit tries to write cache variables to $HOME/.cache
|
||||
export HOME=$TMP
|
||||
# gdtoolkit tries to write cache variables to $HOME/.cache
|
||||
export HOME=$TMP
|
||||
'';
|
||||
|
||||
# Work around https://github.com/godotengine/godot/issues/20503
|
||||
# Without this, Godot will complain about a missing project file
|
||||
touch project.godot
|
||||
|
||||
# Remove broken test case
|
||||
# (hard to skip via disabledTests since the test name contains an absolute path)
|
||||
rm tests/potential-godot-bugs/multiline-subscription-expression.gd
|
||||
'';
|
||||
# The tests are not working on NixOS
|
||||
disabledTests = [ "test_cc_on_empty_file_succeeds" "test_cc_on_file_with_single_function_succeeds" ];
|
||||
|
||||
pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ];
|
||||
|
73
pkgs/by-name/gd/gdtoolkit_4/package.nix
Normal file
73
pkgs/by-name/gd/gdtoolkit_4/package.nix
Normal file
@ -0,0 +1,73 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
lark = super.lark.overridePythonAttrs (old: rec {
|
||||
# gdtoolkit needs exactly this lark version
|
||||
version = "1.1.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lark-parser";
|
||||
repo = "lark";
|
||||
rev = version;
|
||||
hash = "sha256-vDu+VPAXONY8J+A6oS7EiMeOMgzGms0nWpE+DKI1MVU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [ ];
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "gdtoolkit";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Scony";
|
||||
repo = "godot-gdscript-toolkit";
|
||||
rev = version;
|
||||
hash = "sha256-SvEKKuDnfxV+5AArg5ssrQzgIwRITdek4KYEs3d0n4Y=";
|
||||
};
|
||||
|
||||
disabled = python.pythonOlder "3.7";
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
docopt
|
||||
lark
|
||||
pyyaml
|
||||
setuptools
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
pytestCheckHook
|
||||
hypothesis
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# The tests want to run the installed executables
|
||||
export PATH=$out/bin:$PATH
|
||||
|
||||
# gdtoolkit tries to write cache variables to $HOME/.cache
|
||||
export HOME=$TMP
|
||||
'';
|
||||
|
||||
# The tests are not working on NixOS
|
||||
disabledTestPaths = [
|
||||
"tests/generated/test_expression_parsing.py"
|
||||
"tests/gdradon/test_executable.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter";
|
||||
homepage = "https://github.com/Scony/godot-gdscript-toolkit";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ squarepear ];
|
||||
};
|
||||
}
|
49
pkgs/by-name/gi/git-toolbelt/package.nix
Normal file
49
pkgs/by-name/gi/git-toolbelt/package.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
git,
|
||||
fzf,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "git-toolbelt";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvie";
|
||||
repo = "git-toolbelt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-lrVMSItA0Eo7DgB+QjOLPPxwMLaC9+6FNPrhw6pkpKA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
git
|
||||
fzf # needed by git-fixup-with
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 git-* -t "$out"/bin
|
||||
|
||||
for exe in "$out"/bin/*; do
|
||||
wrapProgram "$exe" \
|
||||
--prefix PATH : "$out"/bin:${lib.makeBinPath finalAttrs.buildInputs}
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/nvie/git-toolbelt/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
description = "A suite of useful Git commands that aid with scripting or every day command line usage";
|
||||
homepage = "https://github.com/nvie/git-toolbelt";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
38
pkgs/by-name/ka/kalamine/package.nix
Normal file
38
pkgs/by-name/ka/kalamine/package.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kalamine";
|
||||
version = "0.22";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OneDeadKey";
|
||||
repo = "kalamine";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SPXVFeysVF/6RqjhXmlPc+3m5vnVndJb7LQshQZBeg8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
click
|
||||
lxml
|
||||
pyyaml
|
||||
tomli
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "kalamine" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Keyboard Layout Maker";
|
||||
homepage = "https://github.com/OneDeadKey/kalamine/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ iogamaster ];
|
||||
mainProgram = "kalamine";
|
||||
};
|
||||
}
|
32
pkgs/by-name/ku/kubefwd/package.nix
Normal file
32
pkgs/by-name/ku/kubefwd/package.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubefwd";
|
||||
version = "1.22.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "txn2";
|
||||
repo = "kubefwd";
|
||||
rev = version;
|
||||
hash = "sha256-xTd/1h9fW2GbZ2u3RsExbQouRZot9CUDuqNLItRySxM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qAlzgPw1reDZYK+InlnAsBgVemVumWwLgEuYm+ALcCs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.Version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bulk port forwarding Kubernetes services for local development";
|
||||
homepage = "https://github.com/txn2/kubefwd";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ iogamaster ];
|
||||
mainProgram = "kubefwd";
|
||||
};
|
||||
}
|
@ -1,10 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2
|
||||
, version, hashes }:
|
||||
{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 }:
|
||||
|
||||
let
|
||||
inherit (stdenv) hostPlatform;
|
||||
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
|
||||
ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name;
|
||||
version = "1.30.0";
|
||||
hashes = {
|
||||
# Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc..
|
||||
osx-x86_64 = "sha256-AAWZvxuZC82xvrW6fpYm783TY+H8k3DvqE94ZF1yjmk=";
|
||||
linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE=";
|
||||
linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y=";
|
||||
osx-arm64 = "sha256-Nb/owBdIeroB9jLMDvwjo8bvsTC9vFyJPLMTOMsSAd4=";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "ldc-bootstrap";
|
||||
inherit version;
|
||||
@ -12,7 +19,7 @@ in stdenv.mkDerivation {
|
||||
src = fetchurl rec {
|
||||
name = "ldc2-${version}-${OS}-${ARCH}.tar.xz";
|
||||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}";
|
||||
sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}");
|
||||
hash = hashes."${OS}-${ARCH}" or (throw "missing bootstrap hash for ${OS}-${ARCH}");
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
@ -1,7 +1,22 @@
|
||||
{ version, sha256 }:
|
||||
{ lib, stdenv, fetchurl, cmake, ninja, llvm_17, curl, tzdata
|
||||
, libconfig, lit, gdb, unzip, darwin, bash
|
||||
, callPackage, makeWrapper, runCommand, targetPackages
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, llvm_17
|
||||
, curl
|
||||
, tzdata
|
||||
, libconfig
|
||||
, lit
|
||||
, gdb
|
||||
, unzip
|
||||
, darwin
|
||||
, bash
|
||||
, callPackage
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, targetPackages
|
||||
|
||||
, ldcBootstrap ? callPackage ./bootstrap.nix { }
|
||||
}:
|
||||
|
||||
@ -14,52 +29,44 @@ let
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ldc";
|
||||
inherit version;
|
||||
version = "1.38.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz";
|
||||
inherit sha256;
|
||||
src = fetchFromGitHub {
|
||||
owner = "ldc-developers";
|
||||
repo = "ldc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-d/UREh+fHRRh0r3H60uPjHute+qspcm9TBFWZMbGDxk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# https://issues.dlang.org/show_bug.cgi?id=19553
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
postUnpack = ''
|
||||
patchShebangs .
|
||||
''
|
||||
+ ''
|
||||
rm ldc-${version}-src/tests/dmd/fail_compilation/mixin_gc.d
|
||||
rm ldc-${version}-src/tests/dmd/runnable/xtest46_gc.d
|
||||
rm ldc-${version}-src/tests/dmd/runnable/testptrref_gc.d
|
||||
|
||||
# test depends on current year
|
||||
rm ldc-${version}-src/tests/dmd/compilable/ddocYear.d
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# https://github.com/NixOS/nixpkgs/issues/34817
|
||||
rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow
|
||||
substituteInPlace tests/dmd/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)"
|
||||
patchShebangs runtime tools tests
|
||||
|
||||
rm tests/dmd/fail_compilation/mixin_gc.d
|
||||
rm tests/dmd/runnable/xtest46_gc.d
|
||||
rm tests/dmd/runnable/testptrref_gc.d
|
||||
|
||||
# test depends on current year
|
||||
rm tests/dmd/compilable/ddocYear.d
|
||||
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace-fail "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
|
||||
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace runtime/phobos/std/socket.d --replace-fail "foreach (name; names)" "names = []; foreach (name; names)"
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/34817
|
||||
rm -r tests/plugins/addFuncEntryCall
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake ldcBootstrap lit lit.python llvm_17.dev makeWrapper ninja unzip
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
# https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
|
||||
gdb
|
||||
];
|
||||
@ -76,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "DMD=$DMD" ];
|
||||
|
||||
fixNames = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
fixNames = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
fixDarwinDylibNames() {
|
||||
local flags=()
|
||||
|
||||
@ -103,7 +110,7 @@ stdenv.mkDerivation rec {
|
||||
# Build default lib test runners
|
||||
ninja -j$NIX_BUILD_CORES all-test-runners
|
||||
|
||||
${fixNames}
|
||||
${finalAttrs.fixNames}
|
||||
|
||||
# Run dmd testsuite
|
||||
export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD"
|
||||
@ -116,22 +123,23 @@ stdenv.mkDerivation rec {
|
||||
ctest -V -R "lit-tests"
|
||||
|
||||
# Run default lib unittests
|
||||
ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}"
|
||||
ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${finalAttrs.additionalExceptions}"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/ldc2 \
|
||||
--prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
|
||||
--set-default CC "${targetPackages.stdenv.cc}/bin/cc"
|
||||
'';
|
||||
--prefix PATH : ${targetPackages.stdenv.cc}/bin \
|
||||
--set-default CC ${targetPackages.stdenv.cc}/bin/cc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The LLVM-based D compiler";
|
||||
homepage = "https://github.com/ldc-developers/ldc";
|
||||
changelog = "https://github.com/ldc-developers/ldc/releases/tag/v${finalAttrs.version}";
|
||||
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
|
||||
license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ];
|
||||
mainProgram = "ldc2";
|
||||
maintainers = with maintainers; [ lionello jtbx ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
})
|
45
pkgs/by-name/le/leetgo/package.nix
Normal file
45
pkgs/by-name/le/leetgo/package.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "leetgo";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j178";
|
||||
repo = "leetgo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LbY7GGPu2ZwcclCmsE9V421FUi+foR7CXyFHF7GrjQo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GG9IfM50uVhsQVjXhUrYxuEbPlbsEsFubmUUSMr5SD4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/j178/leetgo/constants.Version=${version}"
|
||||
];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd leetgo \
|
||||
--bash <($out/bin/leetgo completion bash) \
|
||||
--fish <($out/bin/leetgo completion fish) \
|
||||
--zsh <($out/bin/leetgo completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line tool for LeetCode";
|
||||
homepage = "https://github.com/j178/leetgo";
|
||||
changelog = "https://github.com/j178/leetgo/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Ligthiago ];
|
||||
mainProgram = "leetgo";
|
||||
};
|
||||
}
|
52
pkgs/by-name/ma/mangareader/package.nix
Normal file
52
pkgs/by-name/ma/mangareader/package.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
kdePackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mangareader";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-fb";
|
||||
repo = "mangareader";
|
||||
rev = version;
|
||||
hash = "sha256-XX0VaXVYmAs5vmgwslflKIYx1peITp4VmReLkv1nV3I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
kdePackages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = with kdePackages; [
|
||||
qtbase
|
||||
kio
|
||||
ki18n
|
||||
kxmlgui
|
||||
kconfig
|
||||
karchive
|
||||
kcoreaddons
|
||||
kconfigwidgets
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Qt manga reader for local files";
|
||||
homepage = "https://github.com/g-fb/mangareader";
|
||||
changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}";
|
||||
mainProgram = "mangareader";
|
||||
platforms = lib.platforms.linux;
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus
|
||||
cc-by-sa-40
|
||||
];
|
||||
maintainers = with lib.maintainers; [ zendo ];
|
||||
};
|
||||
}
|
40
pkgs/by-name/na/nats-kafka/package.nix
Normal file
40
pkgs/by-name/na/nats-kafka/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nats-kafka";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RboNlKpD+4mOx6iL6JpguR90y6Ux1x0twFcazIPj0w0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Zo4lAV/1TIblTbFrZcwvVecvAAgX+8N6OmdeNyI6Ja0=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/nats-io/nats-kafka/server/core.Version=v${version}"
|
||||
];
|
||||
|
||||
# do not build & install test binaries
|
||||
subPackages = [ "." ];
|
||||
|
||||
# needs running nats-server and kafka
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "NATS to Kafka Bridging";
|
||||
mainProgram = "nats-kafka";
|
||||
homepage = "https://github.com/nats-io/nats-kafka";
|
||||
changelog = "https://github.com/nats-io/nats-kafka/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ misuzu ];
|
||||
};
|
||||
}
|
@ -2,7 +2,6 @@
|
||||
, fetchFromGitHub
|
||||
, openssh
|
||||
, gitMinimal
|
||||
, rsync
|
||||
, nix
|
||||
, coreutils
|
||||
, curl
|
||||
@ -13,6 +12,7 @@
|
||||
, lib
|
||||
, makeWrapper
|
||||
, sshpass
|
||||
, gnutar
|
||||
}:
|
||||
let
|
||||
runtimeDeps = [
|
||||
@ -25,17 +25,17 @@ let
|
||||
findutils
|
||||
gnused # needed by ssh-copy-id
|
||||
sshpass # used to provide password for ssh-copy-id
|
||||
rsync # used to upload extra-files
|
||||
gnutar # used to upload extra-files
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nixos-anywhere";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtide";
|
||||
repo = "nixos-anywhere";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-u3PFJup/XOz2MBhvqCzm94iH6Z4nrE0KmBgT/OnNDqU=";
|
||||
hash = "sha256-AdSrhQhJb9ObCgM1iXnoIBBl+6cjRbuTST4Lt02AP5Q=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nuclei-templates";
|
||||
version = "9.8.7";
|
||||
version = "9.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Masj0v9WGcLJKd/43T4klwyIM2uqhvuLSW5PBuKzsQg=";
|
||||
hash = "sha256-6oY22IQKCV00MtxUw4YwY2U/xH+N06n371DSK7C0nj8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
26
pkgs/by-name/ok/okolors/package.nix
Normal file
26
pkgs/by-name/ok/okolors/package.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "okolors";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ivordir";
|
||||
repo = "Okolors";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Cwe6kyhsCU3wbuD0PTnj1JQOnMjH+sLmG5AiJImRGSU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-RVUrgz/YddT41N1omoPCW3Cjz7IWjc8sB7OwkCUDjM8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate a color palette from an image using k-means clustering in the Oklab color space";
|
||||
homepage = "https://github.com/Ivordir/Okolors";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ laurent-f1z1 ];
|
||||
mainProgram = "okolors";
|
||||
};
|
||||
}
|
@ -30,17 +30,17 @@
|
||||
let
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.1.41";
|
||||
version = "0.1.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rwJf/DbqTOD2TIS0YHK8CaIEC93CfeDg08qV9ydaNe4=";
|
||||
hash = "sha256-lmnfFJBPgjaCdxkMALNQigrtD/V2T3Vs1GEKvRCgWaM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bomHpEcoHG/xUGgzrFXB9D3np0ainTX066SCMY+NdnA=";
|
||||
vendorHash = "sha256-LNH3mpxIrPMe5emfum1W10jvXIjKC6GkGcjq1HhpJQo=";
|
||||
|
||||
# ollama's patches of llama.cpp's example server
|
||||
# `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream"
|
||||
@ -51,6 +51,7 @@ let
|
||||
(preparePatch "03-load_exception.diff" "sha256-0XfMtMyg17oihqSFDBakBtAF0JwhsR188D+cOodgvDk=")
|
||||
(preparePatch "04-metal.diff" "sha256-Ne8J9R8NndUosSK0qoMvFfKNwqV5xhhce1nSoYrZo7Y=")
|
||||
(preparePatch "05-default-pretokenizer.diff" "sha256-NrQ0Fv5DAZYtRM0NBEeM2JLVTLFmb4Fs9RhwXhdMCC4=")
|
||||
(preparePatch "06-qwen2.diff" "sha256-nMtoAQUsjYuJv45uTlz8r/K1oF5NUsc75SnhgfSkE30=")
|
||||
];
|
||||
|
||||
preparePatch = patch: hash: fetchpatch {
|
||||
|
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "owncloud-client";
|
||||
version = "5.2.1";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owncloud";
|
||||
repo = "client";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yErMHh0QbWVpJhNiXU1IIGpQ5CGARN/4cqELRMoxSac=";
|
||||
hash = "sha256-2BM5XoblPwI2xr0e9VHiN4ePkyUx+NyMDY7HkWa9uZM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,12 +2,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pg-dump-anon";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
src = fetchFromGitLab {
|
||||
owner = "dalibo";
|
||||
repo = "postgresql_anonymizer";
|
||||
rev = version;
|
||||
hash = "sha256-Z5Oz/cIYDxFUZwQijRk4xAOUdOK0LWR+px8WOcs+Rs0=";
|
||||
hash = "sha256-MGdGvd4P1fFKdd6wnS2V5Tdly6hJlAmSA4TspnO/6Tk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/pg_dump_anon";
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "11.1.3";
|
||||
version = "11.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Wq2k44WpUhDhSyIx8ofn/jUR7FS3zn2CCe4OiFKHXEA=";
|
||||
hash = "sha256-5MWhHMKCy9rrVO1bqyGykWFGw9zI1t6QGVkenvFpGbY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kjMJCrMG08AXX662GAR5+V6w1+WOv8F9r6ONIOowP8Q=";
|
||||
vendorHash = "sha256-w2Yu0T8omr8F7r5nBZOmRJE0LEdGQ3XAdxNZoK1sx1M=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:
|
||||
|
||||
let
|
||||
version = "1.1.365";
|
||||
version = "1.1.366";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = "pyright";
|
||||
rev = "${version}";
|
||||
hash = "sha256-plXNjT36xLmGftkLREsjKGHQWBGA12hIUOBCtTf8710=";
|
||||
hash = "sha256-xs93PnDTtDsdi9YeZk0nyinCs4+eJJNFg7NagHF15rI=";
|
||||
};
|
||||
|
||||
patchedPackageJSON = runCommand "package.json" { } ''
|
||||
@ -37,7 +37,7 @@ let
|
||||
pname = "pyright-internal";
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/packages/pyright-internal";
|
||||
npmDepsHash = "sha256-oBpW4nEyiDGZhv+Yt0+yKg2xrLULpFjIOFRxIBLZ3bk=";
|
||||
npmDepsHash = "sha256-jGLzsrf5RuqfyI3BJpmVsqijxtNlFexsub0186cUR+8=";
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -51,7 +51,7 @@ buildNpmPackage rec {
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/packages/pyright";
|
||||
npmDepsHash = "sha256-/P2rx7BgaHZPHBC3DO89JjYtPD5ri2goGmgCkGWfby4=";
|
||||
npmDepsHash = "sha256-8d3gRx93wfusvI3mov2B0jJuG+WpVaL8b+jdFzmqA3w=";
|
||||
|
||||
postPatch = ''
|
||||
chmod +w ../../
|
||||
|
28
pkgs/by-name/qu/quinze/package.nix
Normal file
28
pkgs/by-name/qu/quinze/package.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "quinze";
|
||||
version = "2018-09-22";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fontlibrary.org/assets/downloads/quinze/0271bb7be00ea75dcfa06ef7c7f1054e/quinze.zip";
|
||||
hash = "sha256-6C6drbAHme38tF2PtY/YFDdHCbR0JURs4F/K+KZqKiQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m444 -Dt $out/share/fonts/truetype *.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "narrow monospaced font, designed to fit a fifteen pixel bitmap";
|
||||
homepage = "https://fontlibrary.org/en/font/quinze";
|
||||
license = licenses.ofl;
|
||||
maintainers = with maintainers; [ phunehehe ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
name = "regal";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StyraInc";
|
||||
repo = "regal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3Q37ukeqf3n8UhriQNCWyRCgWOcxwO4TsNcsEnJn5eg=";
|
||||
hash = "sha256-isivyYBxYinHQKfuLNyfXB1MNqdqNwu5iqsUd+WRwq8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ejTBfoDYMt5Jpuq+uNgpdHCafR7IUVr8OFB84+m/ZFg=";
|
||||
vendorHash = "sha256-I0aJFvJmmnxlqgeETOyg2/mjGX8lUJz99t56Qe+9uZg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "a linter and language server for Rego";
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sendme";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ptfh00AaLoU/UCqzVRgD38CxeY1dP/Y1ADgQxyLzcMc=";
|
||||
hash = "sha256-9ea0HZErwZ1PZwl1jlC3vafm/QnfhFRLYoFIOhxfY/g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iah0bz6E5akJmo+FAuJ0faDad3YNXt7jhK/6zYrg9lE=";
|
||||
cargoHash = "sha256-4SAvx1G5hBi0il7zmlXFSBAxzqLE7Vezo1ZuVccqhms=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
|
12
pkgs/by-name/sn/snicat/deps.nix
generated
12
pkgs/by-name/sn/snicat/deps.nix
generated
@ -1,12 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/therootcompany/sclient";
|
||||
fetch = {
|
||||
type = "FromGitHub";
|
||||
owner = "therootcompany";
|
||||
repo = "sclient";
|
||||
rev = "v1.5.0";
|
||||
sha256 = "sha256-NAFTOx2sm92K+d746Z5UpB1HGsJI6cJgmh+YTyVkJ0w=";
|
||||
};
|
||||
}
|
||||
]
|
@ -1,8 +1,9 @@
|
||||
{ lib
|
||||
, buildGoPackage
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "snicat";
|
||||
version = "0.0.1";
|
||||
|
||||
@ -13,18 +14,21 @@ buildGoPackage rec {
|
||||
hash = "sha256-fFlTBOz127le2Y7F9KKhbcldcyFEpAU5QiJ4VCAPs9Y=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/CTFd/snicat";
|
||||
patches = [
|
||||
# Migrate to Go modules
|
||||
(fetchpatch {
|
||||
url = "https://github.com/CTFd/snicat/commit/098a5ce3141bae5d2e188338d78517d710d10f70.patch";
|
||||
hash = "sha256-pIdXViUz14nkvL1H3u3oFkm308XA2POtKIGZOKDO6p8=";
|
||||
})
|
||||
];
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorHash = "sha256-27ykI9HK1jFanxwa6QrN6ZS548JbFNSZHaXr4ciCVOE=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
||||
ldflags = [ "-s" "-X main.version=v${version}" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm555 go/bin/snicat $out/bin/sc
|
||||
|
||||
runHook postInstall
|
||||
postInstall = ''
|
||||
mv $out/bin/snicat $out/bin/sc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
40
pkgs/by-name/sr/sr2t/package.nix
Normal file
40
pkgs/by-name/sr/sr2t/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitLab,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sr2t";
|
||||
version = "0.0.26";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "0bs1d1an";
|
||||
repo = "sr2t";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BPsYnKBTxt5WUd2+WumMdVi8p6iryOWG2MjI97qbaCw=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ hatchling ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
prettytable
|
||||
pyyaml
|
||||
setuptools
|
||||
xlsxwriter
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sr2t" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to convert scanning reports to a tabular format";
|
||||
homepage = "https://gitlab.com/0bs1d1an/sr2t";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "sr2t";
|
||||
};
|
||||
}
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stackql";
|
||||
version = "0.5.643";
|
||||
version = "0.5.652";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackql";
|
||||
repo = "stackql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9W6bEI+5Q0Kgbd14sWKde3I6WIVz1ZxsXmR009mOPog=";
|
||||
hash = "sha256-yE+XMAEsEYj2W3My2gXzZ2QD+YXj62BrzOa/mL+yMCE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xcly4jtdUkx/s+YWYFBVeuI2kQBu2oqbLN9ZKkHppkA=";
|
||||
vendorHash = "sha256-Tcfj1A3W07GkF7CECc5Tu9Er8n+OxsDrUgv7eSlu+wA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dweymouth";
|
||||
repo = "supersonic";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0MbR6ah3UakLn/6Mfd156BlTZe7thNK6mAPLTuz298g=";
|
||||
hash = "sha256-tuXpK1KYp0INSCuCQFw1crgPjqW655AagwHZswLrodg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ld1j/SFq5W+SKppAzk7UV74RD6/Dw+PWk0BhEGML5+k=";
|
||||
vendorHash = "sha256-hYFz9XEYkHv9HOCYKE3a17eDUspv6QmkH/+ipjJuaz0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-plugin-docs";
|
||||
version = "0.19.3";
|
||||
version = "0.19.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "terraform-plugin-docs";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-UPTiIY2aW6XDmJnMb1ATNWe3BvZQnPL0BweC/gxtztQ=";
|
||||
sha256 = "sha256-UEF+CsY302AJApDhnrPoTo09EcR/VOo10bXSf0XgtZk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZSHCP0eZWCvSObbUOSl0ohiiX79MyGC2ALowzvMXMv4=";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tippecanoe";
|
||||
version = "2.53.0";
|
||||
version = "2.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "felt";
|
||||
repo = "tippecanoe";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-0GBrGLE0owhGTc/+D1W6X+hkpuX2GPu6gXQ7J2pHK9o=";
|
||||
hash = "sha256-hF1tiI5M8BdJoJEZDqC6BkzndmYRQU4jHhjUvYowBTU=";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite zlib ];
|
||||
|
@ -1,11 +0,0 @@
|
||||
{ callPackage }:
|
||||
callPackage ./binary.nix {
|
||||
version = "1.30.0";
|
||||
hashes = {
|
||||
# Get these from `nix store prefetch-file https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc..
|
||||
osx-x86_64 = "sha256-AAWZvxuZC82xvrW6fpYm783TY+H8k3DvqE94ZF1yjmk=";
|
||||
linux-x86_64 = "sha256-V4TUzEfQhFrwiX07dHOgjdAoGkzausCkhnQIQNAU/eE=";
|
||||
linux-aarch64 = "sha256-kTeglub75iv/jWWNPCn15aCGAbmck0RQl6L7bFOUu7Y=";
|
||||
osx-arm64 = "sha256-Nb/owBdIeroB9jLMDvwjo8bvsTC9vFyJPLMTOMsSAd4=";
|
||||
};
|
||||
}
|
@ -1,4 +0,0 @@
|
||||
import ./generic.nix {
|
||||
version = "1.36.0";
|
||||
sha256 = "sha256-oAx5BzEjqIfBf0Rsd4KklVajUSo9Natna31Trhu41u8=";
|
||||
}
|
@ -93,9 +93,9 @@ in {
|
||||
major = "3";
|
||||
minor = "13";
|
||||
patch = "0";
|
||||
suffix = "b1";
|
||||
suffix = "b2";
|
||||
};
|
||||
hash = "sha256-unFqxWsDm1Ra1KkM5Yaleql4aTZFU3Ru8kRXKM7sGY4=";
|
||||
hash = "sha256-vxG+AbQqB6Nlnk4jNZHgPaYxtxEqph7h4DDuuMXf2Gk=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation ( finalAttrs: {
|
||||
pname = "blst";
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supranational";
|
||||
repo = "blst";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=";
|
||||
hash = "sha256-z/xnttMuAOfoKn/yCBwdYbgcd6cDLD6tZxInAWn8XIk=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "b2sdk";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "Backblaze";
|
||||
repo = "b2-sdk-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ENEAynUd66sjS+/Qoy9qyffPpSvxdnY1Nwdi+JTE96I=";
|
||||
hash = "sha256-Duva6rFYtMAfMYb2Ze8k3jIX8Ld8u4zdl7WXDbS0o64=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bdffont";
|
||||
version = "0.0.25";
|
||||
version = "0.0.26";
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IQ18ospOCg/iyT0Ts+BwfbFqUBz71War7c3KMl/3z+Y=";
|
||||
hash = "sha256-Q8IqwJmAYFicTX7RrVU9UvGZX+oaPb0RKlIFwArktXk=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
@ -366,7 +366,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.121";
|
||||
version = "1.34.122";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -374,7 +374,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-tqLJmBDBbkfVmHKmYSW/6H1a+5e1YTZXoVxoddXjU24=";
|
||||
hash = "sha256-gJdKU5mNiAr5dMVNWE/XBzOxD4QkbkDnRY6vTTsnoXY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.121";
|
||||
version = "1.34.122";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-8OvFc9QA/HxK1thXU+N9pi8oZenlTH01KAtifZuoS94=";
|
||||
hash = "sha256-oX1MW1o8EOj6tm3Bf78qHbzJ2mC44J0jps+FHM7b+q8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
freezegun,
|
||||
dacite,
|
||||
pysnmp-lextudio,
|
||||
pytest-asyncio,
|
||||
@ -9,11 +10,12 @@
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
syrupy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "brother";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -22,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "bieniu";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-W7bakj/94l0pL5fOb+CK+Z6k1cbv/CY9XjXGYZfLFY4=";
|
||||
hash = "sha256-5fd+UznnOFnqYL8CPX90Y2z6q35oUH638mz4l+Ux6oE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
@ -33,9 +35,11 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
freezegun
|
||||
pytest-asyncio
|
||||
pytest-error-for-skips
|
||||
pytestCheckHook
|
||||
syrupy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "brother" ];
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "3.9.1";
|
||||
version = "3.9.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,13 +23,9 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "bthome-ble";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-v3SzzbdWRJISuF1THHlrvci4b+H1Zw/0e5iSEB0Scvw=";
|
||||
hash = "sha256-T6R3w8ZatgB73/rM5GLS9dBp3E1rvbqHo+QS6GHHI4w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./habluetooth-3.0-compat.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail " --cov=bthome_ble --cov-report=term-missing:skip-covered" ""
|
||||
@ -53,7 +49,7 @@ buildPythonPackage rec {
|
||||
description = "Library for BThome BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/bthome-ble";
|
||||
changelog = "https://github.com/bluetooth-devices/bthome-ble/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
@ -1,48 +0,0 @@
|
||||
diff --git a/tests/test_parser_v1.py b/tests/test_parser_v1.py
|
||||
index d717263..bb03d80 100644
|
||||
--- a/tests/test_parser_v1.py
|
||||
+++ b/tests/test_parser_v1.py
|
||||
@@ -77,6 +77,7 @@ def bytes_to_service_info(
|
||||
advertisement=None,
|
||||
connectable=False,
|
||||
time=ADVERTISEMENT_TIME,
|
||||
+ tx_power=None,
|
||||
)
|
||||
|
||||
|
||||
@@ -96,6 +97,7 @@ def bytes_to_encrypted_service_info(
|
||||
advertisement=None,
|
||||
connectable=False,
|
||||
time=ADVERTISEMENT_TIME,
|
||||
+ tx_power=None,
|
||||
)
|
||||
|
||||
|
||||
@@ -1195,6 +1197,7 @@ def test_bthome_multiple_uuids(caplog):
|
||||
advertisement=None,
|
||||
connectable=False,
|
||||
time=ADVERTISEMENT_TIME,
|
||||
+ tx_power=None,
|
||||
)
|
||||
|
||||
device = BTHomeBluetoothDeviceData()
|
||||
diff --git a/tests/test_parser_v2.py b/tests/test_parser_v2.py
|
||||
index 8fee31a..3ff8bc3 100644
|
||||
--- a/tests/test_parser_v2.py
|
||||
+++ b/tests/test_parser_v2.py
|
||||
@@ -97,6 +97,7 @@ def bytes_to_service_info(
|
||||
advertisement=None,
|
||||
connectable=False,
|
||||
time=time,
|
||||
+ tx_power=None,
|
||||
)
|
||||
|
||||
|
||||
@@ -3171,6 +3172,7 @@ def test_bthome_multiple_uuids(caplog):
|
||||
advertisement=None,
|
||||
connectable=False,
|
||||
time=ADVERTISEMENT_TIME,
|
||||
+ tx_power=None,
|
||||
)
|
||||
|
||||
device = BTHomeBluetoothDeviceData()
|
@ -136,6 +136,11 @@ buildPythonPackage rec {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# flaky / timing sensitive
|
||||
"test_fastapi_server_token_authn_allows_when_it_should_allow"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"chromadb/test/property/test_cross_version_persist.py"
|
||||
|
@ -11,7 +11,7 @@
|
||||
let
|
||||
# 0.18.12 was yanked from PyPI, it refers to this issue:
|
||||
# https://github.com/deschler/django-modeltranslation/issues/701
|
||||
version = "0.19.0";
|
||||
version = "0.19.2";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "django-modeltranslation";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage {
|
||||
owner = "deschler";
|
||||
repo = "django-modeltranslation";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ypz1C+Dx1v61A7LvIsW644qfFjNHQ7KXeKewQ5MAgi0=";
|
||||
hash = "sha256-l0NyHIDAv7qmwtbMcxdnHFExlLchdfkP4iX/1ABzcRA=";
|
||||
};
|
||||
|
||||
# Remove all references to pytest-cov
|
||||
|
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.45.0";
|
||||
version = "2.46.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8vaSLR+cIKohDpbC679cKydLsnBKhewtTpdBDymxjss=";
|
||||
hash = "sha256-3kbZ+y22ml8j4NVjfEzzl1JcAsbyVJGCRJuitv7K7lw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.17.0";
|
||||
version = "3.18.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YMUEBj8c154KA5Y/cm1gbypDxkfY4ncCq5wbym5rS9s=";
|
||||
hash = "sha256-R0CMx16DmMfc6Tw/YqPthYKyDxJcyODdMxAVrj62L34=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
42
pkgs/development/python-modules/hakuin/default.nix
Normal file
42
pkgs/development/python-modules/hakuin/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
jinja2,
|
||||
nltk,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hakuin";
|
||||
version = "0-unstable-2024-03-31";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pruzko";
|
||||
repo = "hakuin";
|
||||
rev = "3b7b76dcbfb8ab2b98e6dee08df02158327af772";
|
||||
hash = "sha256-tRjo9a0ZCBjKxbXTkiKFzfL4pL5awF5vXmsJlYxwoIw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
jinja2
|
||||
nltk
|
||||
];
|
||||
|
||||
# Module has no test
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "hakuin" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Blind SQL Injection optimization and automation framework";
|
||||
homepage = "https://github.com/pruzko/hakuin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langfuse";
|
||||
version = "2.33.1";
|
||||
version = "2.35.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langfuse";
|
||||
repo = "langfuse-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZPCL3Xle4qEw2pNIcja252meep26W/RbVEk2suzywYI=";
|
||||
hash = "sha256-u1gnv2eDYhF0C4r88VMIedxUEk6WU88Q0mlweVKLaoc=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.39.5";
|
||||
version = "1.40.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -43,7 +43,7 @@ buildPythonPackage rec {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AAOXe+e7iNppKUaOoUIgofAj93FbwYJGfi+TFzj09RA=";
|
||||
hash = "sha256-mXrLhgOETrkwHYSJSmEPvFwZiO0kx9FmXlTJN2WZ8WI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-agent-openai";
|
||||
version = "0.2.5";
|
||||
version = "0.2.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_agent_openai";
|
||||
inherit version;
|
||||
hash = "sha256-RfTMZw0Deopn9UHTpNCV9/Ycr/btLCVwJEHrERbUtJU=";
|
||||
hash = "sha256-E85TXwPjLIIXY8AeJq9CIvOYEXhiJBTThoAToZRugSQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "llama-index-llms-openai" ];
|
||||
|
@ -46,7 +46,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.10.42";
|
||||
version = "0.10.43";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DdD0gllACmwtXDQutjaKQmB8OpCBu+jgQ963g0dNW2c=";
|
||||
hash = "sha256-eqT3PR1yOrMU/lWGOr70OcekTeHveDfM9C8VOJEx1ps=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-postgres";
|
||||
version = "0.1.7";
|
||||
version = "0.1.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_postgres";
|
||||
inherit version;
|
||||
hash = "sha256-00ccEfjYY8qrNYymHQ5w43w8zAHUAntO6oiwYUwaOVw=";
|
||||
hash = "sha256-gBa5Z6FaPTFw75CtzY0o/kaXr+3xbOaXQ62qbvue1Ko=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [ "psycopg2-binary" ];
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-qdrant";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_qdrant";
|
||||
inherit version;
|
||||
hash = "sha256-qeKV7jlBTujUEYMcPCS+PAD6xRlTBVi/DGJZ/MSN64A=";
|
||||
hash = "sha256-Iju/6Mh/dooQb8u3MHFc8XgNel2FBOI0VAGh6/dNZT4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.126.2";
|
||||
version = "2.128.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eejIDpKpPekxrm1H9x2skxK67KNUm9mmrGM23hZ6ztM=";
|
||||
hash = "sha256-vdVfufsABznSgTMgbeTAFqGWo4JXAZoFaMXpvs3stmE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
@ -16,18 +16,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyscf";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyscf";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UCchzoYsqeIGViewPf4KedmhYktXLmp5Me4lzb1i8p0=";
|
||||
hash = "sha256-y1RQKxFfhOC6+vUMJiXexaZeYZhav5t30XP7jooJ//0=";
|
||||
};
|
||||
|
||||
# setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.
|
||||
nativeBuildInputs = [ cmake ];
|
||||
build-system = [ cmake ];
|
||||
dontUseCmakeConfigure = true;
|
||||
preConfigure = ''
|
||||
export CMAKE_CONFIGURE_ARGS="-DBUILD_LIBCINT=0 -DBUILD_LIBXC=0 -DBUILD_XCFUN=0"
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
xcfun
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
cppe
|
||||
h5py
|
||||
numpy
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user