Merge staging-next into staging
This commit is contained in:
commit
1d5f427e36
27 changed files with 223 additions and 96 deletions
|
@ -228,13 +228,16 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
protocol = mkOption {
|
protocol = mkOption {
|
||||||
type = types.enum [ "ssh" "ssh-ng" ];
|
type = types.enum [ null "ssh" "ssh-ng" ];
|
||||||
default = "ssh";
|
default = "ssh";
|
||||||
example = "ssh-ng";
|
example = "ssh-ng";
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
The protocol used for communicating with the build machine.
|
The protocol used for communicating with the build machine.
|
||||||
Use `ssh-ng` if your remote builder and your
|
Use `ssh-ng` if your remote builder and your
|
||||||
local Nix version support that improved protocol.
|
local Nix version support that improved protocol.
|
||||||
|
|
||||||
|
Use `null` when trying to change the special localhost builder
|
||||||
|
without a protocol which is for example used by hydra.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
system = mkOption {
|
system = mkOption {
|
||||||
|
@ -680,7 +683,7 @@ in
|
||||||
concatMapStrings
|
concatMapStrings
|
||||||
(machine:
|
(machine:
|
||||||
(concatStringsSep " " ([
|
(concatStringsSep " " ([
|
||||||
"${machine.protocol}://${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}"
|
"${optionalString (machine.protocol != null) "${machine.protocol}://"}${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}"
|
||||||
(if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-")
|
(if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-")
|
||||||
(if machine.sshKey != null then machine.sshKey else "-")
|
(if machine.sshKey != null then machine.sshKey else "-")
|
||||||
(toString machine.maxJobs)
|
(toString machine.maxJobs)
|
||||||
|
|
|
@ -17,26 +17,30 @@
|
||||||
, ApplicationServices
|
, ApplicationServices
|
||||||
, Carbon
|
, Carbon
|
||||||
, AppKit
|
, AppKit
|
||||||
|
, wrapGAppsHook
|
||||||
|
, gobject-introspection
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "lapce";
|
pname = "lapce";
|
||||||
version = "0.1.2";
|
version = "unstable-2022-09-21";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lapce";
|
owner = "lapce";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "c5a924ef34250e9117e2b57c19c1f29f6b9b3ea7";
|
||||||
sha256 = "sha256-jH473FdBI3rGt90L3WwMDPP8M3w0rtG5D758ceCMw94=";
|
sha256 = "sha256-0nAUbtokDgSxPcJCa9xGM8Rpbu282o7OHAQtAfdNmJU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-0Kya2KcyBDlt0TpFV60VAA3+JPfwId/+k8k+H97EhB0=";
|
cargoSha256 = "sha256-uIFC5x8TzsvTGylQ0AttIRAUWU0k0P7UeF96vUc7cKw=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
perl
|
perl
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
|
wrapGAppsHook # FIX: No GSettings schemas are installed on the system
|
||||||
|
gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
||||||
# Get openssl-sys to use pkg-config
|
# Get openssl-sys to use pkg-config
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "chrysalis";
|
pname = "chrysalis";
|
||||||
version = "0.9.4";
|
version = "0.11.5";
|
||||||
in appimageTools.wrapAppImage rec {
|
in appimageTools.wrapAppImage rec {
|
||||||
name = "${pname}-${version}-binary";
|
name = "${pname}-${version}-binary";
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec {
|
||||||
inherit name;
|
inherit name;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||||
sha256 = "sha256-DAJGS1vKOOLMRgMczAiEfrT9awRNjz9r/MEr4ZFc3Bo=";
|
sha256 = "sha256-3GdObGW91nDqOAlHcaI/4wnbl2EG2RGGzpwY+XYQ0u4=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
76
pkgs/applications/misc/inlyne/default.nix
Normal file
76
pkgs/applications/misc/inlyne/default.nix
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
|
, stdenv
|
||||||
|
, pkg-config
|
||||||
|
, fontconfig
|
||||||
|
, libXcursor
|
||||||
|
, libXi
|
||||||
|
, libXrandr
|
||||||
|
, libxcb
|
||||||
|
, libGL
|
||||||
|
, libX11
|
||||||
|
, openssl
|
||||||
|
, AppKit
|
||||||
|
, ApplicationServices
|
||||||
|
, CoreFoundation
|
||||||
|
, CoreGraphics
|
||||||
|
, CoreServices
|
||||||
|
, CoreText
|
||||||
|
, CoreVideo
|
||||||
|
, Foundation
|
||||||
|
, Metal
|
||||||
|
, QuartzCore
|
||||||
|
, Security
|
||||||
|
, libobjc
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "inlyne";
|
||||||
|
version = "0.2.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "trimental";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1y8nxz20agmrdcl25wry8lnpg86zbkkkkiscljwd7g7a831hlb9z";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "sha256-NXVwydEn4hX/4NorDx6eE+sWQXj1jwZgzpDE3wg8OkU=";
|
||||||
|
|
||||||
|
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||||
|
|
||||||
|
buildInputs = lib.optionals stdenv.isLinux [
|
||||||
|
fontconfig
|
||||||
|
libXcursor
|
||||||
|
libXi
|
||||||
|
libXrandr
|
||||||
|
libxcb
|
||||||
|
openssl
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
AppKit
|
||||||
|
ApplicationServices
|
||||||
|
CoreFoundation
|
||||||
|
CoreGraphics
|
||||||
|
CoreServices
|
||||||
|
CoreText
|
||||||
|
CoreVideo
|
||||||
|
Foundation
|
||||||
|
Metal
|
||||||
|
QuartzCore
|
||||||
|
Security
|
||||||
|
libobjc
|
||||||
|
];
|
||||||
|
|
||||||
|
postFixup = lib.optionalString stdenv.isLinux ''
|
||||||
|
patchelf $out/bin/inlyne \
|
||||||
|
--add-rpath ${lib.makeLibraryPath [ libGL libX11 ]}
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A GPU powered browserless markdown viewer";
|
||||||
|
homepage = "https://github.com/trimental/inlyne";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ figsoda ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,9 +1,9 @@
|
||||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.34.0";
|
version = "0.35.0";
|
||||||
sha256 = "1znxhjqvch0z0s98v3hvvh1pa3nlv0l6qhlm0f61z64srz3i5d1k";
|
sha256 = "11bbrxgfwvf6gnm402mcq6na75gcifx8m1b28pzspvw01p2yshf9";
|
||||||
manifestsSha256 = "1fchzr7fb894hdya9bbh59avqsa66wcz06fck60wmwpc93m64cqs";
|
manifestsSha256 = "0ink2cvysgnqvid4hh2x969iqc86pmz654nd7wv37iqndfhy7rd5";
|
||||||
|
|
||||||
manifests = fetchzip {
|
manifests = fetchzip {
|
||||||
url =
|
url =
|
||||||
|
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-0oHcitczG+sW9mkwxY6hCdR2ASpat2XQ+IsLAiqCUb8=";
|
vendorSha256 = "sha256-HCBEMMFMoepr4bUYICAGMb2A42smgd3VlE7b9TR6LAc=";
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
cp -r ${manifests} source/cmd/flux/manifests
|
cp -r ${manifests} source/cmd/flux/manifests
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "treesheets";
|
pname = "treesheets";
|
||||||
version = "unstable-2022-03-12";
|
version = "unstable-2022-09-26";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aardappel";
|
owner = "aardappel";
|
||||||
repo = "treesheets";
|
repo = "treesheets";
|
||||||
rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d";
|
rev = "4778c343ac78a3b3ccdaf079187b53d8cd64e235";
|
||||||
sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw=";
|
sha256 = "UyltzT9B+7/hME7famQa/XgrDPaNw3apwchKgxwscOo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
{
|
{
|
||||||
"version": "15.4.0",
|
"version": "15.4.1",
|
||||||
"repo_hash": "sha256-AONzkIZbrOJkxGUYAunoWTc9xuCykKr4YkYeQQxRW8A=",
|
"repo_hash": "sha256-z4J0ia9WxL+tJnoYNBtb6ZMuqGHiyhQ0tc0L8kzj26w=",
|
||||||
"yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8",
|
"yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8",
|
||||||
"owner": "gitlab-org",
|
"owner": "gitlab-org",
|
||||||
"repo": "gitlab",
|
"repo": "gitlab",
|
||||||
"rev": "v15.4.0-ee",
|
"rev": "v15.4.1-ee",
|
||||||
"passthru": {
|
"passthru": {
|
||||||
"GITALY_SERVER_VERSION": "15.4.0",
|
"GITALY_SERVER_VERSION": "15.4.1",
|
||||||
"GITLAB_PAGES_VERSION": "1.62.0",
|
"GITLAB_PAGES_VERSION": "1.62.0",
|
||||||
"GITLAB_SHELL_VERSION": "14.10.0",
|
"GITLAB_SHELL_VERSION": "14.10.0",
|
||||||
"GITLAB_WORKHORSE_VERSION": "15.4.0"
|
"GITLAB_WORKHORSE_VERSION": "15.4.1"
|
||||||
},
|
},
|
||||||
"vendored_gems": [
|
"vendored_gems": [
|
||||||
"bundler-checksum",
|
"bundler-checksum",
|
||||||
|
|
|
@ -11,7 +11,7 @@ let
|
||||||
gemdir = ./.;
|
gemdir = ./.;
|
||||||
};
|
};
|
||||||
|
|
||||||
version = "15.4.0";
|
version = "15.4.1";
|
||||||
package_version = "v${lib.versions.major version}";
|
package_version = "v${lib.versions.major version}";
|
||||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ let
|
||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitaly";
|
repo = "gitaly";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-cESZfLlwyC6khUrvS0LGfkvzCLudjFmlGXculYLrcDM=";
|
sha256 = "sha256-7f4TxCI/k2yirQxYI8i/6PXGVDs4x4ncIou1qH0TKAc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM=";
|
vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM=";
|
||||||
|
|
|
@ -5,7 +5,7 @@ in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gitlab-workhorse";
|
pname = "gitlab-workhorse";
|
||||||
|
|
||||||
version = "15.4.0";
|
version = "15.4.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = data.owner;
|
owner = data.owner;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromSourcehut
|
, fetchFromSourcehut
|
||||||
|
, fetchpatch
|
||||||
, buildGoModule
|
, buildGoModule
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, srht
|
, srht
|
||||||
|
@ -12,27 +13,36 @@
|
||||||
, unzip
|
, unzip
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "0.81.0";
|
version = "0.82.8";
|
||||||
|
|
||||||
src = fetchFromSourcehut {
|
src = fetchFromSourcehut {
|
||||||
owner = "~sircmpwn";
|
owner = "~sircmpwn";
|
||||||
repo = "builds.sr.ht";
|
repo = "builds.sr.ht";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-oUSzanRFZ2dQTgm/VuNhqUaUAPq7ffxR7OtBKtE61DE=";
|
hash = "sha256-M94zkEUJU8EwksN34sd5IkASDCQ0hHb98G5wzZsCrpg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildsrht-api = buildGoModule ({
|
buildsrht-api = buildGoModule ({
|
||||||
inherit src version;
|
inherit src version;
|
||||||
pname = "buildsrht-api";
|
pname = "buildsrht-api";
|
||||||
modRoot = "api";
|
modRoot = "api";
|
||||||
vendorSha256 = "sha256-roTwqtg4Y846PNtLdRN/LV3Jd0LVElqjFy3DJcrwoaI=";
|
vendorHash = "sha256-8z5m4bMwLeYg4i91MMjLMqbciWvqS0icCHFUJTUHBgk=";
|
||||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||||
|
|
||||||
buildsrht-worker = buildGoModule {
|
buildsrht-worker = buildGoModule {
|
||||||
inherit src version;
|
inherit src version;
|
||||||
sourceRoot = "source/worker";
|
sourceRoot = "source/worker";
|
||||||
pname = "buildsrht-worker";
|
pname = "buildsrht-worker";
|
||||||
vendorSha256 = "sha256-Pf1M9a43eK4jr6QMi6kRHA8DodXQU0pqq9ua5VC3ER0=";
|
vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek=";
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch";
|
||||||
|
url = "https://git.sr.ht/~sircmpwn/builds.sr.ht/commit/f58bbde6bfed7d2321a3b17e991c91fc83d4c230.patch";
|
||||||
|
stripLen = 1;
|
||||||
|
hash = "sha256-vQR/T5G5Gz5tY+SEZZabsbnFKW44b+Bs+GDdydyeCDs=";
|
||||||
|
})
|
||||||
|
];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
|
|
@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
preConfigure = if !stdenv.hostPlatform.useAndroidPrebuilt then null else ''
|
||||||
|
sed -i 's|DISTSUBDIRS = lib po|DISTSUBDIRS = lib|g' Makefile.in
|
||||||
|
sed -i 's|SUBDIRS = lib @POSUB@|SUBDIRS = lib|g' Makefile.in
|
||||||
|
'';
|
||||||
|
|
||||||
configureFlags = []
|
configureFlags = []
|
||||||
# Configure check for dynamic lib support is broken, see
|
# Configure check for dynamic lib support is broken, see
|
||||||
# http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html
|
# http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html
|
||||||
|
|
|
@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
|
||||||
# External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
|
# External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517
|
||||||
"-DUSE_EXTERNAL_YAML=OFF"
|
"-DUSE_EXTERNAL_YAML=OFF"
|
||||||
] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
|
] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON"
|
||||||
++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF";
|
++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"
|
||||||
|
++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p $bin/bin; mv $out/bin $bin/
|
mkdir -p $bin/bin; mv $out/bin $bin/
|
||||||
|
|
|
@ -10,21 +10,28 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NordicSemiconductor";
|
owner = "NordicSemiconductor";
|
||||||
repo = "pc-ble-driver";
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj";
|
hash = "sha256-srH7Gdiy9Lsv68fst/9jhifx03R2e+4kMia6pU/oCZg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "support-arm.patch";
|
||||||
|
url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/76a6b31dba7a13ceae40587494cbfa01a29192f4.patch";
|
||||||
|
hash = "sha256-bvK1BXjdlhIXV8R4PiCGaq8oSLzgjMmTgAwssm8N2sk=";
|
||||||
|
})
|
||||||
# Fix build with GCC 11
|
# Fix build with GCC 11
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";
|
url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";
|
||||||
sha256 = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g=";
|
hash = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DNRF_BLE_DRIVER_VERSION=${version}"
|
"-DNRF_BLE_DRIVER_VERSION=${version}"
|
||||||
|
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||||
|
"-DARCH=arm64"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake git ];
|
nativeBuildInputs = [ cmake git ];
|
||||||
|
|
|
@ -6,29 +6,21 @@
|
||||||
, pytest-cov
|
, pytest-cov
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, numpy
|
, numpy
|
||||||
, astropy
|
, setuptools-scm
|
||||||
, scipy
|
|
||||||
, h5py
|
|
||||||
, scikitimage
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytest-astropy-header";
|
pname = "pytest-astropy-header";
|
||||||
version = "0.1.2";
|
version = "0.2.2";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1y87agr324p6x5gvhziymxjlw54pyn4gqnd49papbl941djpkp5g";
|
sha256 = "77891101c94b75a8ca305453b879b318ab6001b370df02be2c0b6d1bb322db10";
|
||||||
};
|
};
|
||||||
patches = [ (fetchpatch {
|
|
||||||
url = "https://github.com/astropy/pytest-astropy-header/pull/16.patch";
|
nativeBuildInputs = [
|
||||||
sha256 = "11ln63zq0kgsdx1jw3prlzpcdbxmc99p9cwr18s0x6apy0k6df31";
|
setuptools-scm
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/astropy/pytest-astropy-header/pull/29.patch";
|
|
||||||
sha256 = "18l434c926r5z1iq3b6lpnp0lrssszars9y1y9hs6216r60jgjpl";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -37,12 +29,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
pytest-cov
|
|
||||||
numpy
|
numpy
|
||||||
scipy
|
|
||||||
h5py
|
|
||||||
scikitimage
|
|
||||||
astropy
|
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
|
, attrs
|
||||||
, hypothesis
|
, hypothesis
|
||||||
, pytest
|
, pytest
|
||||||
, pytest-arraydiff
|
, pytest-arraydiff
|
||||||
, pytest-astropy-header
|
, pytest-astropy-header
|
||||||
|
, pytest-cov
|
||||||
, pytest-doctestplus
|
, pytest-doctestplus
|
||||||
, pytest-filter-subpackage
|
, pytest-filter-subpackage
|
||||||
, pytest-mock
|
, pytest-mock
|
||||||
|
@ -33,9 +35,11 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
attrs
|
||||||
hypothesis
|
hypothesis
|
||||||
pytest-arraydiff
|
pytest-arraydiff
|
||||||
pytest-astropy-header
|
pytest-astropy-header
|
||||||
|
pytest-cov
|
||||||
pytest-doctestplus
|
pytest-doctestplus
|
||||||
pytest-filter-subpackage
|
pytest-filter-subpackage
|
||||||
pytest-mock
|
pytest-mock
|
||||||
|
|
|
@ -4,21 +4,22 @@
|
||||||
, setuptools-scm
|
, setuptools-scm
|
||||||
, astropy
|
, astropy
|
||||||
, numpy
|
, numpy
|
||||||
|
, matplotlib
|
||||||
, scipy
|
, scipy
|
||||||
, six
|
, six
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pytest-doctestplus
|
, pytest-astropy
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "radio_beam";
|
pname = "radio_beam";
|
||||||
version = "0.3.3";
|
version = "0.3.4";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit version;
|
inherit version;
|
||||||
pname = "radio-beam";
|
pname = "radio-beam";
|
||||||
sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd";
|
sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -34,14 +35,10 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
pytest-doctestplus
|
matplotlib
|
||||||
|
pytest-astropy
|
||||||
];
|
];
|
||||||
|
|
||||||
# Tests must be run in the build directory
|
|
||||||
preCheck = ''
|
|
||||||
cd build/lib
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Tools for Beam IO and Manipulation";
|
description = "Tools for Beam IO and Manipulation";
|
||||||
homepage = "http://radio-astro-tools.github.io";
|
homepage = "http://radio-astro-tools.github.io";
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "metal-cli";
|
pname = "metal-cli";
|
||||||
version = "0.9.1";
|
version = "0.10.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "equinix";
|
owner = "equinix";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-+G3PBYeez1dcUELc4j6CRgxDCDWCxpOfI52QlvMVkrY=";
|
sha256 = "sha256-bXea270m0+JAQ3j+JhkiVNds2X7rogcIqJIqRK7DS2g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-rf0EWMVvuoPUMTQKi/FnUbE2ZAs0C7XosHAzCgwB5wg=";
|
vendorSha256 = "sha256-bCVHPpdQSlEU7smoQzpiLZMQVPUQO8UhylrpDf0MSmk=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s" "-w"
|
"-s" "-w"
|
||||||
|
|
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-edit";
|
pname = "cargo-edit";
|
||||||
version = "0.11.2";
|
version = "0.11.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "killercup";
|
owner = "killercup";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-pFQJ2ktn3sMO6DOWlBBe1pJOPytqgqX/EvjGZLnypdY=";
|
hash = "sha256-xhUI8rkABw3Op3sTctAIL7nCTX6Ejl2jMr0RI4oERIU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-uTbMiMlCq7qImM5yz1ij0dokJgIMECzdBWst8fwdaoM=";
|
cargoSha256 = "sha256-7Of641eBgXqa6vaAr4NotDScGPRd+RcTzWRmIn8pEeU=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-llvm-lines";
|
pname = "cargo-llvm-lines";
|
||||||
version = "0.4.17";
|
version = "0.4.18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dtolnay";
|
owner = "dtolnay";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Xlzvfic2uuMTMxAwWbWGii1ZdJglYxRI3iY1YQaufNQ=";
|
sha256 = "sha256-MQ+T/BwDXPm9xTsujAGrWnIuhJBbij2VaXiRYpNj6ZM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-3xlKZGRgxOzKtGNQCkZpSKnnczxDNuS4kY1VO/6LxlA=";
|
cargoSha256 = "sha256-EeUXRcK/4Xl25Q30RnNNF/eAv4zCu6epwrAorfIu21k=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
|
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-tally";
|
pname = "cargo-tally";
|
||||||
version = "1.0.14";
|
version = "1.0.15";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-hsKrkLkHD5NM3sSVHKIa/dxiW5TszryX8bksGqpZ9fI=";
|
sha256 = "sha256-vrDPFJB0/kRSZot8LdYO6lPI8oR5G4CZv6Z31gF7XII=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-9ozabY3tsgQa6nsSsF07juOM+oFJSXGcYOz3uju/tLg=";
|
cargoSha256 = "sha256-dkCfOTZCu9MgqvKJRWwyVfCu1Ul0wDCJznM+N2hPpwo=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [
|
buildInputs = lib.optionals stdenv.isDarwin [
|
||||||
DiskArbitration
|
DiskArbitration
|
||||||
|
|
|
@ -1,19 +1,20 @@
|
||||||
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
|
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "collectd-exporter";
|
pname = "collectd-exporter";
|
||||||
version = "0.5.0";
|
version = "0.5.0";
|
||||||
rev = version;
|
|
||||||
|
|
||||||
goPackagePath = "github.com/prometheus/collectd_exporter";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
rev = "v${version}";
|
|
||||||
owner = "prometheus";
|
owner = "prometheus";
|
||||||
repo = "collectd_exporter";
|
repo = "collectd_exporter";
|
||||||
|
rev = "v${version}";
|
||||||
sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh";
|
sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vendorSha256 = null;
|
||||||
|
|
||||||
|
ldflags = [ "-s" "-w" ];
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) collectd; };
|
passthru.tests = { inherit (nixosTests.prometheus-exporters) collectd; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -33,7 +33,11 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc";
|
sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ]
|
||||||
|
# bionic libc is super weird and has issues with fortify outside of its own libc, check this comment:
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593
|
||||||
|
# or you can check libc/include/sys/cdefs.h in bionic source code
|
||||||
|
++ optional (stdenv.hostPlatform.libc == "bionic") "fortify";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" "doc" "info" ];
|
outputs = [ "out" "dev" "man" "doc" "info" ];
|
||||||
|
|
||||||
|
|
|
@ -1,25 +1,47 @@
|
||||||
{ lib, writeShellScriptBin, fish }:
|
{ lib, writeShellScriptBin, fish, writeTextFile }:
|
||||||
|
|
||||||
with lib;
|
lib.makeOverridable ({
|
||||||
|
|
||||||
makeOverridable ({
|
|
||||||
completionDirs ? [],
|
completionDirs ? [],
|
||||||
functionDirs ? [],
|
functionDirs ? [],
|
||||||
confDirs ? [],
|
confDirs ? [],
|
||||||
pluginPkgs ? []
|
pluginPkgs ? [],
|
||||||
|
localConfig ? "",
|
||||||
|
shellAliases ? {}
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
aliasesStr = builtins.concatStringsSep "\n"
|
||||||
|
(lib.mapAttrsToList (k: v: "alias ${k} ${lib.escapeShellArg v}") shellAliases);
|
||||||
|
|
||||||
|
shellAliasesFishConfig = writeTextFile {
|
||||||
|
name = "wrapfish.aliases.fish";
|
||||||
|
destination = "/share/fish/vendor_conf.d/aliases.fish";
|
||||||
|
text = ''
|
||||||
|
status --is-interactive; and begin
|
||||||
|
# Aliases
|
||||||
|
${aliasesStr}
|
||||||
|
end
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
localFishConfig = writeTextFile {
|
||||||
|
name = "wrapfish.local.fish";
|
||||||
|
destination = "/share/fish/vendor_conf.d/config.local.fish";
|
||||||
|
text = localConfig;
|
||||||
|
};
|
||||||
|
|
||||||
vendorDir = kind: plugin: "${plugin}/share/fish/vendor_${kind}.d";
|
vendorDir = kind: plugin: "${plugin}/share/fish/vendor_${kind}.d";
|
||||||
complPath = completionDirs ++ map (vendorDir "completions") pluginPkgs;
|
complPath = completionDirs ++ map (vendorDir "completions") pluginPkgs;
|
||||||
funcPath = functionDirs ++ map (vendorDir "functions") pluginPkgs;
|
funcPath = functionDirs ++ map (vendorDir "functions") pluginPkgs;
|
||||||
confPath = confDirs ++ map (vendorDir "conf") pluginPkgs;
|
confPath = confDirs
|
||||||
|
++ (map (vendorDir "conf") pluginPkgs)
|
||||||
|
++ (map (vendorDir "conf") [ localFishConfig shellAliasesFishConfig ]);
|
||||||
|
|
||||||
in writeShellScriptBin "fish" ''
|
in writeShellScriptBin "fish" ''
|
||||||
${fish}/bin/fish --init-command "
|
${fish}/bin/fish --init-command "
|
||||||
set --prepend fish_complete_path ${escapeShellArgs complPath}
|
set --prepend fish_complete_path ${lib.escapeShellArgs complPath}
|
||||||
set --prepend fish_function_path ${escapeShellArgs funcPath}
|
set --prepend fish_function_path ${lib.escapeShellArgs funcPath}
|
||||||
set --local fish_conf_source_path ${escapeShellArgs confPath}
|
set --local fish_conf_source_path ${lib.escapeShellArgs confPath}
|
||||||
for c in \$fish_conf_source_path/*; source \$c; end
|
for c in \$fish_conf_source_path/*; source \$c; end
|
||||||
" "$@"
|
" "$@"
|
||||||
'')
|
'')
|
||||||
|
|
|
@ -12,17 +12,17 @@ let
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "opentelemetry-collector";
|
pname = "opentelemetry-collector";
|
||||||
version = "0.60.0";
|
version = "0.61.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "open-telemetry";
|
owner = "open-telemetry";
|
||||||
repo = "opentelemetry-collector";
|
repo = "opentelemetry-collector";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-zES2795gyMQ/VoRR4/dpUsqJlGnxl0Ac9Gb05lboWlI=";
|
sha256 = "sha256-NwkQDqacH1vZNkHy3OzvR1wmwxO2dAPXa/OkiNMcrjs=";
|
||||||
};
|
};
|
||||||
# there is a nested go.mod
|
# there is a nested go.mod
|
||||||
sourceRoot = "source/cmd/otelcorecol";
|
sourceRoot = "source/cmd/otelcorecol";
|
||||||
vendorSha256 = "sha256-9YKeHCFrN7drHJpk2k9M0VGvZ54kSSb9bAiyDFEiX+g=";
|
vendorSha256 = "sha256-AFizQKKIMveCI9OiJ6wPxsNwDVn9XEWuPzyIqQSXbd4=";
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
# set the build version, can't be done via ldflags
|
# set the build version, can't be done via ldflags
|
||||||
|
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "aardvark-dns";
|
pname = "aardvark-dns";
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "containers";
|
owner = "containers";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-HxikpGeQlwulSedFCwWLADHKMlFrsgC7bMoZ1OxGCUE=";
|
sha256 = "sha256-pIbhrYiZOZ0GoynnHvp+h5E4O4syiwVhQeczAv1zjTo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-uP9caaOdFWs73T8icHE9uXNo63NdZrQ5afXFb4Iy1+I=";
|
cargoHash = "sha256-2aFvFP64vy0FK0k0Uq6sPVi42E5easxOUlkcZjrjoMs=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Authoritative dns server for A/AAAA container records";
|
description = "Authoritative dns server for A/AAAA container records";
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "netavark";
|
pname = "netavark";
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "containers";
|
owner = "containers";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-NZt62oTD7yFO1+HTuyp+wEd2PuUwtsIrMPHwjfmz3aI=";
|
sha256 = "sha256-72ft1VZVv6Wxfr3RsJMOVl1Z0KMVGgCsUHKGH+filzg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-l+y3mkV6uZJed2nuXNWXDr6Q1UhV0YlfRhpE7rvTRrE=";
|
cargoHash = "sha256-FboPbOjkGRzOeoXrIkl1l2BXeid4AOiwxCJ6wlGQ66g=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles mandown ];
|
nativeBuildInputs = [ installShellFiles mandown ];
|
||||||
|
|
||||||
|
|
|
@ -29008,6 +29008,12 @@ with pkgs;
|
||||||
|
|
||||||
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
|
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
|
||||||
|
|
||||||
|
inlyne = callPackage ../applications/misc/inlyne {
|
||||||
|
inherit (xorg) libX11 libXcursor libXi libXrandr libxcb;
|
||||||
|
inherit (darwin) libobjc;
|
||||||
|
inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security;
|
||||||
|
};
|
||||||
|
|
||||||
inspectrum = callPackage ../applications/radio/inspectrum { };
|
inspectrum = callPackage ../applications/radio/inspectrum { };
|
||||||
|
|
||||||
inputplug = callPackage ../tools/X11/inputplug { };
|
inputplug = callPackage ../tools/X11/inputplug { };
|
||||||
|
|
Loading…
Reference in a new issue