Skip to content

Commit

Permalink
Update flake
Browse files Browse the repository at this point in the history
- Manually update nixpkgs and fenix to same revision as used in latest
  merge from upstream (adb4740)
- Update naersk
- Drop determinate input since we don't use it

• Updated input 'fenix':
    'github:nix-community/fenix/73124e1356bde9411b163d636b39fe4804b7ca45' (2024-05-01)
  → 'github:nix-community/fenix/a9d2e5fa8d77af05240230c9569bbbddd28ccfaf' (2024-10-01)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/49e502b277a8126a9ad10c802d1aaa3ef1a280ef' (2024-04-30)
  → 'github:rust-lang/rust-analyzer/28830ff2f1158ee92f4852ef3ec35af0935d1562' (2024-09-30)
• Updated input 'naersk':
    'github:nix-community/naersk/3fb418eaf352498f6b6c30592e3beb63df42ef11' (2024-07-23)
  → 'github:nix-community/naersk/378614f37a6bee5a3f2ef4f825a73d948d3ae921' (2024-12-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02)
  → 'github:NixOS/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9' (2024-09-29)
  • Loading branch information
mkenigs committed Dec 20, 2024
1 parent 0e0b58d commit f66efcb
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 97 deletions.
94 changes: 14 additions & 80 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 7 additions & 17 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
description = "Experimental Nix Installer";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f";
# I translated upstream versioning with
# git show $most_recently_merged_commit:flake.lock | jq '.nodes[.nodes.root.inputs.nixpkgs].locked.rev'
nixpkgs.url = "github:NixOS/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9";

# I translated upstream versioning with
# git show $most_recently_merged_commit:flake.lock | jq '.nodes[.nodes.root.inputs.fenix].locked.rev'
fenix = {
url = "github:nix-community/fenix/73124e1356bde9411b163d636b39fe4804b7ca45";
url = "github:nix-community/fenix/a9d2e5fa8d77af05240230c9569bbbddd28ccfaf";
inputs.nixpkgs.follows = "nixpkgs";
};

Expand All @@ -19,19 +23,6 @@
# Omitting `inputs.nixpkgs.follows = "nixpkgs";` on purpose
};

determinate = {
url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1.tar.gz";

# We set the overrides below so the flake.lock has many fewer nodes.
#
# The `determinate` input is used to access the builds of `determinate-nixd`.
# Below, we access the `packages` outputs, which download static builds of `determinate-nixd` and makes them executable.
# The way we consume the determinate flake means the `nix` and `nixpkgs` inputs are not meaningfully used.
# This means `follows` won't cause surprisingly extensive rebuilds, just trivial `chmod +x` rebuilds.
inputs.nixpkgs.follows = "nixpkgs";
inputs.nix.follows = "nix";
};

flake-compat.url = "github:edolstra/flake-compat/v1.0.0";
};

Expand All @@ -41,7 +32,6 @@
, fenix
, naersk
, nix
, determinate
, ...
} @ inputs:
let
Expand Down Expand Up @@ -73,7 +63,7 @@
inputs.nix.tarballs_direct.${system}
or "${inputs.nix.checks."${system}".binaryTarball}/nix-${inputs.nix.packages."${system}".default.version}-${system}.tar.xz");

optionalPathToDeterminateNixd = system: if builtins.elem system systemsSupportedByDeterminateNixd then "${inputs.determinate.packages.${system}.default}/bin/determinate-nixd" else null;
optionalPathToDeterminateNixd = system: null;
in
{
overlays.default = final: prev:
Expand Down

0 comments on commit f66efcb

Please sign in to comment.