andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

nix: Switch to stable rust.

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-04-09 19:07:33 +09:00
parent 978f5114d8
commit 5253f40477
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.lock
View File

@ -50,10 +50,10 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1616670887, "lastModified": 1617755977,
"narHash": "sha256-wn+l9qJfR5sj5Gq4DheJHAcBDfOs9K2p9seW2f35xzs=", "narHash": "sha256-vkYi/Q25f9g2ZISS1IT27S+Vv1WDybdegs5SLsktAHw=",
"path": "/nix/store/54xsxxsx2vmlyfw4q2ads0jv3iayv1lc-source", "path": "/nix/store/3sazzf324zxa6wc2dw1x02dh1v05g4s1-source",
"rev": "c0e881852006b132236cbf0301bd1939bb50867e", "rev": "4cb48cc25622334f17ec6b9bf56e83de0d521fb7",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -63,11 +63,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1617636226, "lastModified": 1617899217,
"narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=", "narHash": "sha256-gd5JHH7IkeoIQ/oiGZSqDpGdGt7DMRJTQ8JiD8+hdOQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde", "rev": "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1617762447, "lastModified": 1617935044,
"narHash": "sha256-bv1e5VRZnSswnVtBH2Nc1omInZSRgASsS8xO+Fg9whc=", "narHash": "sha256-14AECpzqqDaA0gJk/Auo4usKG8PfM4Dr9eDAC/Dm7JM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "08263e3fa955acbcb6612c00d920d45e517b242d", "rev": "5b846f742b2350c175311506e840a29cc0278700",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -13,7 +13,7 @@
let let
pkgs = import nixpkgs { inherit system; overlays = [ rust-overlay.overlay ]; }; pkgs = import nixpkgs { inherit system; overlays = [ rust-overlay.overlay ]; };
naerskLib = pkgs.callPackage naersk { naerskLib = pkgs.callPackage naersk {
inherit (pkgs.rust-bin.nightly.latest) rustc cargo; inherit (pkgs.rust-bin.stable.latest.default) rustc cargo;
}; };
in rec { in rec {
packages.helix = naerskLib.buildPackage { packages.helix = naerskLib.buildPackage {

2
shell.nix
View File

@ -2,7 +2,7 @@
pkgs.mkShell { pkgs.mkShell {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
(rust-bin.nightly.latest.rust.override { extensions = ["rust-src"]; }) (rust-bin.stable.latest.default.override { extensions = ["rust-src"]; })
lld_10 lld_10
stdenv.cc.cc.lib stdenv.cc.cc.lib
# pkg-config # pkg-config