Merge pull request 'use nix-unit from nixpkgs, drop floco from flake inputs' (#645) from Mic92-wayland-update into main
This commit is contained in:
commit
fbea4dcaf1
21
flake.lock
21
flake.lock
@ -40,26 +40,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"floco": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1694873346,
|
||||
"narHash": "sha256-Uvh03bg0a6ZnNWiX1Gb8g+m343wSJ/wb8ryUASt0loc=",
|
||||
"owner": "aakropotkin",
|
||||
"repo": "floco",
|
||||
"rev": "d16bd444ab9d29a6640f52ee4e43a66528e07515",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aakropotkin",
|
||||
"repo": "floco",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixlib": {
|
||||
"locked": {
|
||||
"lastModified": 1693701915,
|
||||
@ -132,7 +112,6 @@
|
||||
"inputs": {
|
||||
"disko": "disko",
|
||||
"flake-parts": "flake-parts",
|
||||
"floco": "floco",
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-for-deal": "nixpkgs-for-deal",
|
||||
|
@ -10,8 +10,6 @@
|
||||
# https://github.com/NixOS/nixpkgs/pull/265872
|
||||
nixpkgs-for-deal.url = "github:Luis-Hebendanz/nixpkgs/fix_python_deal";
|
||||
|
||||
floco.url = "github:aakropotkin/floco";
|
||||
floco.inputs.nixpkgs.follows = "nixpkgs";
|
||||
disko.url = "github:nix-community/disko";
|
||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
|
@ -1,5 +1,5 @@
|
||||
{
|
||||
perSystem = { pkgs, self', ... }: {
|
||||
perSystem = { pkgs, ... }: {
|
||||
checks = {
|
||||
|
||||
# check if the `clan config` example jsonschema and data is valid
|
||||
@ -19,7 +19,7 @@
|
||||
# check if the `clan config` nix jsonschema converter unit tests succeed
|
||||
lib-jsonschema-nix-unit-tests = pkgs.runCommand "lib-jsonschema-nix-unit-tests" { } ''
|
||||
export NIX_PATH=nixpkgs=${pkgs.path}
|
||||
${self'.packages.nix-unit}/bin/nix-unit \
|
||||
${pkgs.nix-unit}/bin/nix-unit \
|
||||
${./.}/test.nix \
|
||||
--eval-store $(realpath .)
|
||||
touch $out
|
||||
|
@ -30,8 +30,7 @@
|
||||
in
|
||||
{
|
||||
devShells.clan-cli = pkgs.callPackage ./shell.nix {
|
||||
inherit (self'.packages) clan-cli nix-unit;
|
||||
# inherit (inputs) democlan;
|
||||
inherit (self'.packages) clan-cli;
|
||||
};
|
||||
packages = {
|
||||
clan-cli = pkgs.python3.pkgs.callPackage ./default.nix {
|
||||
|
@ -13,7 +13,6 @@
|
||||
inherit (config.packages) tea-create-pr;
|
||||
};
|
||||
pending-reviews = pkgs.callPackage ./pending-reviews { };
|
||||
nix-unit = pkgs.callPackage ./nix-unit { };
|
||||
meshname = pkgs.callPackage ./meshname { };
|
||||
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
aemu = pkgs.callPackage ./aemu { };
|
||||
@ -26,6 +25,7 @@
|
||||
qemu-wayland = pkgs.callPackage ./qemu-wayland {
|
||||
inherit (config.packages) rutabaga-gfx-ffi;
|
||||
};
|
||||
wayland-proxy-virtwl = pkgs.callPackage ./wayland-proxy-virtwl { };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -1,50 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, nixVersions
|
||||
, fetchFromGitHub
|
||||
, nlohmann_json
|
||||
, boost
|
||||
, meson
|
||||
, pkg-config
|
||||
, ninja
|
||||
, cmake
|
||||
, clang-tools
|
||||
, difftastic
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "nix-unit";
|
||||
version = "0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "adisbladis";
|
||||
repo = "nix-unit";
|
||||
rev = "7e2ee1c70f930b9b65b9fc33c3f3eca0dfae00d1";
|
||||
sha256 = "sha256-UaUkh+/lxzNCRH64YB6SbyRIvvDhgY98izX9CvWgJA4=";
|
||||
};
|
||||
buildInputs = [
|
||||
nlohmann_json
|
||||
nixVersions.nix_2_18
|
||||
boost
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
ninja
|
||||
# nlohmann_json can be only discovered via cmake files
|
||||
cmake
|
||||
makeWrapper
|
||||
] ++ (lib.optional stdenv.cc.isClang [ clang-tools ]);
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/nix-unit" --prefix PATH : ${difftastic}/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Nix unit test runner";
|
||||
homepage = "https://github.com/adisbladis/nix-unit";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ adisbladis ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
28
pkgs/wayland-proxy-virtwl/default.nix
Normal file
28
pkgs/wayland-proxy-virtwl/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ wayland-proxy-virtwl, fetchFromGitHub, libdrm, ocaml-ng }:
|
||||
let
|
||||
ocaml-wayland = ocaml-ng.ocamlPackages_5_0.wayland.overrideAttrs (_old: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "ocaml-wayland";
|
||||
rev = "f6910aa5b626fa582cc000d4fe7b50182d11b439";
|
||||
hash = "sha256-cg3HLezWTxWoYWSrirOV12gv1CRz1gMIOT7j3j3v5EA=";
|
||||
};
|
||||
});
|
||||
in
|
||||
wayland-proxy-virtwl.overrideAttrs (_old: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = "wayland-proxy-virtwl";
|
||||
rev = "652fca9d4e006a2bdeba920dfaf53190c5373a7d";
|
||||
hash = "sha256-VgpqxjHgueK9eQSX987PF0KvscpzkScOzFkW3haYCOw=";
|
||||
};
|
||||
buildInputs = [ libdrm ] ++ (with ocaml-ng.ocamlPackages_5_0; [
|
||||
ocaml-wayland
|
||||
dune-configurator
|
||||
eio_main
|
||||
ppx_cstruct
|
||||
cmdliner
|
||||
logs
|
||||
ppx_cstruct
|
||||
]);
|
||||
})
|
Loading…
Reference in New Issue
Block a user