mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
sonic-server: migrate to pkgs/by-name, format with nixfmt-rfc-style
This commit is contained in:
parent
c7ba5c8a2a
commit
076aa0be1b
@ -1,11 +1,12 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, nixosTests
|
||||
, testers
|
||||
, sonic-server
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
rustPlatform,
|
||||
sonic-server,
|
||||
testers,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -21,9 +22,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM=";
|
||||
|
||||
# Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
@ -31,19 +29,22 @@ rustPlatform.buildRustPackage rec {
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.rs --replace "./config.cfg" "$out/etc/sonic/config.cfg"
|
||||
substituteInPlace src/main.rs \
|
||||
--replace-fail "./config.cfg" "$out/etc/sonic/config.cfg"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/etc/sonic config.cfg
|
||||
install -Dm444 -t $out/lib/systemd/system debian/sonic.service
|
||||
|
||||
substituteInPlace \
|
||||
$out/lib/systemd/system/sonic.service \
|
||||
--replace /usr/bin/sonic $out/bin/sonic \
|
||||
--replace /etc/sonic.cfg $out/etc/sonic/config.cfg
|
||||
substituteInPlace $out/lib/systemd/system/sonic.service \
|
||||
--replace-fail /usr/bin/sonic $out/bin/sonic \
|
||||
--replace-fail /etc/sonic.cfg $out/etc/sonic/config.cfg
|
||||
'';
|
||||
|
||||
# Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) sonic-server;
|
||||
@ -62,6 +63,9 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.mpl20;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "sonic";
|
||||
maintainers = with maintainers; [ pleshevskiy anthonyroussel ];
|
||||
maintainers = with maintainers; [
|
||||
pleshevskiy
|
||||
anthonyroussel
|
||||
];
|
||||
};
|
||||
}
|
@ -8315,8 +8315,6 @@ with pkgs;
|
||||
|
||||
sbsigntool = callPackage ../tools/security/sbsigntool { };
|
||||
|
||||
sonic-server = callPackage ../servers/search/sonic-server { };
|
||||
|
||||
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
|
||||
|
||||
gsmlib = callPackage ../development/libraries/gsmlib
|
||||
|
Loading…
Reference in New Issue
Block a user