Compare commits

..

No commits in common. "4d2e8e5f21cfb931f88aa2ca3174ec25a5e615be" and "5650e76a4b202e2ef0405f033b7be89dfa29ff85" have entirely different histories.

9 changed files with 3 additions and 74 deletions

View file

@ -26,7 +26,6 @@
formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper); formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
nixosModules = import ./modules; nixosModules = import ./modules;
nixosConfigurations = import ./hosts {inherit self inputs;}; nixosConfigurations = import ./hosts {inherit self inputs;};
packages = eachSystem (pkgs: import ./pkgs pkgs);
deploy.nodes = import ./nodes {inherit self inputs;}; deploy.nodes = import ./nodes {inherit self inputs;};
}; };
inputs = { inputs = {

View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: {
inputs,
pkgs,
...
}: {
imports = [ imports = [
./browsers ./browsers
./media ./media
@ -39,7 +35,5 @@
nautilus nautilus
simple-scan simple-scan
entr entr
inputs.self.packages.${pkgs.system}.mcuxpresso.ide
inputs.self.packages.${pkgs.system}.mcuxpresso.config-tools
]; ];
} }

View file

@ -60,10 +60,6 @@
git.enable = true; git.enable = true;
utility = {
vim-wakatime.enable = true;
};
lsp = { lsp = {
enable = true; enable = true;
lspSignature.enable = true; lspSignature.enable = true;

View file

@ -1,3 +0,0 @@
pkgs: {
mcuxpresso = import ./mcuxpresso pkgs;
}

View file

@ -1,3 +0,0 @@
pkgs: {
ide = pkgs.callPackage ./ide.nix pkgs;
}

View file

@ -1,44 +0,0 @@
pkgs: let
name = "mcuxpressoide";
version = "24.9.25";
description = "MCUXpresso IDE";
filename = "${name}-${version}.x86_64.deb";
src = pkgs.stdenv.mkDerivation {
inherit version description;
name = "${name}-src";
src = pkgs.requireFile {
url = "https://www.nxp.com/design/design-center/software/development-software/mcuxpresso-software-and-tools-/mcuxpresso-integrated-development-environment-ide:MCUXpresso-IDE";
name = "${filename}.bin";
hash = "sha256-e3g7rzZQ1WFLcUakkjaufpHMtw3qkw5lwxJuCKs6L+k=";
};
buildCommand = ''
# Unpack tarball.
mkdir -p deb
sh $src --target deb || true
ar -xv deb/${filename}
tar xfvz data.tar.gz -C .
mkdir -p ./final/eclipse
mv ./usr/local/${name}-${version}/ide/* ./usr/local/${name}-${version}/ide/.* final/eclipse
mv final/eclipse/mcuxpressoide final/eclipse/eclipse
mv final/eclipse/mcuxpressoide.ini final/eclipse/eclipse.ini
# Create custom .eclipseproduct file
rm final/eclipse/.eclipseproduct
echo "name=${name}
id=com.nxp.${name}
version=${version}
" > final/eclipse/.eclipseproduct
# Install udev rules
mkdir -p final/lib/udev/rules.d
mv ./lib/udev/rules.d/56-pemicro.rules ./lib/udev/rules.d/85-mcuxpresso.rules final/lib/udev/rules.d/
# Additional files
mv ./usr/local/${name}-${version}/mcu_data final/mcu_data
cd ./final
tar -czf $out ./
'';
};
mcuxpressoide = pkgs.eclipses.buildEclipse {
name = "${name}-eclipse";
inherit description src;
};
in
mcuxpressoide

View file

@ -7,7 +7,6 @@
"audio" "audio"
"video" "video"
"wheel" "wheel"
"plugdev"
]; ];
}; };
} }

View file

@ -1,5 +1,6 @@
{pkgs, ...}: { {pkgs, ...}: {
nixpkgs = { nixpkgs = {
config.allowUnfree = true;
overlays = [ overlays = [
(_: prev: { (_: prev: {
lib = lib =
@ -9,11 +10,6 @@
}; };
}) })
]; ];
config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2"];
config = {
allowUnfree = true;
permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2" "segger-jlink-qt4-796s"];
segger-jlink.acceptLicense = true;
};
}; };
} }

View file

@ -1,8 +1,3 @@
{ {
inputs,
pkgs,
...
}: {
imports = [./docker.nix ./gnupg.nix ./pipewire.nix ./kmscon.nix]; imports = [./docker.nix ./gnupg.nix ./pipewire.nix ./kmscon.nix];
services.udev.packages = [pkgs.segger-jlink inputs.self.packages.${pkgs.system}.mcuxpresso.ide];
} }