romanl/nixos
1
0
Fork 0
mirror of https://github.com/JaxTheWolf/nixos.git synced 2026-04-01 02:00:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Generale update

Browse Source
This commit is contained in:
Roman Lubij
2026-01-05 15:16:09 +01:00
parent e447bd87ec
commit 79d89e560a
4 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
flake.lock generated
View File

@@ -19,15 +19,16 @@
"czkawka-src": { "czkawka-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1766866815, "lastModified": 1742109806,
"narHash": "sha256-j2O9mBsujjdS/gsD3p8Lcry9qYu/SkJf+fttNT/hjQA=", "narHash": "sha256-ePiHDfQ1QC3nff8uWE0ggiTuulBomuoZ3ta0redUYXY=",
"owner": "qarmin", "owner": "qarmin",
"repo": "czkawka", "repo": "czkawka",
"rev": "420d044b74c2472f9067ef64ca6763214ca14715", "rev": "5dc8d38cfef639b71e74468a284677b5ec9f97bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "qarmin", "owner": "qarmin",
"ref": "9.0.0",
"repo": "czkawka", "repo": "czkawka",
"type": "github" "type": "github"
} }
@@ -112,11 +113,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1767116409, "lastModified": 1767379071,
"narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cad22e7d996aea55ecab064e84834289143e44a0", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -128,11 +129,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1767227401, "lastModified": 1767593864,
"narHash": "sha256-hLsBkzavn9t6VjOhc9HNP0+Z9HKMaTrRg6YgS73R3dY=", "narHash": "sha256-AtzRYWSxsyvySDzfOek0lKQXoQrHtpFHbBPZ6rdQIEA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6f739416f7151cd4a5c79443b5500e984341774", "rev": "1b717f421d250290b16de9a6033ea28258c46ae1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -144,11 +145,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1767116409, "lastModified": 1767379071,
"narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cad22e7d996aea55ecab064e84834289143e44a0", "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flakes/czkawka-master/flake.nix
View File

@@ -4,10 +4,9 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# The source code from GitHub
czkawka-src = { czkawka-src = {
url = "github:qarmin/czkawka"; url = "github:qarmin/czkawka/9.0.0";
flake = false; # The upstream repo doesn't have a flake.nix flake = false;
}; };
# Naersk: Builds Rust crates without needing a manual cargoHash # Naersk: Builds Rust crates without needing a manual cargoHash
@@ -29,7 +28,6 @@
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
naersk-lib = pkgs.callPackage naersk { }; naersk-lib = pkgs.callPackage naersk { };
# Czkawka requires these system libraries
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
@@ -45,7 +43,7 @@
pango pango
gdk-pixbuf gdk-pixbuf
atk atk
# Optional: libadwaita if the master branch has switched to it libadwaita
]; ];
in in
@@ -55,11 +53,11 @@
version = "master"; version = "master";
src = czkawka-src; src = czkawka-src;
# Add the dependencies
inherit nativeBuildInputs buildInputs; inherit nativeBuildInputs buildInputs;
# We need to manually install the desktop files/icons because Naersk RUSTFLAGS = "-C target-cpu=native";
# only installs the binaries by default. NIX_CFLAGS_COMPILE = "-march=native -mtune=native";
postInstall = '' postInstall = ''
install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg

7
flakes/solaar-master/flake.nix
View File

@@ -5,7 +5,6 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
# This input automatically tracks the latest commit on master
solaar-src = { solaar-src = {
url = "github:pwr-Solaar/Solaar/master"; url = "github:pwr-Solaar/Solaar/master";
flake = false; flake = false;
@@ -29,14 +28,9 @@
packages.default = pythonPackages.buildPythonApplication rec { packages.default = pythonPackages.buildPythonApplication rec {
pname = "solaar"; pname = "solaar";
version = "master-${solaar-src.shortRev or "dirty"}"; version = "master-${solaar-src.shortRev or "dirty"}";
src = solaar-src; src = solaar-src;
# --- FIX STARTS HERE ---
# 1. Enable pyproject format
pyproject = true; pyproject = true;
# 2. Add build tools (setuptools/wheel) to nativeBuildInputs
nativeBuildInputs = nativeBuildInputs =
with pkgs; with pkgs;
[ [
@@ -48,7 +42,6 @@
setuptools setuptools
wheel wheel
]); ]);
# --- FIX ENDS HERE ---
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pyudev pyudev

2
modules/packages.nix
View File

@@ -13,7 +13,7 @@
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
"ventoy-gtk3-1.1.07" "ventoy-gtk3-1.1.10"
]; ];
}; };
overlays = [ overlays = [