mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
cc6e13abfb
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config copyDesktopItems ];
|
||||
buildInputs = [ bluez dbus glew glfw imgui ];
|
||||
|
||||
sourceRoot = "./source/Client";
|
||||
sourceRoot = "./${src.name}/Client";
|
||||
|
||||
cmakeFlags = [ "-Wno-dev" ];
|
||||
|
||||
|
||||
@ -1,39 +1,66 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, fetchpatch
|
||||
{
|
||||
alsa-lib
|
||||
, AppKit
|
||||
, CoreAudio
|
||||
, CoreGraphics
|
||||
, dbus
|
||||
, Foundation
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, gst_all_1
|
||||
, IOKit
|
||||
, lib
|
||||
, MediaPlayer
|
||||
, openssl
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, darwin
|
||||
, protobuf
|
||||
, rustPlatform
|
||||
, Security
|
||||
, sqlite
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termusic";
|
||||
version = "0.7.10";
|
||||
version = "0.7.11";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-m0hi5u4BcRcEDEpg1BoWXc25dfhD6+OJtqSZfSdV0HM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tramhao";
|
||||
repo = "termusic";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ykOBXM/WF+zasAt+6mgY2aSFCpGaYcqk+YI7YLM3MWs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A83gLsaPm6t4nm7DJfcp9z1huDU/Sfy9gunP8pzBiCA=";
|
||||
cargoHash = "sha256-BrOpU0RFdlRXQIMjfHfs/XYIdBCYKFSA+5by/rGzC8Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
protobuf
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
buildInputs = [
|
||||
dbus
|
||||
glib
|
||||
gst_all_1.gstreamer
|
||||
openssl
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AudioUnit
|
||||
AppKit
|
||||
CoreAudio
|
||||
CoreGraphics
|
||||
Foundation
|
||||
IOKit
|
||||
MediaPlayer
|
||||
Security
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Terminal Music Player TUI written in Rust";
|
||||
homepage = "https://github.com/tramhao/termusic";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ devhell ];
|
||||
license = with lib.licenses; [ gpl3Only ];
|
||||
maintainers = with lib.maintainers; [ devhell ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,38 +16,45 @@
|
||||
proxmox-backup-client,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
let
|
||||
pname = "proxmox-backup-client";
|
||||
version = "3.0.1";
|
||||
|
||||
srcs = [
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-backup.git";
|
||||
rev = "v${version}";
|
||||
name = "proxmox-backup";
|
||||
hash = "sha256-a6dPBZBBh//iANXoPmOdgxYO0qNszOYI3QtrjQr4Cxc=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox.git";
|
||||
rev = "2a070da0651677411a245f1714895235b1caf584";
|
||||
name = "proxmox";
|
||||
hash = "sha256-WH6oW2MB2yN1Y2zqOuXewI9jHqev/xLcJtb7D1J4aUE=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-fuse.git";
|
||||
rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79";
|
||||
name = "proxmox-fuse";
|
||||
hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/pxar.git";
|
||||
rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";
|
||||
name = "pxar";
|
||||
hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";
|
||||
})
|
||||
];
|
||||
proxmox-backup_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-backup.git";
|
||||
rev = "v${version}";
|
||||
name = "proxmox-backup";
|
||||
hash = "sha256-a6dPBZBBh//iANXoPmOdgxYO0qNszOYI3QtrjQr4Cxc=";
|
||||
};
|
||||
|
||||
sourceRoot = "proxmox-backup";
|
||||
proxmox_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox.git";
|
||||
rev = "2a070da0651677411a245f1714895235b1caf584";
|
||||
name = "proxmox";
|
||||
hash = "sha256-WH6oW2MB2yN1Y2zqOuXewI9jHqev/xLcJtb7D1J4aUE=";
|
||||
};
|
||||
|
||||
proxmox-fuse_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-fuse.git";
|
||||
rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79";
|
||||
name = "proxmox-fuse";
|
||||
hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ=";
|
||||
};
|
||||
|
||||
proxmox-pxar_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/pxar.git";
|
||||
rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";
|
||||
name = "pxar";
|
||||
hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";
|
||||
};
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
||||
srcs = [ proxmox-backup_src proxmox_src proxmox-fuse_src proxmox-pxar_src ];
|
||||
|
||||
sourceRoot = proxmox-backup_src.name;
|
||||
|
||||
# These patches are essentially un-upstreamable, due to being "workarounds" related to the
|
||||
# project structure.
|
||||
|
||||
@ -69,7 +69,7 @@ let
|
||||
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
|
||||
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages);
|
||||
|
||||
runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ];
|
||||
runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ];
|
||||
|
||||
nativeBuildInputs = [ unzip ]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
|
||||
@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
sourceRoot = "${appName}";
|
||||
sourceRoot = appName;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -31,27 +31,32 @@
|
||||
|
||||
assert withMPI -> trilinos.withMPI;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xyce";
|
||||
let
|
||||
version = "7.6.0";
|
||||
|
||||
srcs = [
|
||||
# useing fetchurl or fetchFromGitHub doesn't include the manuals
|
||||
# due to .gitattributes files
|
||||
(fetchgit {
|
||||
url = "https://github.com/Xyce/Xyce.git";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw=";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "Xyce";
|
||||
repo = "Xyce_Regression";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74=";
|
||||
})
|
||||
];
|
||||
# useing fetchurl or fetchFromGitHub doesn't include the manuals
|
||||
# due to .gitattributes files
|
||||
xyce_src = fetchgit {
|
||||
url = "https://github.com/Xyce/Xyce.git";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw=";
|
||||
};
|
||||
|
||||
sourceRoot = "./Xyce";
|
||||
regression_src = fetchFromGitHub {
|
||||
owner = "Xyce";
|
||||
repo = "Xyce_Regression";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xyce";
|
||||
inherit version;
|
||||
|
||||
srcs = [ xyce_src regression_src ];
|
||||
|
||||
sourceRoot = "./${xyce_src.name}";
|
||||
|
||||
preConfigure = "./bootstrap";
|
||||
|
||||
@ -101,7 +106,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = enableTests;
|
||||
|
||||
postPatch = ''
|
||||
pushd ../source
|
||||
pushd ../${regression_src.name}
|
||||
find Netlists -type f -regex ".*\.sh\|.*\.pl" -exec chmod ugo+x {} \;
|
||||
# some tests generate new files, some overwrite netlists
|
||||
find . -type d -exec chmod u+w {} \;
|
||||
@ -124,7 +129,7 @@ stdenv.mkDerivation rec {
|
||||
checkPhase = ''
|
||||
XYCE_BINARY="$(pwd)/src/Xyce"
|
||||
EXECSTRING="${lib.optionalString withMPI "mpirun -np 2 "}$XYCE_BINARY"
|
||||
TEST_ROOT="$(pwd)/../source"
|
||||
TEST_ROOT="$(pwd)/../${regression_src.name}"
|
||||
|
||||
# Honor the TMP variable
|
||||
sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh
|
||||
|
||||
977
pkgs/applications/system/asusctl/Cargo.lock
generated
977
pkgs/applications/system/asusctl/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -13,13 +13,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asusctl";
|
||||
version = "4.6.2";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "asusctl";
|
||||
rev = version;
|
||||
hash = "sha256-qfl8MUSHjqlSnsaudoRD9fY5TM9zgy7L7DA+pctn/nc=";
|
||||
hash = "sha256-SZijR9PotN0O72laj+FBSCVMXLXadmLRhCSD4XqobD0=";
|
||||
};
|
||||
|
||||
cargoHash = "";
|
||||
@ -28,22 +28,23 @@ rustPlatform.buildRustPackage rec {
|
||||
outputHashes = {
|
||||
"ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI=";
|
||||
"notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs=";
|
||||
"supergfxctl-5.1.1" = "sha256-AThaZ9dp5T/DtLPE6gZ9qgkw0xksiq+VCL9Y4G41voE=";
|
||||
"supergfxctl-5.1.1" = "sha256-H00QHNILEjOtavXdj4Jd+rdLprJpVSlSVV3qkTeknzQ=";
|
||||
};
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
files="
|
||||
daemon-user/src/daemon.rs
|
||||
daemon-user/src/config.rs
|
||||
rog-control-center/src/main.rs
|
||||
asusd-user/src/config.rs
|
||||
asusd-user/src/daemon.rs
|
||||
asusd/src/ctrl_anime/config.rs
|
||||
rog-aura/src/aura_detection.rs
|
||||
rog-control-center/src/main.rs
|
||||
"
|
||||
for file in $files; do
|
||||
substituteInPlace $file --replace /usr/share $out/share
|
||||
done
|
||||
|
||||
substituteInPlace daemon/src/ctrl_platform.rs --replace /usr/bin/chattr ${e2fsprogs}/bin/chattr
|
||||
substituteInPlace asusd/src/ctrl_platform.rs --replace /usr/bin/chattr ${e2fsprogs}/bin/chattr
|
||||
|
||||
substituteInPlace data/asusd.rules --replace systemctl ${systemd}/bin/systemctl
|
||||
substituteInPlace data/asusd.service \
|
||||
|
||||
@ -63,8 +63,8 @@ mkDerivation rec {
|
||||
|
||||
postUnpack = ''
|
||||
for dep in AuxiliarCustomWidgets QPinnableTabWidget QLogger git; do
|
||||
rmdir "source/src/$dep"
|
||||
ln -sf "../../$dep" "source/src/$dep"
|
||||
rmdir "${main_src.name}/src/$dep"
|
||||
ln -sf "../../$dep" "${main_src.name}/src/$dep"
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
done
|
||||
|
||||
${lib.optionalString wallpapers ''
|
||||
for f in ../wallpapers/Mojave{,-timed}.xml; do
|
||||
for f in ../${wallpapers_src.name}/Mojave{,-timed}.xml; do
|
||||
substituteInPlace $f --replace /usr $out
|
||||
done
|
||||
''}
|
||||
@ -123,9 +123,9 @@ stdenvNoCC.mkDerivation rec {
|
||||
${lib.optionalString wallpapers ''
|
||||
mkdir -p $out/share/backgrounds/Mojave
|
||||
mkdir -p $out/share/gnome-background-properties
|
||||
cp -a ../wallpapers/Mojave*.jpeg $out/share/backgrounds/Mojave/
|
||||
cp -a ../wallpapers/Mojave-timed.xml $out/share/backgrounds/Mojave/
|
||||
cp -a ../wallpapers/Mojave.xml $out/share/gnome-background-properties/
|
||||
cp -a ../${wallpapers_src.name}/Mojave*.jpeg $out/share/backgrounds/Mojave/
|
||||
cp -a ../${wallpapers_src.name}/Mojave-timed.xml $out/share/backgrounds/Mojave/
|
||||
cp -a ../${wallpapers_src.name}/Mojave.xml $out/share/gnome-background-properties/
|
||||
''}
|
||||
|
||||
# Replace duplicate files with soft links to the first file in each
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1dzvip90yf1wg0fhfghn96dwrhg289d06b624px9a2wwy3vp5ryg";
|
||||
};
|
||||
|
||||
sourceRoot = "code-0-r${src.rev}/src";
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
sed -e 's/<= obj-date/<= (if (= 0 obj-date) 1 obj-date)/' -i lsp/make.lisp
|
||||
'';
|
||||
|
||||
sourceRoot = "gcl/gcl";
|
||||
sourceRoot = "${src.name}/gcl";
|
||||
|
||||
# breaks when compiling in parallel
|
||||
enableParallelBuilding = false;
|
||||
|
||||
@ -11,29 +11,33 @@
|
||||
|
||||
let
|
||||
boostPython = boost.override { python = python3; enablePython = true; };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "nextpnr";
|
||||
version = "0.6";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-S6qvTzvkS2tBMvuTpmuCx6h0OcKP5NBbmgRgOpAVtnA=";
|
||||
name = "nextpnr";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr-tests";
|
||||
rev = "00c55a9eb9ea2e062b51fe0d64741412b185d95d";
|
||||
sha256 = "sha256-83suMftMtnaRFq3T2/I7Uahb11WZlXhwYt6Q/rqi2Yo=";
|
||||
name = "nextpnr-tests";
|
||||
})
|
||||
];
|
||||
main_src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr";
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-S6qvTzvkS2tBMvuTpmuCx6h0OcKP5NBbmgRgOpAVtnA=";
|
||||
name = "nextpnr";
|
||||
};
|
||||
|
||||
sourceRoot = "nextpnr";
|
||||
test_src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "nextpnr-tests";
|
||||
rev = "00c55a9eb9ea2e062b51fe0d64741412b185d95d";
|
||||
sha256 = "sha256-83suMftMtnaRFq3T2/I7Uahb11WZlXhwYt6Q/rqi2Yo=";
|
||||
name = "nextpnr-tests";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
|
||||
srcs = [ main_src test_src ];
|
||||
|
||||
sourceRoot = main_src.name;
|
||||
|
||||
nativeBuildInputs
|
||||
= [ cmake ]
|
||||
@ -66,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
ln -s ../nextpnr-tests tests
|
||||
ln -s ../${test_src.name} tests
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchFromGitHub, makeRustPlatform, rustc, cargo, installShellFiles, stdenv }:
|
||||
{ lib, buildPackages, fetchFromGitHub, makeRustPlatform, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
args = rec {
|
||||
@ -30,8 +30,8 @@ let
|
||||
};
|
||||
|
||||
rustPlatform = makeRustPlatform {
|
||||
inherit rustc;
|
||||
cargo = cargo.override {
|
||||
inherit (buildPackages) rustc;
|
||||
cargo = buildPackages.cargo.override {
|
||||
auditable = false;
|
||||
};
|
||||
};
|
||||
|
||||
@ -4,28 +4,29 @@ let
|
||||
rev = "488f4e71073062de314c55a037ede7cf03a3324c";
|
||||
# git describe --tags
|
||||
realVersion = "1.2.1-14-g${builtins.substring 0 7 rev}";
|
||||
|
||||
main_src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "prjtrellis";
|
||||
inherit rev;
|
||||
hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw=";
|
||||
name = "trellis";
|
||||
};
|
||||
|
||||
database_src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "prjtrellis-db";
|
||||
rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa";
|
||||
hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0=";
|
||||
name = "trellis-database";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "trellis";
|
||||
version = "unstable-2022-09-14";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "prjtrellis";
|
||||
inherit rev;
|
||||
hash = "sha256-Blbu+0rlM/3izbF0XCvkNpSAND0IclWEwK7anzyrpvw=";
|
||||
name = "trellis";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "prjtrellis-db";
|
||||
rev = "35d900a94ff0db152679a67bf6e4fbf40ebc34aa";
|
||||
hash = "sha256-r6viR8y9ZjURGNbsa0/YY8lzy9kGzjuu408ntxwpqm0=";
|
||||
name = "trellis-database";
|
||||
})
|
||||
];
|
||||
sourceRoot = "trellis";
|
||||
srcs = [ main_src database_src ];
|
||||
sourceRoot = main_src.name;
|
||||
|
||||
buildInputs = [ boost ];
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
@ -36,7 +37,7 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
rmdir database && ln -sfv ${builtins.elemAt srcs 1} ./database
|
||||
rmdir database && ln -sfv ${database_src} ./database
|
||||
|
||||
cd libtrellis
|
||||
'';
|
||||
|
||||
@ -9,22 +9,25 @@ let
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
lib_src = fetchurl {
|
||||
url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2";
|
||||
sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw";
|
||||
};
|
||||
|
||||
cpp_src = fetchurl {
|
||||
url = "http://shinh.skr.jp/d/d_cpp.tar.bz2";
|
||||
sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "bulletml";
|
||||
inherit version;
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2";
|
||||
sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "http://shinh.skr.jp/d/d_cpp.tar.bz2";
|
||||
sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh";
|
||||
})
|
||||
];
|
||||
sourceRoot = "bulletml";
|
||||
srcs = [ lib_src cpp_src ];
|
||||
|
||||
postUnpack = "mv d_cpp bulletml/";
|
||||
sourceRoot = "bulletml";
|
||||
|
||||
patches = [
|
||||
(debianPatch "fixes" "0cnr968n0h50fjmjijx7idsa2pg2pv5cwy6nvfbkx9z8w2zf0mkl")
|
||||
|
||||
@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "cpp";
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja unzip ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, libjpeg, jxrlib, pkg-config
|
||||
, fixDarwinDylibNames, autoSignDarwinBinariesHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freeimage";
|
||||
version = "unstable-2021-11-01";
|
||||
|
||||
@ -12,7 +12,8 @@ stdenv.mkDerivation {
|
||||
rev = "1900";
|
||||
sha256 = "rWoNlU/BWKZBPzRb1HqU6T0sT7aK6dpqKPe88+o/4sA=";
|
||||
};
|
||||
sourceRoot = "svn-r1900/FreeImage/trunk";
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk";
|
||||
|
||||
# Ensure that the bundled libraries are not used at all
|
||||
prePatch = ''
|
||||
@ -74,4 +75,4 @@ stdenv.mkDerivation {
|
||||
maintainers = with lib.maintainers; [viric l-as];
|
||||
platforms = with lib.platforms; unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -16,13 +16,9 @@ in rec {
|
||||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://getdnsapi.net/releases/${pname}-${
|
||||
with builtins;
|
||||
concatStringsSep "-" (splitVersion version)
|
||||
}/${pname}-${version}.tar.gz";
|
||||
sha256 =
|
||||
# upstream publishes hashes in hex format
|
||||
"f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c";
|
||||
url = with lib; "https://getdnsapi.net/releases/${pname}-${concatStringsSep "-" (splitVersion version)}/${pname}-${version}.tar.gz";
|
||||
# upstream publishes hashes in hex format
|
||||
sha256 = "f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
||||
@ -3,10 +3,14 @@
|
||||
, libsndfile, portaudio, libmysqlclient, fontconfig
|
||||
}:
|
||||
|
||||
let srcs = import ./srcs.nix { inherit fetchurl; }; in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libagar";
|
||||
inherit (srcs) version src;
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://stable.hypertriton.com/agar/agar-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace configure.in \
|
||||
@ -40,4 +44,4 @@ stdenv.mkDerivation {
|
||||
maintainers = with maintainers; [ ramkromberg ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }:
|
||||
|
||||
let srcs = import ./srcs.nix { inherit fetchurl; }; in
|
||||
stdenv.mkDerivation {
|
||||
pname = "libagar-test";
|
||||
inherit (srcs) version src;
|
||||
inherit (libagar) version src;
|
||||
|
||||
sourceRoot = "agar-1.5.0/tests";
|
||||
sourceRoot = "agar-${libagar.version}/tests";
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: textdlg.o:(.bss+0x0): multiple definition of `someString';
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
{ fetchurl }:
|
||||
rec {
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://stable.hypertriton.com/agar/agar-${version}.tar.gz";
|
||||
sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42";
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,14 +1,18 @@
|
||||
{lib, stdenv, fetchurl}:
|
||||
{lib, stdenv, fetchFromGitHub, cmake}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdivsufsort";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-${version}.tar.bz2";
|
||||
sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m";
|
||||
src = fetchFromGitHub {
|
||||
owner = "y-256";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
hash = "sha256-4p+L1bq9SBgWSHXx+WYWAe60V2g1AN+zlJvC+F367Tk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/y-256/libdivsufsort";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@ -2,8 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "minizip";
|
||||
version = zlib.version;
|
||||
inherit (zlib) src;
|
||||
inherit (zlib) src version;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-TWvbtuLmAdYS8otD2TpVlZx2FJS6DF03U2zM28FNsfc=";
|
||||
};
|
||||
|
||||
sourceRoot = "datafusion-cli-source/datafusion-cli";
|
||||
sourceRoot = "${src.name}/datafusion-cli";
|
||||
|
||||
cargoSha256 = "sha256-muWWVJDKm4rbpCK0SS7Zj6umFoMKGMScEAd2ZyZ5An8=";
|
||||
|
||||
|
||||
9054
pkgs/development/node-packages/node-packages.nix
generated
9054
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -5,14 +5,14 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
pname = "ocaml${ocaml.version}-camlpdf";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnwhitington";
|
||||
repo = "camlpdf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:1qmsa0xgi960y7r20mvf8hxiiml7l1908s4dm7nq262f19w51gsl";
|
||||
hash = "sha256-CJWVvZSbvSzG3PIr7w0vmbmY6tH59AgBAWRfDpQ9MCk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which ocaml findlib ];
|
||||
|
||||
@ -6,13 +6,13 @@ else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-cpdf";
|
||||
version = "2.5.1";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnwhitington";
|
||||
repo = "cpdf-source";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B1wYLcxTRUyzREtE9uvPMwSiwtB+q0RQsY02F0u3aa0=";
|
||||
hash = "sha256-5gEv/lmca3FR16m4uxbCJ3y/XtTSBvoIojeKszc24ss=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
|
||||
@ -55,14 +55,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.8.1";
|
||||
version = "3.14.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZHB2XAYjPwhCWHqq2Kro4CzDW34YBaknv9xBotCDkOw=";
|
||||
hash = "sha256-UVDzcbVRG94vM7s78uscsJ7Oq8HvHowAN2Hj+thbrvU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -1,29 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, six
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Protego";
|
||||
version = "0.2.1";
|
||||
pname = "protego";
|
||||
version = "0.3.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-32ZtQwTat3Ti3J/rIIuxrI1x6lzuwS9MmeujD71kL/I=";
|
||||
inherit version;
|
||||
pname = "Protego";
|
||||
hash = "sha256-BCKL/95Ma8ujHPZSm6LP1uG3CAj9wdLLQwG+ayjWxWg=";
|
||||
};
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests
|
||||
'';
|
||||
pythonImportsCheck = [ "protego" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pure-Python robots.txt parser with support for modern conventions";
|
||||
homepage = "https://github.com/scrapy/protego";
|
||||
changelog = "https://github.com/scrapy/protego/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyftdi";
|
||||
version = "0.54.0";
|
||||
version = "0.55.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "eblot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vL8jSgTtDvaHuCvaCYmFixILQFasTl82yINL5yRtOwU=";
|
||||
hash = "sha256-EEMHY5EKftci72huF5UmJyh2wJAc8uNh/QhGSSAVXIU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bundletool";
|
||||
version = "1.15.2";
|
||||
version = "1.15.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
sha256 = "sha256-lmMVIZUq0GTMJVSotA2lFxirAKZz8wrwGkkUR9ZP/dA=";
|
||||
sha256 = "sha256-5fVFl9u1IR8FDo3dA9TXMam036VoTHaHkotlSo3cISo=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
@ -23,6 +23,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "Command-line tool to manipulate Android App Bundles";
|
||||
homepage = "https://developer.android.com/studio/command-line/bundletool";
|
||||
changelog = "https://github.com/google/bundletool/releases/tag/${version}";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
platforms = jre_headless.meta.platforms;
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -86,7 +86,7 @@ let
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
sourceRoot = "${nameApp}";
|
||||
sourceRoot = nameApp;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.34.2";
|
||||
version = "4.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g+IqMYUgsab3bC9SX7Kgo6UGKfMQRtxTUxPg6MgFsXg=";
|
||||
hash = "sha256-L0F3e2SsBAI6b3lrBJl9W2392ZlW0jHwJJ7MlvJ64es=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iI0BHSXiOTm5TlLWTDPVlZRGdTHJS9aNzEXimk8xJUM=";
|
||||
vendorHash = "sha256-XJW7ftx+V7H22EraQZlRFi+Li8fsl7ZALVnaiuE1rXI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -13,18 +13,18 @@
|
||||
, libtheora
|
||||
, unfree_assets ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
pname = "keeperrl";
|
||||
version = "alpha34";
|
||||
|
||||
free-src = fetchFromGitHub {
|
||||
free_src = fetchFromGitHub {
|
||||
owner = "miki151";
|
||||
repo = "keeperrl";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE=";
|
||||
};
|
||||
|
||||
assets = if unfree_assets then requireFile rec {
|
||||
assets = requireFile rec {
|
||||
name = "keeperrl_data_${version}.tar.gz";
|
||||
message = ''
|
||||
This nix expression requires that the KeeperRL art assets are already
|
||||
@ -39,11 +39,15 @@ stdenv.mkDerivation rec {
|
||||
"nix-prefetch-url file://\$PWD/${name}".
|
||||
'';
|
||||
sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll";
|
||||
} else null;
|
||||
};
|
||||
in
|
||||
|
||||
sourceRoot = free-src.name;
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
srcs = [ free-src ] ++ lib.optional unfree_assets assets;
|
||||
srcs = [ free_src ] ++ lib.optional unfree_assets assets;
|
||||
|
||||
sourceRoot = free_src.name;
|
||||
|
||||
postUnpack = lib.optionalString unfree_assets ''
|
||||
mv data $sourceRoot
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.321";
|
||||
version = "4.14.322";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "058p6ba24gx0q1fxyf5gnbnl49r82iaz97z01h7c4z2lgba2pqyh";
|
||||
sha256 = "1r71g5p0cnbi0nixv91nyhv24dqmvh49rqb2lnbhsdq81fqm8ssm";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.290";
|
||||
version = "4.19.291";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1kqflbf78aamnbdc2v973qk9ymignl1cy6q0rpw865brgm5y59cz";
|
||||
sha256 = "0cxmq8mrkw179jb8sqvad3dskllwn579g2lxcjn21jyqsf85nwz6";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.189";
|
||||
version = "5.10.190";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1jcqj0yh8k81a02y8wq1psy109w9s0r5j5zgm8gmf5ylw5m520sc";
|
||||
sha256 = "15zmz9pg91gph2dhigjf1z3w6gkv1kwslki5dpzhgzs03pq3swi9";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.252";
|
||||
version = "5.4.253";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0rw2b1rr3rb5498rv1zmj0ml3p67awrvd2ch66kp80wl4dsmhy1s";
|
||||
sha256 = "1rr6mnkbw6gwdm9bqjhf4z2xqr458fn2qdv5b4mgm65a15gvmchz";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.1.44";
|
||||
version = "6.1.45";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "19d1fdvdp8lc5mvlcawd8hcpzjh7pdr5gq6fczhjl20xw4gx8l9f";
|
||||
sha256 = "14piy4cwv18a0yqp4gkrvr51z4zccyhab29n9ybxinkxdqwl68xx";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.4.9";
|
||||
version = "6.4.10";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "17ycanx738bgxg5wn536kbad4zzvj5ngygp9qhvz76draaca5f5q";
|
||||
sha256 = "0fgjym6y0zj7wz1byqhxmv3pc3wq412vm1dxbj4gv23pm6r3y2wq";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.119-rt65"; # updated by ./update-rt.sh
|
||||
version = "5.15.125-rt66"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -18,14 +18,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1kygpqf6sgkrwg77sv01di23c3n3rn5d44g8k5apx5106pys19bs";
|
||||
sha256 = "1izyv1ibiy4dapwb8745dshfbb9b6xqyz77l6mhkmlkcnx33h3qm";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1lkr3l0gad30brdq7kdgvqr3zz4xrd7ai8jh94di6l5krhi7s1w0";
|
||||
sha256 = "0ildcydqy980b2rw38q07dbf8z61l0dfjddqyvvyfq5gd6qkmcsb";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
let
|
||||
version = "22.03.5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "trelay";
|
||||
version = "${version}-${kernel.version}";
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
sparseCheckout = [ "package/kernel/trelay/src" ];
|
||||
};
|
||||
|
||||
sourceRoot = "openwrt/package/kernel/trelay/src";
|
||||
sourceRoot = "${finalAttrs.src.name}/package/kernel/trelay/src";
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
|
||||
|
||||
@ -43,4 +43,4 @@ stdenv.mkDerivation {
|
||||
platforms = platforms.linux;
|
||||
broken = lib.versionOlder kernel.version "5.10";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
59
pkgs/servers/frr/clippy-helper.nix
Normal file
59
pkgs/servers/frr/clippy-helper.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, frrSource
|
||||
, frrVersion
|
||||
|
||||
# build time
|
||||
, autoreconfHook
|
||||
, flex
|
||||
, bison
|
||||
, pkg-config
|
||||
, libelf
|
||||
, perl
|
||||
, python3
|
||||
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frr-clippy-helper";
|
||||
version = frrVersion;
|
||||
|
||||
src = frrSource;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
bison
|
||||
flex
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libelf
|
||||
python3
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-clippy-only"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp lib/clippy $out/bin
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://frrouting.org/";
|
||||
description = "FRR routing daemon suite: CLI helper tool clippy";
|
||||
longDescription = ''
|
||||
This small tool is used to support generating CLI code for FRR. It is split out here,
|
||||
to support cross-compiling, because it needs to be compiled with the build system toolchain
|
||||
and not the target host one.
|
||||
'';
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
maintainers = with maintainers; [ thillux ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -9,6 +9,7 @@
|
||||
, perl
|
||||
, pkg-config
|
||||
, texinfo
|
||||
, buildPackages
|
||||
|
||||
# runtime
|
||||
, c-ares
|
||||
@ -28,8 +29,58 @@
|
||||
# tests
|
||||
, nettools
|
||||
, nixosTests
|
||||
|
||||
# FRR's configure.ac gets SNMP options by executing net-snmp-config on the build host
|
||||
# This leads to compilation errors when cross compiling.
|
||||
# E.g. net-snmp-config for x86_64 does not return the ARM64 paths.
|
||||
#
|
||||
# SNMP_LIBS="`${NETSNMP_CONFIG} --agent-libs`"
|
||||
# SNMP_CFLAGS="`${NETSNMP_CONFIG} --base-cflags`"
|
||||
, snmpSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
|
||||
# other general options besides snmp support
|
||||
, rpkiSupport ? true
|
||||
, numMultipath ? 64
|
||||
, watchfrrSupport ? true
|
||||
, cumulusSupport ? false
|
||||
, datacenterSupport ? true
|
||||
, rtadvSupport ? true
|
||||
, irdpSupport ? true
|
||||
, routeReplacementSupport ? true
|
||||
|
||||
# routing daemon options
|
||||
, bgpdSupport ? true
|
||||
, ripdSupport ? true
|
||||
, ripngdSupport ? true
|
||||
, ospfdSupport ? true
|
||||
, ospf6dSupport ? true
|
||||
, ldpdSupport ? true
|
||||
, nhrpdSupport ? true
|
||||
, eigrpdSupport ? true
|
||||
, babeldSupport ? true
|
||||
, isisdSupport ? true
|
||||
, pimdSupport ? true
|
||||
, pim6dSupport ? true
|
||||
, sharpdSupport ? true
|
||||
, fabricdSupport ? true
|
||||
, vrrpdSupport ? true
|
||||
, pathdSupport ? true
|
||||
, bfddSupport ? true
|
||||
, pbrdSupport ? true
|
||||
, staticdSupport ? true
|
||||
|
||||
# BGP options
|
||||
, bgpAnnounce ? true
|
||||
, bgpBmp ? true
|
||||
, bgpVnc ? true
|
||||
|
||||
# OSPF options
|
||||
, ospfApi ? true
|
||||
}:
|
||||
|
||||
lib.warnIf (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform))
|
||||
"cannot enable SNMP support due to cross-compilation issues with net-snmp-config"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frr";
|
||||
version = "8.5.2";
|
||||
@ -57,7 +108,6 @@ stdenv.mkDerivation rec {
|
||||
libelf
|
||||
libunwind
|
||||
libyang
|
||||
net-snmp
|
||||
openssl
|
||||
pam
|
||||
pcre2
|
||||
@ -66,21 +116,69 @@ stdenv.mkDerivation rec {
|
||||
rtrlib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libcap
|
||||
] ++ lib.optionals snmpSupport [
|
||||
net-snmp
|
||||
];
|
||||
|
||||
# otherwise in cross-compilation: "configure: error: no working python version found"
|
||||
depsBuildBuild = [
|
||||
buildPackages.python3
|
||||
];
|
||||
|
||||
# cross-compiling: clippy is compiled with the build host toolchain, split it out to ease
|
||||
# navigation in dependency hell
|
||||
clippy-helper = buildPackages.callPackage ./clippy-helper.nix { frrVersion = version; frrSource = src; };
|
||||
|
||||
configureFlags = [
|
||||
"--disable-silent-rules"
|
||||
"--disable-exampledir"
|
||||
"--enable-configfile-mask=0640"
|
||||
"--enable-group=frr"
|
||||
"--enable-logfile-mask=0640"
|
||||
"--enable-multipath=64"
|
||||
"--enable-snmp"
|
||||
"--enable-multipath=${toString numMultipath}"
|
||||
"--enable-user=frr"
|
||||
"--enable-vty-group=frrvty"
|
||||
"--localstatedir=/run/frr"
|
||||
"--sbindir=$(out)/libexec/frr"
|
||||
"--sysconfdir=/etc/frr"
|
||||
"--enable-rpki"
|
||||
"--with-clippy=${clippy-helper}/bin/clippy"
|
||||
# general options
|
||||
(lib.strings.enableFeature snmpSupport "snmp")
|
||||
(lib.strings.enableFeature rpkiSupport "rpki")
|
||||
(lib.strings.enableFeature watchfrrSupport "watchfrr")
|
||||
(lib.strings.enableFeature rtadvSupport "rtadv")
|
||||
(lib.strings.enableFeature irdpSupport "irdp")
|
||||
(lib.strings.enableFeature routeReplacementSupport "rr-semantics")
|
||||
# routing protocols
|
||||
(lib.strings.enableFeature bgpdSupport "bgpd")
|
||||
(lib.strings.enableFeature ripdSupport "ripd")
|
||||
(lib.strings.enableFeature ripngdSupport "ripngd")
|
||||
(lib.strings.enableFeature ospfdSupport "ospfd")
|
||||
(lib.strings.enableFeature ospf6dSupport "ospf6d")
|
||||
(lib.strings.enableFeature ldpdSupport "ldpd")
|
||||
(lib.strings.enableFeature nhrpdSupport "nhrpd")
|
||||
(lib.strings.enableFeature eigrpdSupport "eigrpd")
|
||||
(lib.strings.enableFeature babeldSupport "babeld")
|
||||
(lib.strings.enableFeature isisdSupport "isisd")
|
||||
(lib.strings.enableFeature pimdSupport "pimd")
|
||||
(lib.strings.enableFeature pim6dSupport "pim6d")
|
||||
(lib.strings.enableFeature sharpdSupport "sharpd")
|
||||
(lib.strings.enableFeature fabricdSupport "fabricd")
|
||||
(lib.strings.enableFeature vrrpdSupport "vrrpd")
|
||||
(lib.strings.enableFeature pathdSupport "pathd")
|
||||
(lib.strings.enableFeature bfddSupport "bfdd")
|
||||
(lib.strings.enableFeature pbrdSupport "pbrd")
|
||||
(lib.strings.enableFeature staticdSupport "staticd")
|
||||
# BGP options
|
||||
(lib.strings.enableFeature bgpAnnounce "bgp-announce")
|
||||
(lib.strings.enableFeature bgpBmp "bgp-bmp")
|
||||
(lib.strings.enableFeature bgpVnc "bgp-vnc")
|
||||
# OSPF options
|
||||
(lib.strings.enableFeature ospfApi "ospfapi")
|
||||
# Cumulus options
|
||||
(lib.strings.enableFeature cumulusSupport "cumulus")
|
||||
# Datacenter options
|
||||
(lib.strings.enableFeature datacenterSupport "datacenter")
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -123,7 +221,7 @@ stdenv.mkDerivation rec {
|
||||
private clouds.
|
||||
'';
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
maintainers = with maintainers; [ woffs ];
|
||||
maintainers = with maintainers; [ woffs thillux ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-/vnojWLpu/fktqPUhAdL1QTESxDwFrBVYAkyF79Fj9w=";
|
||||
};
|
||||
|
||||
sourceRoot = "./source/synapse_antispam";
|
||||
sourceRoot = "./${src.name}/synapse_antispam";
|
||||
|
||||
buildInputs = [ matrix-synapse ];
|
||||
|
||||
|
||||
77
pkgs/servers/search/qdrant/Cargo.lock
generated
77
pkgs/servers/search/qdrant/Cargo.lock
generated
@ -452,13 +452,14 @@ checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
|
||||
|
||||
[[package]]
|
||||
name = "api"
|
||||
version = "1.4.0"
|
||||
version = "1.4.1"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"env_logger",
|
||||
"log",
|
||||
"parking_lot",
|
||||
"prost",
|
||||
"prost-build",
|
||||
"prost-types",
|
||||
"rand 0.8.5",
|
||||
"schemars",
|
||||
@ -867,9 +868,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "cgroups-rs"
|
||||
version = "0.3.2"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b098e7c3a70d03c288fa0a96ccf13e770eb3d78c4cc0e1549b3c13215d5f965"
|
||||
checksum = "1fb3af90c8d48ad5f432d8afb521b5b40c2a2fce46dd60e05912de51c47fba64"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
@ -978,9 +979,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.3.19"
|
||||
version = "4.3.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
|
||||
checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@ -989,9 +990,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.3.19"
|
||||
version = "4.3.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
|
||||
checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@ -2272,9 +2273,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "indicatif"
|
||||
version = "0.17.5"
|
||||
version = "0.17.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
|
||||
checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
|
||||
dependencies = [
|
||||
"console",
|
||||
"instant",
|
||||
@ -2463,9 +2464,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.146"
|
||||
version = "0.2.147"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
|
||||
checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
@ -3515,6 +3516,8 @@ dependencies = [
|
||||
"prettyplease 0.1.22",
|
||||
"prost",
|
||||
"prost-types",
|
||||
"pulldown-cmark",
|
||||
"pulldown-cmark-to-cmark",
|
||||
"regex",
|
||||
"syn 1.0.107",
|
||||
"tempfile",
|
||||
@ -3562,9 +3565,29 @@ dependencies = [
|
||||
"syn 1.0.107",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pulldown-cmark"
|
||||
version = "0.9.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"memchr",
|
||||
"unicase",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pulldown-cmark-to-cmark"
|
||||
version = "10.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0194e6e1966c23cc5fd988714f85b18d548d773e81965413555d96569931833d"
|
||||
dependencies = [
|
||||
"pulldown-cmark",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "qdrant"
|
||||
version = "1.4.0"
|
||||
version = "1.4.1"
|
||||
dependencies = [
|
||||
"actix-cors",
|
||||
"actix-files",
|
||||
@ -4328,6 +4351,7 @@ dependencies = [
|
||||
"serde-value",
|
||||
"serde_cbor",
|
||||
"serde_json",
|
||||
"smol_str",
|
||||
"sysinfo",
|
||||
"tar",
|
||||
"tempfile",
|
||||
@ -4346,9 +4370,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.180"
|
||||
version = "1.0.183"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
|
||||
checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
@ -4375,9 +4399,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.180"
|
||||
version = "1.0.183"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
|
||||
checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -4541,6 +4565,15 @@ version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
||||
|
||||
[[package]]
|
||||
name = "smol_str"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.4.9"
|
||||
@ -4719,9 +4752,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
|
||||
[[package]]
|
||||
name = "tar"
|
||||
version = "0.4.39"
|
||||
version = "0.4.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96"
|
||||
checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
|
||||
dependencies = [
|
||||
"filetime",
|
||||
"libc",
|
||||
@ -4730,9 +4763,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.7.0"
|
||||
version = "3.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
|
||||
checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"fastrand",
|
||||
@ -5733,9 +5766,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "xattr"
|
||||
version = "0.2.3"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
|
||||
checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qdrant";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qdrant";
|
||||
repo = "qdrant";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-ccvtDz6woANSotTn6GwTAbGd0UlrpddvfH8+GR1dI3g=";
|
||||
sha256 = "sha256-28ugr0AiAgyE3KGK3LYHti2iTRslAhEKfy35xKyW/N8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -1,32 +1,38 @@
|
||||
{ stdenv, lib, fetchFromGitHub, postgresql, boost182, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apache_datasketches";
|
||||
let
|
||||
version = "1.6.0";
|
||||
|
||||
srcs = [
|
||||
( fetchFromGitHub {
|
||||
name = "datasketches-postgresql";
|
||||
owner = "apache";
|
||||
repo = "datasketches-postgresql";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-sz94fIe7nyWhjiw8FAm6ZzVpB0sAK5YxUrtbaZt/guA=";
|
||||
})
|
||||
( fetchFromGitHub {
|
||||
name = "datasketches-cpp";
|
||||
owner = "apache";
|
||||
repo = "datasketches-cpp";
|
||||
rev = "refs/tags/4.1.0";
|
||||
hash = "sha256-vPoFzRxOXlEAiiHH9M5S6255ahzaKsGNYS0cdHwrRYw=";
|
||||
})
|
||||
];
|
||||
sourceRoot = "datasketches-postgresql";
|
||||
main_src = fetchFromGitHub {
|
||||
name = "datasketches-postgresql";
|
||||
owner = "apache";
|
||||
repo = "datasketches-postgresql";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sz94fIe7nyWhjiw8FAm6ZzVpB0sAK5YxUrtbaZt/guA=";
|
||||
};
|
||||
|
||||
cpp_src = fetchFromGitHub {
|
||||
name = "datasketches-cpp";
|
||||
owner = "apache";
|
||||
repo = "datasketches-cpp";
|
||||
rev = "refs/tags/4.1.0";
|
||||
hash = "sha256-vPoFzRxOXlEAiiHH9M5S6255ahzaKsGNYS0cdHwrRYw=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "apache_datasketches";
|
||||
inherit version;
|
||||
|
||||
srcs = [ main_src cpp_src ];
|
||||
|
||||
sourceRoot = main_src.name;
|
||||
|
||||
buildInputs = [ postgresql boost182 ];
|
||||
|
||||
patchPhase = ''
|
||||
runHook prePatch
|
||||
cp -r ../datasketches-cpp .
|
||||
cp -r ../${cpp_src.name} .
|
||||
runHook postPatch
|
||||
'';
|
||||
|
||||
@ -43,10 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sql/datasketches_aod_sketch.sql \
|
||||
sql/datasketches_req_float_sketch.sql \
|
||||
sql/datasketches_quantiles_double_sketch.sql \
|
||||
> sql/datasketches--${finalAttrs.version}.sql
|
||||
> sql/datasketches--${version}.sql
|
||||
install -D -m 644 ./datasketches.control -t $out/share/postgresql/extension
|
||||
install -D -m 644 \
|
||||
./sql/datasketches--${finalAttrs.version}.sql \
|
||||
./sql/datasketches--${version}.sql \
|
||||
./sql/datasketches--1.3.0--1.4.0.sql \
|
||||
./sql/datasketches--1.4.0--1.5.0.sql \
|
||||
./sql/datasketches--1.5.0--1.6.0.sql \
|
||||
@ -68,4 +74,4 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ mmusnjak ];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@ -2,10 +2,9 @@
|
||||
|
||||
let
|
||||
version = "2.50.0";
|
||||
srcName = "azure-cli-${version}-src";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = srcName;
|
||||
name = "azure-cli-${version}-src";
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
rev = "azure-cli-${version}";
|
||||
@ -17,11 +16,12 @@ let
|
||||
inherit stdenv src version python3 fetchPypi;
|
||||
};
|
||||
in
|
||||
|
||||
py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
||||
pname = "azure-cli";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${srcName}/src/azure-cli";
|
||||
sourceRoot = "${src.name}/src/azure-cli";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
|
||||
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
sourceRoot = "./source/XADMaster";
|
||||
sourceRoot = "./${src.name}/XADMaster";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -1,27 +1,34 @@
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, openssl, libbsd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
version = "332.25";
|
||||
|
||||
apple_src = fetchFromGitHub {
|
||||
owner = "apple-oss-distributions";
|
||||
repo = "diskdev_cmds";
|
||||
rev = "diskdev_cmds-${version}";
|
||||
hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A=";
|
||||
name = "diskdev_cmds-${version}";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hfsprogs";
|
||||
inherit version;
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz";
|
||||
sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "apple-oss-distributions";
|
||||
repo = "diskdev_cmds";
|
||||
rev = "diskdev_cmds-${version}";
|
||||
hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A=";
|
||||
name = sourceRoot;
|
||||
})
|
||||
apple_src
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -ie '/sys\/sysctl.h/d' newfs_hfs.tproj/makehfs.c
|
||||
'';
|
||||
|
||||
sourceRoot = "diskdev_cmds-" + version;
|
||||
sourceRoot = apple_src.name;
|
||||
patches = [ "../debian/patches/*.patch" ];
|
||||
|
||||
buildInputs = [ openssl libbsd ];
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1bqh3vam7y805xrmdw7k0ckcfwjg88wypxgv3njkkwyn7kxnfnqp";
|
||||
};
|
||||
|
||||
sourceRoot = "welkin-r9638/tags/${version}";
|
||||
sourceRoot = "${src.name}/tags/${version}";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jre ];
|
||||
|
||||
@ -1,24 +1,33 @@
|
||||
{ lib, stdenv, fetchgit, libsForQt5 }:
|
||||
|
||||
let
|
||||
version = "3.1.0";
|
||||
|
||||
main_src = fetchgit {
|
||||
url = "https://www.opencode.net/dfn2/ocs-url.git";
|
||||
rev = "release-${version}";
|
||||
sha256 = "RvbkcSj8iUAHAEOyETwfH+3XnCCY/p8XM8LgVrZxrws=";
|
||||
};
|
||||
|
||||
qtil_src = fetchgit {
|
||||
url = "https://github.com/akiraohgaki/qtil";
|
||||
rev = "v0.4.0";
|
||||
sha256 = "XRSp0F7ggfkof1RNAnQU3+O9DcXDy81VR7NakITOXrw=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocs-url";
|
||||
version = "3.1.0";
|
||||
inherit version;
|
||||
|
||||
srcs = [
|
||||
(fetchgit {
|
||||
url = "https://www.opencode.net/dfn2/ocs-url.git";
|
||||
rev = "release-${version}";
|
||||
sha256 = "RvbkcSj8iUAHAEOyETwfH+3XnCCY/p8XM8LgVrZxrws=";
|
||||
})
|
||||
srcs = [ main_src qtil_src ];
|
||||
sourceRoot = main_src.name;
|
||||
|
||||
(fetchgit {
|
||||
url = "https://github.com/akiraohgaki/qtil";
|
||||
rev = "v0.4.0";
|
||||
sha256 = "XRSp0F7ggfkof1RNAnQU3+O9DcXDy81VR7NakITOXrw=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "ocs-url";
|
||||
# We are NOT in $sourceRoot here
|
||||
postUnpack = ''
|
||||
mkdir -p $sourceRoot/lib/qtil
|
||||
cp -r ${qtil_src.name}/* $sourceRoot/lib/qtil/
|
||||
'';
|
||||
|
||||
buildInputs = with libsForQt5.qt5; [
|
||||
qtbase
|
||||
@ -28,12 +37,6 @@ stdenv.mkDerivation rec {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
# We are NOT in $sourceRoot here
|
||||
postUnpack = ''
|
||||
mkdir -p $sourceRoot/lib/qtil
|
||||
cp -r qtil/* $sourceRoot/lib/qtil/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open Collaboration System for use with DE store websites";
|
||||
license = licenses.gpl3Only;
|
||||
|
||||
31
pkgs/tools/misc/see/default.nix
Normal file
31
pkgs/tools/misc/see/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib, python3, fetchFromGitHub }:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "see";
|
||||
version = "unstable-2023-03-19";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Textualize";
|
||||
repo = "textualize-see";
|
||||
rev = "eef61dd348178ec60c5b0a01062e0b621eb57315";
|
||||
hash = "sha256-SqjDHcFKWbk4ouWkhGohDl5kGjM/9fzqFDexVcaY1gw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
click
|
||||
colorama
|
||||
toml
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Textualize See is a command line tool to open files in the terminal.";
|
||||
homepage = "https://github.com/Textualize/textualize-see";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ anselmschueler ];
|
||||
};
|
||||
}
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
sourceRoot = "./source/src";
|
||||
sourceRoot = "./${src.name}/src";
|
||||
|
||||
installPhase = ''
|
||||
install -Dm555 -t $out/bin bully
|
||||
|
||||
@ -11,30 +11,35 @@
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
pname = "iaito";
|
||||
version = "5.8.6";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = "iaito";
|
||||
rev = version;
|
||||
hash = "sha256-rl8bOIR0oS6YvZA5pr8oSj7HcKK4YeCjAEi7saVdvk8=";
|
||||
name = repo;
|
||||
})
|
||||
(fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = "iaito-translations";
|
||||
rev = "e66b3a962a7fc7dfd730764180011ecffbb206bf";
|
||||
hash = "sha256-6NRTZ/ydypsB5TwbivvwOH9TEMAff/LH69hCXTvMPp8=";
|
||||
name = repo;
|
||||
})
|
||||
];
|
||||
sourceRoot = "iaito/src";
|
||||
main_src = fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rl8bOIR0oS6YvZA5pr8oSj7HcKK4YeCjAEi7saVdvk8=";
|
||||
name = repo;
|
||||
};
|
||||
|
||||
translations_src = fetchFromGitHub rec {
|
||||
owner = "radareorg";
|
||||
repo = "iaito-translations";
|
||||
rev = "e66b3a962a7fc7dfd730764180011ecffbb206bf";
|
||||
hash = "sha256-6NRTZ/ydypsB5TwbivvwOH9TEMAff/LH69hCXTvMPp8=";
|
||||
name = repo;
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
|
||||
srcs = [ main_src translations_src ];
|
||||
sourceRoot = "${main_src.name}/src";
|
||||
|
||||
postUnpack = ''
|
||||
chmod -R u+w iaito-translations
|
||||
chmod -R u+w ${translations_src.name}
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
@ -60,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-I" "${radare2.src}/shlr/sdb/include/sdb" ];
|
||||
|
||||
postBuild = ''
|
||||
pushd ../../../iaito-translations
|
||||
pushd ../../../${translations_src.name}
|
||||
make build -j$NIX_BUILD_CORES PREFIX=$out
|
||||
popd
|
||||
'';
|
||||
@ -73,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
install -m644 -Dt $out/share/applications ../org.radare.iaito.desktop
|
||||
install -m644 -Dt $out/share/pixmaps ../img/iaito-o.svg
|
||||
|
||||
pushd ../../../iaito-translations
|
||||
pushd ../../../${translations_src.name}
|
||||
make install -j$NIX_BUILD_CORES PREFIX=$out
|
||||
popd
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
|
||||
inherit rev;
|
||||
};
|
||||
|
||||
sourceRoot = "./source/platform-independent/c/cli";
|
||||
sourceRoot = "./${src.name}/platform-independent/c/cli";
|
||||
|
||||
postPatch = ''
|
||||
rm build
|
||||
|
||||
@ -1944,7 +1944,9 @@ with pkgs;
|
||||
|
||||
tere = callPackage ../tools/misc/tere { };
|
||||
|
||||
termusic = callPackage ../applications/audio/termusic { };
|
||||
termusic = darwin.apple_sdk_11_0.callPackage ../applications/audio/termusic {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
|
||||
};
|
||||
|
||||
tfk8s = callPackage ../tools/misc/tfk8s { };
|
||||
|
||||
@ -6175,6 +6177,8 @@ with pkgs;
|
||||
|
||||
scour = with python3Packages; toPythonApplication scour;
|
||||
|
||||
see = callPackage ../tools/misc/see { };
|
||||
|
||||
s2png = callPackage ../tools/graphics/s2png { };
|
||||
|
||||
sfz = callPackage ../tools/misc/sfz { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user