diff --git a/flake.lock b/flake.lock index 44bcf0365..d951bd04d 100644 --- a/flake.lock +++ b/flake.lock @@ -159,16 +159,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1774062094, - "narHash": "sha256-ba3c+hS7KzEiwtZRGHagIAYdcmdY3rCSWVCyn64rx7s=", + "lastModified": 1779160702, + "narHash": "sha256-frUihZLlBLdcFN95mq5QiQmxF2M16nxtmw1GH4rhZmg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c807e83cc2e32adc35f51138b3bdef722c0812ab", + "rev": "8cd592658d4448c57326aaa819e1c2f91086eb40", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7dca7f5ee..9c8017b36 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Radicle Desktop App"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; flake-utils.url = "github:numtide/flake-utils"; rust-overlay = { url = "github:oxalica/rust-overlay"; @@ -19,49 +19,57 @@ rust-overlay, heartwood, ... - }: - (flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { - inherit system; - overlays = [ - (import rust-overlay) - ]; - }; - in { + }: (flake-utils.lib.eachDefaultSystem (system: let + pkgs = import nixpkgs { + inherit system; + overlays = [ + (import rust-overlay) + ]; + }; + in { + checks = { + radicle-desktop = self.packages.${system}.radicle-desktop.overrideAttrs {doCheck = true;}; + }; - checks = { - radicle-desktop = self.packages.${system}.radicle-desktop.overrideAttrs ({ doCheck = true; }); - }; - - devShells.default = pkgs.mkShell { - name = "radicle-desktop-env"; - inputsFrom = [ self.checks.${system}.radicle-desktop ]; - nativeBuildInputs = with pkgs; [ - cargo-watch - cargo-nextest - ripgrep - rust-analyzer - ]; - env = self.checks.${system}.radicle-desktop.env // { + devShells.default = pkgs.mkShell { + name = "radicle-desktop-env"; + inputsFrom = [self.checks.${system}.radicle-desktop]; + nativeBuildInputs = with pkgs; [ + cargo-watch + cargo-nextest + ripgrep + rust-analyzer + ]; + env = + self.checks.${system}.radicle-desktop.env + // { }; + }; + + packages = { + default = self.packages.${system}.radicle-desktop; + twemoji-assets = pkgs.fetchFromGitHub { + owner = "twitter"; + repo = "twemoji"; + rev = "v14.0.2"; + hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI="; }; - packages = { - default = self.packages.${system}.radicle-desktop; - twemoji-assets = pkgs.fetchFromGitHub { - owner = "twitter"; - repo = "twemoji"; - rev = "v14.0.2"; - hash = "sha256-YoOnZ5uVukzi/6bLi22Y8U5TpplPzB7ji42l+/ys5xI="; - }; - - radicle-desktop = pkgs.callPackage ./nix/radicle-desktop.nix { + radicle-desktop = + pkgs.callPackage ./nix/radicle-desktop.nix { inherit heartwood; inherit (self.packages.${system}) twemoji-assets; } - // (if self ? rev || self ? dirtyRev then { - GIT_HEAD = if self ? rev then self.rev else self.dirtyRev; - } else {}); - }; - })); + // ( + if self ? rev || self ? dirtyRev + then { + GIT_HEAD = + if self ? rev + then self.rev + else self.dirtyRev; + } + else {} + ); + }; + })); }