diff --git a/flake.lock b/flake.lock index 6aea418..5bf3966 100644 --- a/flake.lock +++ b/flake.lock @@ -37,47 +37,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666867875, - "narHash": "sha256-3nD7iQXd/J6KjkT8IjozTuA5p8qjiLKTxvOUmH+AzNM=", + "lastModified": 1685533922, + "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c132d0837dfb9035701dcd8fc91786c605c855c3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-mozilla": { - "flake": false, - "locked": { - "lastModified": 1664789696, - "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=", - "owner": "mozilla", - "repo": "nixpkgs-mozilla", - "rev": "80627b282705101e7b38e19ca6e8df105031b072", - "type": "github" - }, - "original": { - "owner": "mozilla", - "repo": "nixpkgs-mozilla", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1665934222, - "narHash": "sha256-EIPSpN/LMWcKO56KnCF9xJzIOeNU5bJ83ziSgd8I54Y=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1087d09dfbf82e086a54390b09b353365aaf8658", + "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -86,9 +55,7 @@ "inputs": { "flake-utils": "flake-utils", "naersk": "naersk", - "nixpkgs": "nixpkgs", - "nixpkgs-mozilla": "nixpkgs-mozilla", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index f712cb3..a35ae76 100644 --- a/flake.nix +++ b/flake.nix @@ -1,30 +1,16 @@ { description = "A discord bot for Dự Tuyển Tổng Hợp server"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; naersk.url = "github:nix-community/naersk"; naersk.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs-mozilla = { - url = github:mozilla/nixpkgs-mozilla; - flake = false; - }; flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, naersk, flake-utils, nixpkgs-mozilla }: flake-utils.lib.eachDefaultSystem (system: + outputs = { self, nixpkgs, naersk, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { inherit system; overlays = [ (import nixpkgs-mozilla) ]; }; - pkgs-unstable = import nixpkgs-unstable { inherit system; }; + pkgs = import nixpkgs { inherit system; }; - rust-toolchain = (pkgs.rustChannelOf { - channel = "1.65.0"; - sha256 = "sha256-DzNEaW724O8/B8844tt5AVHmSjSQ3cmzlU4BP90oRlY="; - }); - - naersk' = pkgs.callPackage naersk { - cargo = rust-toolchain.rust; - rustc = rust-toolchain.rust; - }; + naersk' = pkgs.callPackage naersk { }; in rec { packages.youmubot = naersk'.buildPackage { @@ -56,23 +42,20 @@ devShell = pkgs.mkShell { buildInputs = - with rust-toolchain; [ rust ] - ++ (with pkgs-unstable; [ rustfmt ]) - ++ nixpkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ - libiconv - darwin.apple_sdk.frameworks.Security - ]) - ++ (with pkgs; [ + nixpkgs.lib.optionals pkgs.stdenv.isDarwin + (with pkgs; [ + libiconv + darwin.apple_sdk.frameworks.Security + ]) + ++ (with pkgs; [ openssl + cargo + rustfmt ]); nativeBuildInputs = nixpkgs.lib.optionals pkgs.stdenv.isLinux (with pkgs; [ pkg-config ]); - - shellHook = '' - export RUST_SRC_PATH="${rust-toolchain.rust-src}/lib/rustlib/src/rust/library"; - ''; }; # module nixosModule = import ./module.nix defaultPackage;