Merge pull request #273179 from Kloenk/framework-tool
framework-tool: remove duplicated framework-system-tools and move maintainers
This commit is contained in:
commit
aad85886ff
4 changed files with 3 additions and 1359 deletions
1312
pkgs/by-name/fr/framework-system-tools/Cargo.lock
generated
1312
pkgs/by-name/fr/framework-system-tools/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -1,45 +0,0 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, udev
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "491a587342a5d79366a25d803b7065169314279c";
|
||||
in rustPlatform.buildRustPackage {
|
||||
pname = "framework-system-tools";
|
||||
version = "unstable-2023-11-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FrameworkComputer";
|
||||
repo = "framework-system";
|
||||
inherit rev;
|
||||
hash = "sha256-qDtW4DvY19enCfkOBRaako9ngAkmSreoNWlL4QE2FAk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
udev
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"smbios-lib-0.9.1" = "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo=";
|
||||
"uefi-0.20.0" = "sha256-/3WNHuc27N89M7s+WT64SHyFOp7YRyzz6B+neh1vejY=";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rust libraries and tools to interact with the framework system.";
|
||||
homepage = "https://github.com/FrameworkComputer/framework-system";
|
||||
mainProgram = "framework_tool";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ kloenk leona ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "framework-tool";
|
||||
|
||||
# Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock,
|
||||
|
@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/FrameworkComputer/framework-system";
|
||||
license = licenses.bsd3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
maintainers = with maintainers; [ nickcao leona kloenk ];
|
||||
mainProgram = "framework_tool";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -271,6 +271,7 @@ mapAliases ({
|
|||
foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
|
||||
foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20
|
||||
fractal-next = fractal; # added 2023-11-25
|
||||
framework-system-tools = framework-tool; # added 2023-12-09
|
||||
fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
|
||||
fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
|
||||
|
||||
|
|
Loading…
Reference in a new issue