mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-10 08:39:08 +03:00
Merge master into staging-next
This commit is contained in:
commit
50751b0602
@ -12098,6 +12098,11 @@
|
||||
githubId = 59313755;
|
||||
name = "Maxim Karasev";
|
||||
};
|
||||
mxmlnkn = {
|
||||
github = "mxmlnkn";
|
||||
githubId = 6842824;
|
||||
name = "Maximilian Knespel";
|
||||
};
|
||||
myaats = {
|
||||
email = "mats@mats.sh";
|
||||
github = "Myaats";
|
||||
@ -15290,6 +15295,12 @@
|
||||
githubId = 171470;
|
||||
name = "Sam Hug";
|
||||
};
|
||||
SamirTalwar = {
|
||||
email = "lazy.git@functional.computer";
|
||||
github = "SamirTalwar";
|
||||
githubId = 47852;
|
||||
name = "Samir Talwar";
|
||||
};
|
||||
samlich = {
|
||||
email = "nixos@samli.ch";
|
||||
github = "samlich";
|
||||
|
@ -204,6 +204,10 @@
|
||||
|
||||
- `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option.
|
||||
|
||||
- `nano` was removed from `environment.defaultPackages`. To not leave systems without a editor, now `programs.nano.enable` is enabled by default.
|
||||
|
||||
- `programs.nano.nanorc` and `programs.nano.syntaxHighlight` no longer have an effect unless `programs.nano.enable` is set to true which is the default.
|
||||
|
||||
- `services.outline.sequelizeArguments` has been removed, as `outline` no longer executes database migrations via the `sequelize` cli.
|
||||
|
||||
- The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`.
|
||||
|
@ -42,8 +42,7 @@ let
|
||||
];
|
||||
|
||||
defaultPackageNames =
|
||||
[ "nano"
|
||||
"perl"
|
||||
[ "perl"
|
||||
"rsync"
|
||||
"strace"
|
||||
];
|
||||
|
@ -2,14 +2,16 @@
|
||||
|
||||
let
|
||||
cfg = config.programs.nano;
|
||||
LF = "\n";
|
||||
in
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
programs.nano = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "nano") // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "nano" { };
|
||||
|
||||
nanorc = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
@ -24,28 +26,22 @@ in
|
||||
set tabsize 2
|
||||
'';
|
||||
};
|
||||
|
||||
syntaxHighlight = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether to enable syntax highlight for various languages.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) {
|
||||
environment.etc.nanorc.text = lib.concatStringsSep LF (
|
||||
( lib.optionals cfg.syntaxHighlight [
|
||||
"# The line below is added because value of programs.nano.syntaxHighlight is set to true"
|
||||
''include "${pkgs.nano}/share/nano/*.nanorc"''
|
||||
""
|
||||
])
|
||||
++ ( lib.optionals (cfg.nanorc != "") [
|
||||
"# The lines below have been set from value of programs.nano.nanorc"
|
||||
cfg.nanorc
|
||||
])
|
||||
);
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment = {
|
||||
etc.nanorc.text = (lib.optionalString cfg.syntaxHighlight ''
|
||||
# load syntax highlighting files
|
||||
include "${cfg.package}/share/nano/*.nanorc"
|
||||
'') + cfg.nanorc;
|
||||
systemPackages = [ cfg.package ];
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -13,6 +13,7 @@
|
||||
, fmt_9
|
||||
, glm
|
||||
, gtk3
|
||||
, hidapi
|
||||
, imgui
|
||||
, libpng
|
||||
, libzip
|
||||
@ -31,13 +32,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cemu";
|
||||
version = "2.0-45";
|
||||
version = "2.0-47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cemu-project";
|
||||
repo = "Cemu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Bi2ws08e+6rNv83ypLrgB/KZWt95i7UkFrqhCr/0Zko=";
|
||||
hash = "sha256-0N/bJJHWMHF+ZlVxNHV8t/1jFr3ER3GNF8CPAHVSsak=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
|
||||
fmt_9
|
||||
glm
|
||||
gtk3
|
||||
hidapi
|
||||
imgui
|
||||
libpng
|
||||
libzip
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ttyper";
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "max-niederman";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5U6+16gy5s+1zDSxy6rMheZFAbpiya3uxvr21VaHDZQ=";
|
||||
hash = "sha256-b6yxl7dCPLWnzsrRKegubtLDLObOnCf7kvZtkobzC1o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O5fPV20OSEMv7Yw982ZorhN7y3NTzrprS79n2ID0LwU=";
|
||||
cargoHash = "sha256-N+JJV+q/tIMN60x9DdD/i2+9Wp44kzpMb09dsrSceEk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal-based typing test";
|
||||
|
@ -41,9 +41,9 @@
|
||||
version = "2023-08-01";
|
||||
};
|
||||
};
|
||||
sha256 = "0b1l8gjhqbsyqi30rsn8dyq2hdvwasdqfk1qzk55f9ch4wclkjk5";
|
||||
sha256bin64 = "047w7y4c8k076yzrjc50lvwncbk8b3lyqnd1si9nrsl7c66j2h0q";
|
||||
version = "117.0.5938.92";
|
||||
sha256 = "1bdfvcywj6ggrn6fz6g7hqhikg0cjdj8llgcm4wji52i7897gw18";
|
||||
sha256bin64 = "05a2sggxm76kc6m5wcpb4gibnxa07j291m7292zdvyg32kffqxjr";
|
||||
version = "117.0.5938.132";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
@ -54,12 +54,12 @@
|
||||
version = "2023-08-01";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
rev = "117.0.5938.92-1";
|
||||
sha256 = "0ix0vaki9r305js61qraiah3vqjaj3dyycabi6grfavdgjpjkasb";
|
||||
rev = "117.0.5938.132-1";
|
||||
sha256 = "11bg7j5838nhkwpv7blvpijjhqrisvx032bjmkng1cpy2d0kmfcx";
|
||||
};
|
||||
};
|
||||
sha256 = "0b1l8gjhqbsyqi30rsn8dyq2hdvwasdqfk1qzk55f9ch4wclkjk5";
|
||||
sha256bin64 = "047w7y4c8k076yzrjc50lvwncbk8b3lyqnd1si9nrsl7c66j2h0q";
|
||||
version = "117.0.5938.92";
|
||||
sha256 = "1bdfvcywj6ggrn6fz6g7hqhikg0cjdj8llgcm4wji52i7897gw18";
|
||||
sha256bin64 = "05a2sggxm76kc6m5wcpb4gibnxa07j291m7292zdvyg32kffqxjr";
|
||||
version = "117.0.5938.132";
|
||||
};
|
||||
}
|
||||
|
@ -16,6 +16,7 @@
|
||||
, enableWidevine ? false, widevine-cdm ? null
|
||||
, commandLineArgs ? ""
|
||||
, pulseSupport ? stdenv.isLinux, libpulseaudio
|
||||
, kerberosSupport ? true, libkrb5
|
||||
}:
|
||||
|
||||
let
|
||||
@ -57,7 +58,8 @@ in stdenv.mkDerivation rec {
|
||||
libdrm mesa vulkan-loader
|
||||
wayland pipewire
|
||||
] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
|
||||
++ lib.optional pulseSupport libpulseaudio;
|
||||
++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optional kerberosSupport libkrb5;
|
||||
|
||||
libPath = lib.makeLibraryPath buildInputs
|
||||
+ lib.optionalString (stdenv.is64bit)
|
||||
|
@ -5,9 +5,14 @@
|
||||
, fetchFromGitHub
|
||||
, coreutils
|
||||
, nettools
|
||||
, dmidecode
|
||||
, busybox
|
||||
, util-linux
|
||||
, stdenv
|
||||
, dmidecode
|
||||
, bashInteractive
|
||||
, nix-update-script
|
||||
, testers
|
||||
, ssm-agent
|
||||
, overrideEtc ? true
|
||||
}:
|
||||
|
||||
@ -27,17 +32,17 @@ let
|
||||
in
|
||||
buildGoPackage rec {
|
||||
pname = "amazon-ssm-agent";
|
||||
version = "3.2.1478.0";
|
||||
version = "3.2.1630.0";
|
||||
|
||||
goPackagePath = "github.com/aws/${pname}";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
rev = "refs/tags/${version}";
|
||||
owner = "aws";
|
||||
repo = "amazon-ssm-agent";
|
||||
hash = "sha256-SS0N3Wcksk2vq52K6GYE9z4hrckXGqiuCuYPHkH4SWc=";
|
||||
hash = "sha256-0tN0rBfz2VZ4UkYLFDGg9218O9vyyRT2Lrppu9TETao=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -49,7 +54,7 @@ buildGoPackage rec {
|
||||
./0002-version-gen-don-t-use-unnecessary-constants.patch
|
||||
];
|
||||
|
||||
# See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1478.0/makefile#L120-L138
|
||||
# See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138
|
||||
# The updater is not built because it cannot work on NixOS
|
||||
subPackages = [
|
||||
"core"
|
||||
@ -65,7 +70,7 @@ buildGoPackage rec {
|
||||
"-w"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
postPatch = ''
|
||||
printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh
|
||||
|
||||
substituteInPlace agent/platform/platform_unix.go \
|
||||
@ -73,16 +78,19 @@ buildGoPackage rec {
|
||||
--replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \
|
||||
--replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"'
|
||||
|
||||
substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \
|
||||
--replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode
|
||||
|
||||
substituteInPlace agent/session/shell/shell_unix.go \
|
||||
--replace '"script"' '"${util-linux}/bin/script"'
|
||||
|
||||
substituteInPlace agent/rebooter/rebooter_unix.go \
|
||||
--replace "/sbin/shutdown" "shutdown"
|
||||
|
||||
echo "${version}" > VERSION
|
||||
'' + lib.optionalString overrideEtc ''
|
||||
substituteInPlace agent/appconfig/constants_unix.go \
|
||||
--replace '"/etc/amazon/ssm/"' '"${placeholder "out"}/etc/amazon/ssm/"'
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \
|
||||
--replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
@ -129,11 +137,23 @@ buildGoPackage rec {
|
||||
wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = ssm-agent;
|
||||
command = "amazon-ssm-agent --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Agent to enable remote management of your Amazon EC2 instance configuration";
|
||||
changelog = "https://github.com/aws/amazon-ssm-agent/releases/tag/${version}";
|
||||
homepage = "https://github.com/aws/amazon-ssm-agent";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ copumpkin manveru ];
|
||||
maintainers = with maintainers; [ copumpkin manveru anthonyroussel ];
|
||||
|
||||
# Darwin support is broken
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
@ -7,6 +7,7 @@
|
||||
, yarn
|
||||
, nodejs
|
||||
, fetchYarnDeps
|
||||
, jq
|
||||
, electron
|
||||
, element-web
|
||||
, sqlcipher
|
||||
@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
|
||||
sha256 = desktopYarnHash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper ]
|
||||
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper jq ]
|
||||
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
|
||||
|
||||
inherit seshat;
|
||||
|
@ -1,9 +1,9 @@
|
||||
{
|
||||
"version" = "1.11.43";
|
||||
"version" = "1.11.45";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-mFI3+IRBrJT6wTxoggLTGoB48FyBoRhQSmUKbC8sASI=";
|
||||
"desktopYarnHash" = "1w5blpdk61yqai6gwk9n28cf57crnahs6hr0p3xvwchbc9x50dfq";
|
||||
"webSrcHash" = "sha256-LF6SMHYP2mxxHnh1YcLYoTEME7SgTVMKa8lz1rVZ+HA=";
|
||||
"webYarnHash" = "0qvvhbj5mrrry2zcslz5n3pv4bpmdr5vsv446fm4cfvrj4awbz06";
|
||||
"desktopSrcHash" = "sha256-SxpnvIctV738mMRmMiuLgr1InMrlWH39/6lTO0wu+vQ=";
|
||||
"desktopYarnHash" = "09a2swngqjz4hahzvczhw0lh38y39glc1dkkhjkp4jqvmds9ni7n";
|
||||
"webSrcHash" = "sha256-hImwZ7vzpupRulk9g5jhfv0sgZqmPXnggJjUUwZ+UCE=";
|
||||
"webYarnHash" = "0r2xzq9630vky32hqp3h1skdgv3jiiffi8553yzzk4zr45nlvf9d";
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, libax25
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pat";
|
||||
@ -15,10 +21,25 @@ buildGoModule rec {
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isLinux [ libax25 ];
|
||||
|
||||
# Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25.
|
||||
# ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17
|
||||
tags = lib.optionals stdenv.isLinux [ "libax25" ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage man/pat-configure.1 man/pat.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pat is a cross platform Winlink client written in Go.";
|
||||
homepage = "https://getpat.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotemup ];
|
||||
maintainers = with maintainers; [ dotemup sarcasticadmin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, eigen
|
||||
, fetchFromGitHub
|
||||
, libcifpp
|
||||
, libmcfp
|
||||
@ -8,24 +9,24 @@
|
||||
}:
|
||||
let
|
||||
libcifpp' = libcifpp.overrideAttrs (oldAttrs: {
|
||||
# dssp 4.3.1 requires specific version "5.1.0" of libcifpp
|
||||
version = "5.1.0";
|
||||
# dssp 4.4.3 requires specific version "5.2.0" of libcifpp
|
||||
version = "5.2.0";
|
||||
src = fetchFromGitHub {
|
||||
inherit (oldAttrs.src) owner repo rev;
|
||||
hash = "sha256-PUsi4T6huSqwaa6RnBP1Vj+0a1ePrvrHD0641Lkkc5s=";
|
||||
hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs=";
|
||||
};
|
||||
});
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dssp";
|
||||
version = "4.4.2";
|
||||
version = "4.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDB-REDO";
|
||||
repo = "dssp";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-Gic/rE/G24P5g4Uhf2lcvVa6i/4KGQzCpK4KlpjXcS0=";
|
||||
hash = "sha256-zPmRR7sxVNErwabLqA5CNMO4K1qHdmC9FBPjcx91KuM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
eigen
|
||||
libcifpp'
|
||||
libmcfp
|
||||
zlib
|
||||
|
@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dmlive";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "THMonster";
|
||||
repo = pname;
|
||||
rev = "92ce90163c3d84f0fab99e6dc192a65c616ffd81"; # no tag
|
||||
hash = "sha256-3eRC/XmvZXe3DyXOqSkNpTbddtGr/lcaTaFYqZLZq+w=";
|
||||
rev = "0a07fd1b831bc9e9d34e474284430297b63446c7"; # no tag
|
||||
hash = "sha256-Jvxbdm9Swh8m03uZEMTkUhIHNfhE+N2a3w7j+liweKE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TQTdz+ZC5cZxWhccnUmXnq+j2EYM5486mIjn6Poe5a8=";
|
||||
cargoHash = "sha256-/84T7K6WUt2Bfx9qdZjyOHcJEGoquCfRX1ctQBuUjEc=";
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
40
pkgs/by-name/oe/oelint-adv/package.nix
Normal file
40
pkgs/by-name/oe/oelint-adv/package.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, nix-update-script
|
||||
, python3
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "3.25.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-dhTS2DZ7Usb1jgBv9Wm86w8CCMt64aHyBrxucLZUQjs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
anytree
|
||||
colorama
|
||||
oelint-parser
|
||||
urllib3
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "urllib3" ];
|
||||
pythonImportsCheck = [ "oelint_adv" ];
|
||||
|
||||
# Fail to run inside the code the build.
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Advanced bitbake-recipe linter";
|
||||
homepage = "https://github.com/priv-kweihmann/oelint-adv";
|
||||
changelog = "https://github.com/priv-kweihmann/oelint-adv/releases/tag/v${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
};
|
||||
}
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "functionalplus";
|
||||
version = "0.2.18-p0";
|
||||
version = "0.2.20-p0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dobiasd";
|
||||
repo = "FunctionalPlus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jypBQjFdVEktB8Q71RTg+3RJoeFwD5Wxw+fq+4QG38g=";
|
||||
sha256 = "sha256-PKd3gx63VTxyq1q0v7WaKXVA0oICpZQfVsKsgUml9wk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -109,8 +109,8 @@ let
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
# fix compatibility with protobuf 23
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/d6b33bd915dc6e63b30db2cd29150d55b289d7ed/protobuf-23.patch";
|
||||
hash = "sha256-KQAcrjQ3rK9pDQUOUK6AS4ej8YvtRv9WZOxby31Y5r4=";
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/5cfb8728ca626af41d5dc2b1f642d026c011ec56/protobuf-23.patch";
|
||||
hash = "sha256-msVQEAt0DewOnZIgymGijJEpIXbfmMUkdbIyJ0ZNuok=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/ -A '*.tar.xz' )
|
||||
|
@ -5,12 +5,12 @@
|
||||
|
||||
qtModule rec {
|
||||
pname = "qtmqtt";
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "qt";
|
||||
repo = "qtmqtt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0=";
|
||||
hash = "sha256-F0rq72Cvnwy2cJmw3wUL9t8ZsnI61HBRMMWRwKdSEs8=";
|
||||
};
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
}
|
||||
|
@ -4,315 +4,307 @@
|
||||
|
||||
{
|
||||
qt3d = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11";
|
||||
name = "qt3d-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qt5 = {
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515";
|
||||
name = "qt5-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt3d-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1p7x70wnqynsvd7w4jkz31amf02hwh49gqsccv5hhlpx50h9ydhd";
|
||||
name = "qt3d-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qt5compat = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr";
|
||||
name = "qt5compat-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qt5compat-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0r34h35w0m17zyncxq2a0kichv5l4j01mximg6m5mqbifziakcpf";
|
||||
name = "qt5compat-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x";
|
||||
name = "qtactiveqt-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtactiveqt-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1lawc0jq5w0jqjagkf7d0g9i8rrsdgrd4k34ylriy27djpd53b1j";
|
||||
name = "qtactiveqt-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x";
|
||||
name = "qtbase-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0imm0x9j7102ymcz7gl0dbnbi8qk2jmijb4gg7wh9sp41cillbyz";
|
||||
name = "qtbase-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp";
|
||||
name = "qtcharts-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtcharts-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1n9fflfh47wm0fk1995dw56vyqfprwv5ialjfpcxxgzm187816sa";
|
||||
name = "qtcharts-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv";
|
||||
name = "qtconnectivity-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtconnectivity-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0nrzpqs3cq0inwp3siskxz9yxxqkz15yaf9aicnggvvic2q328i4";
|
||||
name = "qtconnectivity-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8";
|
||||
name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdatavis3d-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0qf07m3bplqpm7pkn3145l2k9h0npv9qbw9gcnydzp0qdsqc1dhi";
|
||||
name = "qtdatavis3d-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk";
|
||||
name = "qtdeclarative-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdeclarative-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "05fjb70n35y42dp7g0sd99rbvmn9133z08k6rlp8ifq6sb9dcka0";
|
||||
name = "qtdeclarative-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3";
|
||||
name = "qtdoc-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtdoc-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1k430zc8khakpcjbj7vmkgrdyrz0y6bfcfgw4dzc68gcvbwbq27g";
|
||||
name = "qtdoc-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgrpc = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks";
|
||||
name = "qtgrpc-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtgrpc-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "10wbq5zcr263g1hi06xpyvh7y2advhhy07asx4aqwf56v9rpmgvf";
|
||||
name = "qtgrpc-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qthttpserver = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq";
|
||||
name = "qthttpserver-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qthttpserver-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0ivcaqf39k7mawd17wf2db3kn8ch2ajm4gqm6wl1iqkp45aqjm05";
|
||||
name = "qthttpserver-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a";
|
||||
name = "qtimageformats-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtimageformats-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1jwc2gzlymxx82khwbaav83ma8y1rl2v593jq0jd13kkkb22dh29";
|
||||
name = "qtimageformats-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlanguageserver = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk";
|
||||
name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlanguageserver-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "12i1g8inp667w95gx4ldc3shb3pjd65c1x74qhmr6k2mq1sc3h60";
|
||||
name = "qtlanguageserver-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlocation = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9";
|
||||
name = "qtlocation-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlocation-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1k77ck556wkcjzly2z2p9da54hpf8x5mjhyjvn6039xzjzax232k";
|
||||
name = "qtlocation-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlottie = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0";
|
||||
name = "qtlottie-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtlottie-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "08jpm4vhcwh0a72np6fmws79v9k3dpsji5gd3ws1rh04n62lcb1x";
|
||||
name = "qtlottie-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl";
|
||||
name = "qtmultimedia-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtmultimedia-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "09zzl3wywhnz5a0ym3q7nbydjcq2vj2bz7gi5p8hrhlqpg9g6r7d";
|
||||
name = "qtmultimedia-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f";
|
||||
name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtnetworkauth-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "00m71302b1m4hjzn0hv222yz1d8dvm9n5djgyn38ikazb5smvd1n";
|
||||
name = "qtnetworkauth-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpositioning = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh";
|
||||
name = "qtpositioning-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtpositioning-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "13vdklh87jz2p3miaifffi6r0ciw191b9ciaicwk0wry5fdhj6mb";
|
||||
name = "qtpositioning-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3d = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m";
|
||||
name = "qtquick3d-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3d-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0pffi1wcai6d5w18v39fdwp74za6ydjjcgbgn84y939h7xham0k6";
|
||||
name = "qtquick3d-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3dphysics = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m";
|
||||
name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquick3dphysics-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1fm4ll8cjbdjn35pbi4763sfxzj49gml2rkdr7mrzwrz4hfk149j";
|
||||
name = "qtquick3dphysics-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickeffectmaker = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym";
|
||||
name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquickeffectmaker-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "19wwmal5k00l54ybb1ml2c40r4y5a1cwkd36zlri9jycs6x9nrxr";
|
||||
name = "qtquickeffectmaker-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquicktimeline = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9";
|
||||
name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtquicktimeline-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0nvv5v5dy3ga1c1whrqdwvicmkys0psb720jycq833yqazn4qgpv";
|
||||
name = "qtquicktimeline-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60";
|
||||
name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtremoteobjects-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "18g78q2b9iabc1a9sgbksxj2nsiizaq4lfmxqljjq2cbzd09x74d";
|
||||
name = "qtremoteobjects-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58";
|
||||
name = "qtscxml-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtscxml-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0ld7i84nxxzp3bm96v2ymg53kkb8fpws2vq8b5bibs2zq0m6gn7k";
|
||||
name = "qtscxml-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0";
|
||||
name = "qtsensors-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsensors-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "14y25lp296vddk3n4wpf8glshfww73dg47khhvw4s4l3b8rsgl8r";
|
||||
name = "qtsensors-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph";
|
||||
name = "qtserialbus-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialbus-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "13fhm8r0zp8rhbcn9i01s73kdng8afdvh5y0grqw8xqd2ncrav91";
|
||||
name = "qtserialbus-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06";
|
||||
name = "qtserialport-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtserialport-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1njfhj063gw7v05ynw4frgwisl2cnlkd4xk2yf22hhmiihwsvjwr";
|
||||
name = "qtserialport-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtshadertools = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya";
|
||||
name = "qtshadertools-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtshadertools-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0wrm1yp90fdqwvw8chxd2diic8zl1akr1yyyqmw8w14z80x7n6r0";
|
||||
name = "qtshadertools-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8";
|
||||
name = "qtspeech-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtspeech-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "170bdch6hvmqkf4y3071ym9aqbmknn0mdbayh9rpw6lj9lng9hkr";
|
||||
name = "qtspeech-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28";
|
||||
name = "qtsvg-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtsvg-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1vsvbpwh8k863nb94lrl0l8phma176b1kcfl7i3q07yad5xw8hgw";
|
||||
name = "qtsvg-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm";
|
||||
name = "qttools-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttools-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0dsy82k7ds5yziy648mxwfz6nq2vq90g43cbnjxjarv97wmx74gw";
|
||||
name = "qttools-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k";
|
||||
name = "qttranslations-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qttranslations-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1qs9x52fqnsgk1wzrvihnr6c5cigx8zimhk3dy1qxhprvh6lrd43";
|
||||
name = "qttranslations-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0bg678dirmw5b3d46abbidkch0p5hchmqgiwvcvxfh3928aqz01i";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h";
|
||||
name = "qtwayland-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwayland-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "17rnaap0xa0c6q8b0drm020qny0i3ia8nb0z66xq36zzny48aapp";
|
||||
name = "qtwayland-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261";
|
||||
name = "qtwebchannel-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebchannel-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0jphdg711lhxbxg4dqrxnvkmfr2q9xzrd0h525zw94m7mfk8k7qj";
|
||||
name = "qtwebchannel-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7";
|
||||
name = "qtwebengine-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebengine-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1ra5hyyg4vymp8pgzv08smjc3fl1axdavnkpj1i5zxym1ndww513";
|
||||
name = "qtwebengine-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0";
|
||||
name = "qtwebsockets-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebsockets-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "1hx7qy7rgs46ggzifp249d8zz27bjwmbv7f960lwymjdb4bsxqh4";
|
||||
name = "qtwebsockets-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr";
|
||||
name = "qtwebview-everywhere-src-6.5.2.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.3/submodules/qtwebview-everywhere-src-6.5.3.tar.xz";
|
||||
sha256 = "0jbiwwhjp4lz4r3ym3a4wr3s966d6imffmpb0jlvkah9ji6g276g";
|
||||
name = "qtwebview-everywhere-src-6.5.3.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,19 @@
|
||||
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }:
|
||||
{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fixDarwinDylibNames, fetchFromGitHub }:
|
||||
|
||||
# I haven't done any parameter tweaking.. So the defaults provided here might be bad
|
||||
# Each of these ODBC drivers can be configured in your odbcinst.ini file using
|
||||
# the various passthru and meta values. Of note are:
|
||||
#
|
||||
# * `passthru.fancyName`, the typical name used to reference the driver
|
||||
# * `passthru.driver`, the path to the driver within the built package
|
||||
# * `meta.description`, a short description of the ODBC driver
|
||||
#
|
||||
# For example, you might generate it as follows:
|
||||
#
|
||||
# ''
|
||||
# [${package.fancyName}]
|
||||
# Description = ${package.meta.description}
|
||||
# Driver = ${package}/${package.driver}
|
||||
# ''
|
||||
|
||||
{
|
||||
psql = stdenv.mkDerivation rec {
|
||||
@ -14,6 +27,7 @@
|
||||
|
||||
buildInputs = [ unixODBC postgresql ];
|
||||
|
||||
# see the top of the file for an explanation
|
||||
passthru = {
|
||||
fancyName = "PostgreSQL";
|
||||
driver = "lib/psqlodbcw.so";
|
||||
@ -59,6 +73,7 @@
|
||||
"-DWITH_IODBC=OFF"
|
||||
];
|
||||
|
||||
# see the top of the file for an explanation
|
||||
passthru = {
|
||||
fancyName = "MariaDB";
|
||||
driver = "lib/libmaodbc${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
@ -87,6 +102,7 @@
|
||||
|
||||
cmakeFlags = [ "-DWITH_UNIXODBC=1" ];
|
||||
|
||||
# see the top of the file for an explanation
|
||||
passthru = {
|
||||
fancyName = "MySQL";
|
||||
driver = "lib/libmyodbc3-3.51.12.so";
|
||||
@ -122,6 +138,7 @@
|
||||
mv "$out"/*.* "$out/lib"
|
||||
'';
|
||||
|
||||
# see the top of the file for an explanation
|
||||
passthru = {
|
||||
fancyName = "SQLite";
|
||||
driver = "lib/libsqlite3odbc.so";
|
||||
@ -165,14 +182,15 @@
|
||||
$out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}
|
||||
'';
|
||||
|
||||
# see the top of the file for an explanation
|
||||
passthru = {
|
||||
fancyName = "ODBC Driver 17 for SQL Server";
|
||||
fancyName = "ODBC Driver ${versionMajor} for SQL Server";
|
||||
driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "ODBC Driver 17 for SQL Server";
|
||||
description = "ODBC Driver ${versionMajor} for SQL Server";
|
||||
homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
@ -181,6 +199,90 @@
|
||||
};
|
||||
};
|
||||
|
||||
msodbcsql18 = stdenv.mkDerivation(finalAttrs: {
|
||||
pname = "msodbcsql${finalAttrs.versionMajor}";
|
||||
version = "${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.${finalAttrs.versionAdditional}${finalAttrs.versionSuffix}";
|
||||
|
||||
versionMajor = "18";
|
||||
versionMinor = "1";
|
||||
versionAdditional = "1.1";
|
||||
versionSuffix = lib.optionalString stdenv.isLinux "-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = {
|
||||
x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_amd64.deb";
|
||||
aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb";
|
||||
x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz";
|
||||
aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
hash = {
|
||||
x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52";
|
||||
aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a";
|
||||
x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d";
|
||||
aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
if stdenv.isDarwin
|
||||
then
|
||||
[
|
||||
# Fix up the names encoded into the dylib, and make them absolute.
|
||||
fixDarwinDylibNames
|
||||
]
|
||||
else
|
||||
[
|
||||
dpkg
|
||||
patchelf
|
||||
];
|
||||
|
||||
unpackPhase = lib.optionalString stdenv.isLinux ''
|
||||
dpkg -x $src ./
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
if stdenv.isDarwin
|
||||
then
|
||||
''
|
||||
mkdir -p $out
|
||||
tar xf $src --strip-components=1 -C $out
|
||||
''
|
||||
else
|
||||
''
|
||||
mkdir -p $out
|
||||
mkdir -p $out/lib
|
||||
cp -r opt/microsoft/msodbcsql${finalAttrs.versionMajor}/lib64 opt/microsoft/msodbcsql${finalAttrs.versionMajor}/share $out/
|
||||
'';
|
||||
|
||||
# Replace the hard-coded paths in the dylib with nixpkgs equivalents.
|
||||
fixupPhase = lib.optionalString stdenv.isDarwin ''
|
||||
${stdenv.cc.bintools.targetPrefix}install_name_tool \
|
||||
-change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib \
|
||||
-change /opt/homebrew/lib/libodbcinst.2.dylib ${unixODBC}/lib/libodbcinst.2.dylib \
|
||||
$out/${finalAttrs.passthru.driver}
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl libkrb5 libuuid stdenv.cc.cc ]} \
|
||||
$out/${finalAttrs.passthru.driver}
|
||||
'';
|
||||
|
||||
# see the top of the file for an explanation
|
||||
passthru = {
|
||||
fancyName = "ODBC Driver ${finalAttrs.versionMajor} for SQL Server";
|
||||
driver = "lib/libmsodbcsql${if stdenv.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = finalAttrs.passthru.fancyName;
|
||||
homepage = "https://learn.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ SamirTalwar ];
|
||||
};
|
||||
});
|
||||
|
||||
redshift = stdenv.mkDerivation rec {
|
||||
pname = "redshift-odbc";
|
||||
version = "1.4.49.1000";
|
||||
@ -210,6 +312,7 @@
|
||||
|
||||
buildInputs = [ unixODBC ];
|
||||
|
||||
# see the top of the file for an explanation
|
||||
passthru = {
|
||||
fancyName = "Amazon Redshift (x64)";
|
||||
driver = "lib/libamazonredshiftodbc64.so";
|
||||
|
@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomisc";
|
||||
version = "17.3.21";
|
||||
version = "17.3.23";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NaSwjU4SfUYeUe/3nWQxfgMYrN4Ez1Dc/PE4ffJmlSs=";
|
||||
hash = "sha256-9Df/eGMnXFdv3RUh4LmlPm7STlUcVBw4flfH+bZ6q9Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-sesame";
|
||||
version = "3.1";
|
||||
version = "3.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aaugustin";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Pyyhm0th0cNEkM0sd6maCnf4qELsSO82c9CQuqQdn0w=";
|
||||
hash = "sha256-R7ySuop7E1lkxtRSVNFfzyb3Ba1mW0o6PDiTxTztK/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -33,8 +33,10 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# some tests require loopback networking
|
||||
__darwinAllowLocalNetworking = true;
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`).
|
||||
"test_run_local_server_bind_addr"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google_auth_oauthlib"
|
||||
|
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "1.29.0";
|
||||
version = "1.29.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-d5LEN7sFoO+R7pGTvLOMRoej/KB17uY3kqF+CY97x1k=";
|
||||
hash = "sha256-yqwWuRip/QmWqn7Gm3Fth46DooNGhJGLQbnsJE/67bg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
31
pkgs/development/python-modules/indexed-bzip2/default.nix
Normal file
31
pkgs/development/python-modules/indexed-bzip2/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "indexed_bzip2";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tKf9odadfQZQYJz//vWYpeB99Z8VLg+hEPvfEHXgdnM=";
|
||||
};
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "indexed_bzip2" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for parallel decompression and seeking within compressed bzip2 files";
|
||||
homepage = "https://github.com/mxmlnkn/indexed_bzip2";
|
||||
license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952
|
||||
maintainers = with lib.maintainers; [ mxmlnkn ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
37
pkgs/development/python-modules/indexed-gzip/default.nix
Normal file
37
pkgs/development/python-modules/indexed-gzip/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cython
|
||||
, zlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "indexed_gzip";
|
||||
version = "1.8.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h9JgYq9KxmknaRuMgq+5YWA8tUaFk+lclkqdNAnr/cI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
# Too complicated to get to work, not a simple pytest call.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "indexed_gzip" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to seek within compressed gzip files";
|
||||
homepage = "https://github.com/pauldmccarthy/indexed_gzip";
|
||||
license = licenses.zlib;
|
||||
maintainers = with lib.maintainers; [ mxmlnkn ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
37
pkgs/development/python-modules/indexed-zstd/default.nix
Normal file
37
pkgs/development/python-modules/indexed-zstd/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cython
|
||||
, zstd
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "indexed_zstd";
|
||||
version = "1.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-icCerrv6ihBjSTS4Fsw7qhoA5ha8yegfMVRiIOhTvvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
buildInputs = [ zstd.dev ];
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "indexed_zstd" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to seek within compressed zstd files";
|
||||
homepage = "https://github.com/martinellimarco/indexed_zstd";
|
||||
license = licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mxmlnkn ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "json-schema-for-humans";
|
||||
version = "0.45.2";
|
||||
version = "0.46";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "coveooss";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DmUQ06UabLcB67PyfRC/gmSkEY/V8kuZ/T/ZW1D11vA=";
|
||||
hash = "sha256-wTO+d0O3SKT2jJ2zNubT2q76PdJ7+kT9RBEw5MMH1yg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.112.1";
|
||||
version = "2.112.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HPmAXLEoTEDVZh1npkcLQamEn/CehzM1FOgGOHUrBrg=";
|
||||
hash = "sha256-Khh1/lpgBtUb1pfV7wNkHA6dWiBpAS899zB4Elp1ULY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
31
pkgs/development/python-modules/oelint-parser/default.nix
Normal file
31
pkgs/development/python-modules/oelint-parser/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, nix-update-script
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, regex
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oelint-parser";
|
||||
version = "2.11.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_parser";
|
||||
hash = "sha256-iR/MDHt3SEG29hSLqA36EXe8EBRZVntt+u6bwoujy0s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ regex ];
|
||||
pythonImportsCheck = [ "oelint_parser" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Alternative parser for bitbake recipes";
|
||||
homepage = "https://github.com/priv-kweihmann/oelint-parser";
|
||||
changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/v${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
};
|
||||
}
|
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "piccolo-theme";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "piccolo_theme";
|
||||
inherit version;
|
||||
hash = "sha256-sq/xWPLLAz4w6JdUfnB5E52hmj8gmrbg1oeBedyjCEE=";
|
||||
hash = "sha256-tEgYrQaVcWZadmhV6JRuXnk8m9oJLNSfb0hA309bX1U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyathena";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Mdb+pEkXbwRVx3wxpPdwkCweNO48/GuYiOLATbPUpwQ=";
|
||||
hash = "sha256-DqRjtMSlyo2PB4ipOpPxFEWl/RuKlT3yWddzCS5NL98=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -33,5 +33,8 @@ buildPythonPackage rec {
|
||||
homepage = "https://capnproto.github.io/pycapnp/";
|
||||
maintainers = with maintainers; [ cstrahan lukeadams ];
|
||||
license = licenses.bsd2;
|
||||
# No support for capnproto 1.0 yet
|
||||
# https://github.com/capnproto/pycapnp/issues/323
|
||||
broken = lib.versionAtLeast capnproto.version "1.0";
|
||||
};
|
||||
}
|
||||
|
34
pkgs/development/python-modules/python-xz/default.nix
Normal file
34
pkgs/development/python-modules/python-xz/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-xz";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-OYdGWTtwb6n6xZuMmI6rhgPh/iupGVERwLRSJ6OnfbM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "xz" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pure Python library for seeking within compressed xz files";
|
||||
homepage = "https://github.com/Rogdham/python-xz";
|
||||
license = licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mxmlnkn ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvmomi";
|
||||
version = "8.0.1.0.2";
|
||||
version = "8.0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "vmware";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NI2xkHo9A9zEvdbTt9vF91gavSnCuFjdjr6PxEvkSZM=";
|
||||
hash = "sha256-IoYxk/lS7dhw0q3kfpq7y/oDNmc1dOra0YA3CiHe8YM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
34
pkgs/development/python-modules/rapidgzip/default.nix
Normal file
34
pkgs/development/python-modules/rapidgzip/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, nasm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rapidgzip";
|
||||
version = "0.10.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gtxF9V7OQb34Z0cCuTh/Lbe1ttCbdaY0zpM3KHHGGuw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nasm ];
|
||||
|
||||
# has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "rapidgzip" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for parallel decompression and seeking within compressed gzip files";
|
||||
homepage = "https://github.com/mxmlnkn/rapidgzip";
|
||||
license = licenses.mit; # dual MIT and asl20, https://internals.rust-lang.org/t/rationale-of-apache-dual-licensing/8952
|
||||
maintainers = with lib.maintainers; [ mxmlnkn ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
37
pkgs/development/python-modules/ratarmount/default.nix
Normal file
37
pkgs/development/python-modules/ratarmount/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, fusepy
|
||||
, ratarmountcore
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ratarmount";
|
||||
version = "0.14.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-P+p0h+KuOsunPsXbRwxzAhr1XcEqMjQxHeHmA29+pDQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ratarmountcore fusepy ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
python tests/tests.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mounts archives as read-only file systems by way of indexing";
|
||||
homepage = "https://github.com/mxmlnkn/ratarmount";
|
||||
license = licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mxmlnkn ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
48
pkgs/development/python-modules/ratarmountcore/default.nix
Normal file
48
pkgs/development/python-modules/ratarmountcore/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchgit
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, indexed-bzip2
|
||||
, indexed-gzip
|
||||
, indexed-zstd
|
||||
, python-xz
|
||||
, rapidgzip
|
||||
, rarfile
|
||||
, zstandard # Python bindings
|
||||
, zstd # System tool
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ratarmountcore";
|
||||
version = "0.6.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mxmlnkn/ratarmount";
|
||||
# The revision is hardcoded for now to fix problems with the tests, which are not worthy of a new release
|
||||
# tag because releases do not officially contain tests. On the next release, use the commented revision,
|
||||
# which points to a release tag, instead.
|
||||
#rev = "core-v${version}";
|
||||
rev = "ea43572dfbac4770a27ef2169f72ff73ee4a4ae9";
|
||||
hash = "sha256-sPApM5OW+UbujFXHSL4ptMaegajz7FNtXz/KftTlw+U=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/core";
|
||||
|
||||
propagatedBuildInputs = [ indexed-gzip indexed-bzip2 indexed-zstd python-xz rapidgzip rarfile ];
|
||||
|
||||
pythonImportsCheck = [ "ratarmountcore" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook zstandard zstd ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for accessing archives by way of indexing";
|
||||
homepage = "https://github.com/mxmlnkn/ratarmount/tree/master/core";
|
||||
license = licenses.mit;
|
||||
maintainers = with lib.maintainers; [ mxmlnkn ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ua-parser";
|
||||
version = "0.16.1";
|
||||
version = "0.18.0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
repo = "uap-python";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-vyzeRi/wYEyezSU+EigJATgrNvABGCWVWlSFhKGipLE=";
|
||||
hash = "sha256-GiuGPnyYL0HQ/J2OpDTD1/panZCuzKtD3mKW5op5lXA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A brand-new language server for Typst";
|
||||
homepage = "https://github.com/nvarner/typst-lsp";
|
||||
mainProgram = "typst-lsp";
|
||||
changelog = "https://github.com/nvarner/typst-lsp/releases/tag/${src.rev}";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ figsoda GaetanLepage ];
|
||||
|
@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "orogene";
|
||||
version = "0.3.27";
|
||||
version = "0.3.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orogene";
|
||||
repo = "orogene";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y58S8oou1GBR1Cx77IzLvLmZ/MN88P9k1RGCFOVbHHc=";
|
||||
hash = "sha256-q6YPyxfOiTOQ6eVjBIsnV7HhwM3A3EIiRCJpDGKZRrQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hZQxzhq61h83geLazhEkoaB1oRz/xSXuwW7BuBWxfHs=";
|
||||
cargoHash = "sha256-2NAwy95C8/rEq5ssq3poBOL+crwaHJh1Vo+sYiDb6Ds=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/rui314/mold/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ azahi nitsky paveloom ];
|
||||
mainProgram = "mold";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-deny";
|
||||
rev = version;
|
||||
hash = "sha256-IA5LaagNsAkSP7ut5iqUUI8DJMr7U+nwqVsCWR8mOnY=";
|
||||
hash = "sha256-syBf90xPcwp86xJDHtLMZXCsqh4P0mcaAcNnvjYudn8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xiVZNBIdnRorMZDabpfE6Pans3Nh56VA29fYRu7N5cE=";
|
||||
cargoHash = "sha256-YmHHuFubac0j0ptFGOr7GI1PYR4KhShrEwdqikG4RlQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
@ -8,8 +8,8 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "20.7.0";
|
||||
sha256 = "sha256-P8/c0FxGFRdIBZZZZnTfhbNc/OWX3QrjP1QW/E3xK+o=";
|
||||
version = "20.8.0";
|
||||
sha256 = "sha256-QSvoR65t9hAQup2jzD5r5bZ6oALjVOkZ9Z7INgNxcEw=";
|
||||
patches = [
|
||||
./revert-arm64-pointer-auth.patch
|
||||
./disable-darwin-v8-system-instrumentation-node19.patch
|
||||
|
@ -1,20 +1,17 @@
|
||||
{lib, fetchurl, buildGoPackage}:
|
||||
|
||||
buildGoPackage rec {
|
||||
{ lib, fetchurl, buildGoModule }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "boohu";
|
||||
version = "0.13.0";
|
||||
|
||||
goPackagePath = "git.tuxfamily.org/boohu/boohu.git";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/boohu/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "0q89yv4klldjpli6y9xpyr6k8nsn7qa68gp90vb3dgxynn91sh68";
|
||||
url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz";
|
||||
hash = "sha256-IB59C5/uuHP6LtKLypjpgHOo0MR9bFdCbudaRa+h7lI=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorHash = "sha256-AVK4zE/Hs9SN8Qj2WYj/am2B0R74QKYoMNf3sRRjnU4=";
|
||||
|
||||
postInstall = "mv $out/bin/boohu.git $out/bin/boohu";
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A new coffee-break roguelike game";
|
||||
|
20
pkgs/games/boohu/deps.nix
generated
20
pkgs/games/boohu/deps.nix
generated
@ -1,20 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/nsf/termbox-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/nsf/termbox-go";
|
||||
rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d";
|
||||
sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "f93a0d58d5fd95e53f82782d07bb0c79d23e1290";
|
||||
sha256 = "1sq97q71vgwnbg1fphsmqrzkbfn6mjal6d8a3qgwv4nbgppwaz25";
|
||||
};
|
||||
}
|
||||
]
|
@ -6,11 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sgt-puzzles";
|
||||
version = "20220913.27dd36e";
|
||||
# To find the latest version:
|
||||
# $ curl -s -i 'https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz' | grep Location
|
||||
version = "20230918.2d9e414";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
|
||||
hash = "sha256-fj1XWuXcW01uuC5dK2wDIrweyruSRdfEZBfmEj99zZE=";
|
||||
hash = "sha256-YsvJ/5DTevRb+sCxWc/KcD2X5IXwAXvWGVfokr06nUM=";
|
||||
};
|
||||
|
||||
sgt-puzzles-menu = fetchurl {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flashfocus";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-TKqPUJq3t2EjX6sY3NSuW0sCq4IS4PNMaaFNe+5hvoY=";
|
||||
sha256 = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -88,7 +88,7 @@
|
||||
, withAnalyze ? true
|
||||
, withApparmor ? true
|
||||
, withAudit ? true
|
||||
, withBootloader ? true # compiles systemd-boot, assumes EFI is available.
|
||||
, withBootloader ? !stdenv.hostPlatform.isMusl # compiles systemd-boot, assumes EFI is available.
|
||||
, withCompression ? true # adds bzip2, lz4, xz and zstd
|
||||
, withCoredump ? true
|
||||
, withCryptsetup ? true
|
||||
@ -205,8 +205,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
] ++ lib.optional stdenv.hostPlatform.isMusl (
|
||||
let
|
||||
oe-core = fetchzip {
|
||||
url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-f34f6ab04b443608497b73668365819343d0c2fe.tar.gz";
|
||||
sha256 = "DFcLPvjQIxGEDADpP232ZRd7cOEKt6B48Ah29nIGTt4=";
|
||||
url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-eb8a86fee9eeae787cc0a58ef2ed087fd48d93eb.tar.gz";
|
||||
sha256 = "tE2KpXLvOknIpEZFdOnNxvBmDvZrra3kvQp9tKxa51c=";
|
||||
};
|
||||
musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
|
||||
in
|
||||
@ -214,7 +214,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(musl-patches + "/0001-Adjust-for-musl-headers.patch")
|
||||
(musl-patches + "/0005-pass-correct-parameters-to-getdents64.patch")
|
||||
(musl-patches + "/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch")
|
||||
(musl-patches + "/0007-Add-sys-stat.h-for-S_IFDIR.patch")
|
||||
(musl-patches + "/0009-missing_type.h-add-comparison_fn_t.patch")
|
||||
(musl-patches + "/0010-add-fallback-parse_printf_format-implementation.patch")
|
||||
(musl-patches + "/0011-src-basic-missing.h-check-for-missing-strndupa.patch")
|
||||
@ -230,7 +229,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(musl-patches + "/0022-Handle-__cpu_mask-usage.patch")
|
||||
(musl-patches + "/0023-Handle-missing-gshadow.patch")
|
||||
(musl-patches + "/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
|
||||
(musl-patches + "/0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch")
|
||||
(musl-patches + "/0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch")
|
||||
(musl-patches + "/0029-shared-Do-not-use-malloc_info-on-musl.patch")
|
||||
]
|
||||
);
|
||||
|
||||
@ -724,7 +724,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# https://github.com/NixOS/nixpkgs/issues/169693
|
||||
# The hack is to move EFI file out of lib/ before doStrip
|
||||
# run and return it after doStrip run.
|
||||
preFixup = lib.optionalString withEfi ''
|
||||
preFixup = lib.optionalString withBootloader ''
|
||||
mv $out/lib/systemd/boot/efi $out/dont-strip-me
|
||||
'';
|
||||
|
||||
@ -734,7 +734,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# This needs to be in LD_LIBRARY_PATH because rpath on a binary is not propagated to libraries using dlopen, in this case `libcryptsetup.so`
|
||||
wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup
|
||||
done
|
||||
'' + lib.optionalString withEfi ''
|
||||
'' + lib.optionalString withBootloader ''
|
||||
mv $out/dont-strip-me $out/lib/systemd/boot/efi
|
||||
'' + lib.optionalString withUkify ''
|
||||
# To cross compile a derivation that builds a UKI with ukify, we need to wrap
|
||||
|
@ -3,7 +3,6 @@
|
||||
, fetchFromGitLab
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, coreutils
|
||||
, curl
|
||||
@ -16,6 +15,7 @@
|
||||
, mangohud32
|
||||
, addOpenGLRunpath
|
||||
, appstream
|
||||
, git
|
||||
, glslang
|
||||
, mako
|
||||
, meson
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
let
|
||||
# Derived from subprojects/cmocka.wrap
|
||||
cmocka = rec {
|
||||
cmocka = {
|
||||
version = "1.81";
|
||||
src = fetchFromGitLab {
|
||||
owner = "cmocka";
|
||||
@ -79,14 +79,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mangohud";
|
||||
version = "0.6.9-1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flightlessmango";
|
||||
repo = "MangoHud";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-AX4m1XZ+yXp74E3slFGyI3CGu2eYU+eXNN2EY+ivdfk=";
|
||||
hash = "sha256-KkMN7A3AcS/v+b9GCs0pI6MBBk3WwOMciaoiBzL5xOQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
@ -124,13 +124,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libdbus = dbus.lib;
|
||||
inherit hwdata;
|
||||
})
|
||||
|
||||
# Pull gcc-13 build fix for nissing <cstdint>
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd0848b6ab487b5ac7de.patch";
|
||||
hash = "sha256-qbNywAXAStGiVZ1LA5qZyNp4n28iNUuE4N69zXv2gmM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -140,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
] ++ lib.optionals lowerBitnessSupport [
|
||||
mangohud32
|
||||
])} \
|
||||
--subst-var-by version "${finalAttrs.version}" \
|
||||
--subst-var-by dataDir ${placeholder "out"}/share
|
||||
|
||||
(
|
||||
@ -161,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
git
|
||||
glslang
|
||||
mako
|
||||
meson
|
||||
|
@ -1,24 +1,24 @@
|
||||
diff --git a/bin/mangohud.in b/bin/mangohud.in
|
||||
index f975224..24936eb 100755
|
||||
index 6c3c6e8..8847cdc 100755
|
||||
--- a/bin/mangohud.in
|
||||
+++ b/bin/mangohud.in
|
||||
@@ -8,16 +8,18 @@ if [ "$#" -eq 0 ]; then
|
||||
@@ -8,10 +8,10 @@ if [ "$#" -eq 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud.so"
|
||||
+MANGOHUD_LIB_NAME="libMangoHud.so"
|
||||
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so"
|
||||
+MANGOHUD_LIB_NAME="libMangoHud_opengl.so"
|
||||
|
||||
if [ "$1" = "--dlsym" ]; then
|
||||
MANGOHUD_DLSYM=1
|
||||
- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
|
||||
+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}"
|
||||
shift
|
||||
fi
|
||||
|
||||
# Preload using the plain filenames of the libs, the dynamic linker will
|
||||
# figure out whether the 32 or 64 bit version should be used
|
||||
@@ -31,5 +31,7 @@ case ":${LD_PRELOAD-}:" in
|
||||
LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
|
||||
esac
|
||||
|
||||
+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
||||
+XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
|
||||
|
||||
|
44
pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch
Normal file
44
pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch
Normal file
@ -0,0 +1,44 @@
|
||||
diff -ur a/pic2plot/gram.cc b/pic2plot/gram.cc
|
||||
--- a/pic2plot/gram.cc 2000-06-28 00:23:21.000000000 -0400
|
||||
+++ b/pic2plot/gram.cc 2023-09-07 22:59:47.004460065 -0400
|
||||
@@ -1229,9 +1229,9 @@
|
||||
char *from;
|
||||
unsigned int count;
|
||||
{
|
||||
- register char *f = from;
|
||||
- register char *t = to;
|
||||
- register int i = count;
|
||||
+ char *f = from;
|
||||
+ char *t = to;
|
||||
+ int i = count;
|
||||
|
||||
while (i-- > 0)
|
||||
*t++ = *f++;
|
||||
@@ -1244,9 +1244,9 @@
|
||||
static void
|
||||
__yy_memcpy (char *to, char *from, unsigned int count)
|
||||
{
|
||||
- register char *t = to;
|
||||
- register char *f = from;
|
||||
- register int i = count;
|
||||
+ char *t = to;
|
||||
+ char *f = from;
|
||||
+ int i = count;
|
||||
|
||||
while (i-- > 0)
|
||||
*t++ = *f++;
|
||||
@@ -1289,10 +1289,10 @@
|
||||
yyparse(YYPARSE_PARAM_ARG)
|
||||
YYPARSE_PARAM_DECL
|
||||
{
|
||||
- register int yystate;
|
||||
- register int yyn;
|
||||
- register short *yyssp;
|
||||
- register YYSTYPE *yyvsp;
|
||||
+ int yystate;
|
||||
+ int yyn;
|
||||
+ short *yyssp;
|
||||
+ YYSTYPE *yyvsp;
|
||||
int yyerrstatus; /* number of tokens to shift before error messages enabled */
|
||||
int yychar1 = 0; /* lookahead token as an internal (translated) token number */
|
||||
|
@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ libpng ];
|
||||
patches = map fetchurl (import ./debian-patches.nix);
|
||||
patches = map fetchurl (import ./debian-patches.nix)
|
||||
# `pic2plot/gram.cc` uses the register storage class specifier, which is not supported in C++17.
|
||||
# This prevents clang 16 from building plotutils because it defaults to C++17.
|
||||
++ [ ./c++17-register-usage-fix.patch ];
|
||||
|
||||
preBuild = ''
|
||||
# Fix parallel building.
|
||||
|
17
pkgs/tools/misc/domine/default.nix
Normal file
17
pkgs/tools/misc/domine/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ buildDartApplication, fetchFromGitHub, lib }:
|
||||
|
||||
buildDartApplication rec {
|
||||
pname = "domine";
|
||||
version = "nightly-2023-08-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "breitburg";
|
||||
repo = pname;
|
||||
rev = "d99d02b014d009b0201380a21ddaa57696dc77af";
|
||||
sha256 = "038yfa22q7lzz85czmny3c1lkv8mjv4pq62cbmh054fqvgf3k3s4";
|
||||
};
|
||||
|
||||
pubspecLockFile = ./pubspec.lock;
|
||||
|
||||
vendorHash = "16z3paq1nxlnzs20qlljnwa2ff6xfhdqzcq8d8izkl7w1j4hyxgn";
|
||||
}
|
157
pkgs/tools/misc/domine/pubspec.lock
Normal file
157
pkgs/tools/misc/domine/pubspec.lock
Normal file
@ -0,0 +1,157 @@
|
||||
# Generated by pub
|
||||
# See https://dart.dev/tools/pub/glossary#lockfile
|
||||
packages:
|
||||
args:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: args
|
||||
sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.4.2"
|
||||
async:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: async
|
||||
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.11.0"
|
||||
collection:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: collection
|
||||
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.17.2"
|
||||
dart_openai:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: dart_openai
|
||||
sha256: "707f6975454513f4a6197125b5a0fbe92ab7cbe4b8ea9111e529a09d7a3ce0c3"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.0"
|
||||
dio:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: dio
|
||||
sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.3.2"
|
||||
dio_smart_retry:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: dio_smart_retry
|
||||
sha256: "1a2d0cf73ab56bf5998b375cda2d51f45c77268e712e4073f232cdc7753a94b2"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.0.0"
|
||||
fetch_api:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: fetch_api
|
||||
sha256: "7896632eda5af40c4459d673ad601df21d4c3ae6a45997e300a92ca63ec9fe4c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.1"
|
||||
fetch_client:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: fetch_client
|
||||
sha256: "83c07b07a63526a43630572c72715707ca113a8aa3459efbc7b2d366b79402af"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.2"
|
||||
http:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http
|
||||
sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.1.0"
|
||||
http_parser:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: http_parser
|
||||
sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "4.0.2"
|
||||
js:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: js
|
||||
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.6.7"
|
||||
lints:
|
||||
dependency: "direct dev"
|
||||
description:
|
||||
name: lints
|
||||
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
meta:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: meta
|
||||
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.9.1"
|
||||
path:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: path
|
||||
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.8.3"
|
||||
source_span:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: source_span
|
||||
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.10.0"
|
||||
string_scanner:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: string_scanner
|
||||
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.0"
|
||||
term_glyph:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: term_glyph
|
||||
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
tint:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: tint
|
||||
sha256: "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
typed_data:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: typed_data
|
||||
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.3.2"
|
||||
sdks:
|
||||
dart: ">=3.0.6 <4.0.0"
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "crowdsec";
|
||||
version = "1.5.2";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crowdsecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-260+XsRn3Mm/zCSvfEcBQ6j715KV4t1Z0CvXdriDzCs=";
|
||||
hash = "sha256-5VwsuPNoAhCvhKUJDUkXnEVLMqHx2M1Nz11VoBASoxU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Mto0X/LMwWU10cmC2bjzX4lzp9t+nEgsWRP3JGkl++A=";
|
||||
vendorHash = "sha256-6ODcb7UQPgM5n5RPN4AdkrY3+vlu+GXlUfrlTePywyY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vault";
|
||||
version = "1.14.3";
|
||||
version = "1.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J8ZHK9zOZIo61xund4VQ46LD609B9zWgCZcD1StEu/Y=";
|
||||
sha256 = "sha256-E7lEKsbl2L6KhLgAZbemCaTIjbsvl3wg3oCURn/Judc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8ytAT7qVXAIfoeMyTBMJ6DiWn74sRM1WrrOYaKTlKMo=";
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, coreutils, runtimeShell, testers, skeema }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, coreutils, testers, skeema }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "skeema";
|
||||
version = "1.10.1";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeema";
|
||||
repo = "skeema";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t0UACavJaDorAgxm2gA6FEsMfQ8UQEY/CZbFIFHwfIQ=";
|
||||
hash = "sha256-BXjcn9oakTvaWPYIsAsjYRwQ1aKhZ4PAV2AkxSVOF/I=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@ -25,6 +25,7 @@ buildGoModule rec {
|
||||
"TestParseDirSymlinks"
|
||||
|
||||
# Flaky tests
|
||||
"TestCommandTimeout"
|
||||
"TestShellOutTimeout"
|
||||
];
|
||||
in
|
||||
@ -41,13 +42,6 @@ buildGoModule rec {
|
||||
|
||||
substituteInPlace internal/applier/ddlstatement_test.go \
|
||||
--replace /bin/echo "${coreutils}/bin/echo"
|
||||
|
||||
substituteInPlace internal/util/shellout_unix_test.go \
|
||||
--replace /bin/echo "${coreutils}/bin/echo" \
|
||||
--replace /usr/bin/printf "${coreutils}/bin/printf"
|
||||
|
||||
substituteInPlace internal/util/shellout_unix.go \
|
||||
--replace /bin/sh "${runtimeShell}"
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "d2";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MF8RqwoMc48JYgNUJTQKHlGl59xyHOALnFL2BWQAl24=";
|
||||
hash = "sha256-bp45tkV7f6rGDAmhle/e3cHIqa7nPakANvk4QxetLts=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SocBC/1LrdSQNfcNVa9nnPaq/UvLVIghHlUSJB7ImBk=";
|
||||
vendorHash = "sha256-QMptNFCoJouI555WkA+4TJhaEzQgJJmca3jVpM3neeI=";
|
||||
|
||||
excludedPackages = [ "./e2etests" ];
|
||||
|
||||
@ -50,6 +50,6 @@ buildGoModule rec {
|
||||
description = "A modern diagram scripting language that turns text to diagrams";
|
||||
homepage = "https://d2lang.com";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
maintainers = with maintainers; [ dit7ya kashw2 ];
|
||||
};
|
||||
}
|
||||
|
@ -603,6 +603,8 @@ with pkgs;
|
||||
|
||||
documenso = callPackage ../applications/office/documenso { };
|
||||
|
||||
domine = callPackage ../tools/misc/domine { };
|
||||
|
||||
dsq = callPackage ../tools/misc/dsq { };
|
||||
|
||||
dt = callPackage ../tools/text/dt { };
|
||||
@ -9372,6 +9374,8 @@ with pkgs;
|
||||
|
||||
incron = callPackage ../tools/system/incron { };
|
||||
|
||||
indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2;
|
||||
|
||||
industrializer = callPackage ../applications/audio/industrializer { };
|
||||
|
||||
inetutils = callPackage ../tools/networking/inetutils { };
|
||||
@ -12546,6 +12550,8 @@ with pkgs;
|
||||
|
||||
ramfetch = callPackage ../tools/misc/ramfetch { };
|
||||
|
||||
rapidgzip = with python3Packages; toPythonApplication rapidgzip;
|
||||
|
||||
rar = callPackage ../tools/archivers/rar { };
|
||||
|
||||
rarcrack = callPackage ../tools/security/rarcrack { };
|
||||
@ -12554,6 +12560,8 @@ with pkgs;
|
||||
|
||||
ratman = callPackage ../tools/networking/ratman { };
|
||||
|
||||
ratarmount = with python3Packages; toPythonApplication ratarmount;
|
||||
|
||||
ratools = callPackage ../tools/networking/ratools { };
|
||||
|
||||
ratt = callPackage ../applications/misc/ratt { };
|
||||
@ -26243,13 +26251,13 @@ with pkgs;
|
||||
|
||||
### DEVELOPMENT / R MODULES
|
||||
|
||||
R = callPackage ../applications/science/math/R {
|
||||
R = darwin.apple_sdk_11_0.callPackage ../applications/science/math/R {
|
||||
# TODO: split docs into a separate output
|
||||
texLive = texlive.combine {
|
||||
inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super rsfs;
|
||||
};
|
||||
withRecommendedPackages = false;
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa Foundation;
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
|
@ -22127,7 +22127,7 @@ with self; {
|
||||
};
|
||||
buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ];
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork ];
|
||||
propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork IOSocketINET6 ];
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
shortenPerlShebang $out/bin/starman
|
||||
'';
|
||||
|
@ -4088,6 +4088,8 @@ self: super: with self; {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL;
|
||||
};
|
||||
|
||||
oelint-parser = callPackage ../development/python-modules/oelint-parser { };
|
||||
|
||||
openllm = callPackage ../development/python-modules/openllm { };
|
||||
|
||||
openllm-client = callPackage ../development/python-modules/openllm-client { };
|
||||
@ -5258,6 +5260,12 @@ self: super: with self; {
|
||||
|
||||
incremental = callPackage ../development/python-modules/incremental { };
|
||||
|
||||
indexed-bzip2 = callPackage ../development/python-modules/indexed-bzip2 { };
|
||||
|
||||
indexed-gzip = callPackage ../development/python-modules/indexed-gzip { inherit (pkgs) zlib; };
|
||||
|
||||
indexed-zstd = callPackage ../development/python-modules/indexed-zstd { inherit (pkgs) zstd; };
|
||||
|
||||
infinity = callPackage ../development/python-modules/infinity { };
|
||||
|
||||
inflect = callPackage ../development/python-modules/inflect { };
|
||||
@ -10780,6 +10788,8 @@ self: super: with self; {
|
||||
|
||||
python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { };
|
||||
|
||||
python-xz = callPackage ../development/python-modules/python-xz { };
|
||||
|
||||
python-zbar = callPackage ../development/python-modules/python-zbar { };
|
||||
|
||||
pythran = callPackage ../development/python-modules/pythran {
|
||||
@ -11166,6 +11176,8 @@ self: super: with self; {
|
||||
|
||||
rapidfuzz-capi = callPackage ../development/python-modules/rapidfuzz-capi { };
|
||||
|
||||
rapidgzip = callPackage ../development/python-modules/rapidgzip { inherit (pkgs) nasm; };
|
||||
|
||||
rapt-ble = callPackage ../development/python-modules/rapt-ble { };
|
||||
|
||||
rarfile = callPackage ../development/python-modules/rarfile {
|
||||
@ -11174,6 +11186,10 @@ self: super: with self; {
|
||||
|
||||
rasterio = callPackage ../development/python-modules/rasterio { };
|
||||
|
||||
ratarmountcore = callPackage ../development/python-modules/ratarmountcore { inherit (pkgs) zstd; };
|
||||
|
||||
ratarmount = callPackage ../development/python-modules/ratarmount { };
|
||||
|
||||
ratelim = callPackage ../development/python-modules/ratelim { };
|
||||
|
||||
ratelimit = callPackage ../development/python-modules/ratelimit { };
|
||||
|
Loading…
Reference in New Issue
Block a user