Skip to content

Nixos 24.11 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
htngr merged 6 commits into from
Mar 6, 2025
Merged

Nixos 24.11 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
793cbf2
egui init
htngr Feb 21, 2025
f4fe5d5
added image support
htngr Feb 24, 2025
fc323ba
Updated flake to nixos-24.11 and Cargo.toml
htngr Feb 26, 2025
a496624
Execute nix-cache on pull request
htngr Feb 27, 2025
e381e8c
Added git-url-parse hash
htngr Feb 27, 2025
3ff5b8f
Nix 2.26
htngr Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/nix-cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# - "v*.*.*"
branches:
- "master"
pull_request:

permissions:
contents: read
Expand All @@ -18,7 +19,7 @@
- uses: DeterminateSystems/nix-installer-action@main
with:
source-tag: "v0.32.0"
- uses: DeterminateSystems/magic-nix-cache-action@main

Check warning on line 22 in .github/workflows/nix-cache.yml

View workflow job for this annotation

GitHub Actions / nix

Magic Nix Cache is deprecated 

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025.
To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead.

Replace...
    - uses: DeterminateSystems/magic-nix-cache-action@main

...with...
    - uses: DeterminateSystems/flakehub-cache-action@main

For more details: https://dtr.mn/magic-nix-cache-eol
- uses: cachix/cachix-action@v15
with:
name: codchi
Expand Down
11 changes: 8 additions & 3 deletions build/build-rust-package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
, pkg-config
, gtk3
, libayatana-appindicator
, libxkbcommon
, libGL
, libGLU

, llvmPackages
, cargo-xwin
Expand All @@ -44,7 +47,7 @@ let
];
};
# rustOrig = rust-bin.stable.latest.default.override rustConfig;
rustOrig = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override rustConfig);
rustOrig =rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override rustConfig);
rustPlatformOrig = makeRustPlatform { cargo = rustOrig; rustc = rustOrig; };
xwin = rustPlatformOrig.buildRustPackage rec {
name = "xwin";
Expand Down Expand Up @@ -117,8 +120,7 @@ let
EOF
chmod +x $out/bin/cargo
'')
//
{ inherit (rustOrig) meta; };
// { inherit (rustOrig) meta targetPlatforms badTargetPlatforms; };
rustPlatform = makeRustPlatform { cargo = passthru.rust; rustc = passthru.rust; };

setupXWin = topDir: /* bash */ ''
Expand Down Expand Up @@ -194,6 +196,9 @@ let
buildInputs = [
gtk3
libayatana-appindicator.out
libxkbcommon.out
libGL.out
libGLU.out
];

outputs = [ "out" "docs" ];
Expand Down
Loading
Loading