git.iko.soy/helix
on master help sign in
nix: Switch to stable rust.
commit5253f404772ce62256336404b46d6bb9c65e1b10 authorBlaž Hrastnik <blaz@mxxn.io> dateFri 9 Apr 2021, 19:07 (6 years ago) parent978f511
3 files changed+12−12
compare with master
unifiedsplit
flake.lock+10−10 flake.nix+1−1 shell.nix+1−1
flake.lock+10−10
@@ -50,10 +50,10 @@
5050 },
5151 "nixpkgs": {
5252 "locked": {
53− "lastModified": 1616670887,
54− "narHash": "sha256-wn+l9qJfR5sj5Gq4DheJHAcBDfOs9K2p9seW2f35xzs=",
55− "path": "/nix/store/54xsxxsx2vmlyfw4q2ads0jv3iayv1lc-source",
56− "rev": "c0e881852006b132236cbf0301bd1939bb50867e",
53+ "lastModified": 1617755977,
54+ "narHash": "sha256-vkYi/Q25f9g2ZISS1IT27S+Vv1WDybdegs5SLsktAHw=",
55+ "path": "/nix/store/3sazzf324zxa6wc2dw1x02dh1v05g4s1-source",
56+ "rev": "4cb48cc25622334f17ec6b9bf56e83de0d521fb7",
5757 "type": "path"
5858 },
5959 "original": {
@@ -63,11 +63,11 @@
6363 },
6464 "nixpkgs_2": {
6565 "locked": {
66− "lastModified": 1617636226,
67− "narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=",
66+ "lastModified": 1617899217,
67+ "narHash": "sha256-gd5JHH7IkeoIQ/oiGZSqDpGdGt7DMRJTQ8JiD8+hdOQ=",
6868 "owner": "nixos",
6969 "repo": "nixpkgs",
70− "rev": "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde",
70+ "rev": "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2",
7171 "type": "github"
7272 },
7373 "original": {
@@ -106,11 +106,11 @@
106106 "nixpkgs": "nixpkgs_3"
107107 },
108108 "locked": {
109− "lastModified": 1617762447,
110− "narHash": "sha256-bv1e5VRZnSswnVtBH2Nc1omInZSRgASsS8xO+Fg9whc=",
109+ "lastModified": 1617935044,
110+ "narHash": "sha256-14AECpzqqDaA0gJk/Auo4usKG8PfM4Dr9eDAC/Dm7JM=",
111111 "owner": "oxalica",
112112 "repo": "rust-overlay",
113− "rev": "08263e3fa955acbcb6612c00d920d45e517b242d",
113+ "rev": "5b846f742b2350c175311506e840a29cc0278700",
114114 "type": "github"
115115 },
116116 "original": {
flake.nix+1−1
@@ -13,7 +13,7 @@
1313 let
1414 pkgs = import nixpkgs { inherit system; overlays = [ rust-overlay.overlay ]; };
1515 naerskLib = pkgs.callPackage naersk {
16− inherit (pkgs.rust-bin.nightly.latest) rustc cargo;
16+ inherit (pkgs.rust-bin.stable.latest.default) rustc cargo;
1717 };
1818 in rec {
1919 packages.helix = naerskLib.buildPackage {
shell.nix+1−1
@@ -2,7 +2,7 @@
22
33pkgs.mkShell {
44 nativeBuildInputs = with pkgs; [
5− (rust-bin.nightly.latest.rust.override { extensions = ["rust-src"]; })
5+ (rust-bin.stable.latest.default.override { extensions = ["rust-src"]; })
66 lld_10
77 stdenv.cc.cc.lib
88 # pkg-config