Update dev tools
This commit is contained in:
parent
0533386d36
commit
24acecdae1
14
flake.lock
generated
14
flake.lock
generated
@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -17,16 +17,16 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1654126564,
|
||||
"narHash": "sha256-sgDXDKGmUG4h7OPDOHyQggFQ08ZqVzUIPi8351yhugY=",
|
||||
"lastModified": 1663270009,
|
||||
"narHash": "sha256-G/vrVz+sw8xXICQdhsJcb26uxp5EarEfkSokvnPQX7A=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f1c9c23aad972787f00f175651e4cb0d7c7fd5ea",
|
||||
"rev": "7ebfa16ca38d0b844f5a11a45c5a47e5b64b7f94",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"ref": "release-22.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
||||
10
flake.nix
10
flake.nix
@ -1,7 +1,7 @@
|
||||
{
|
||||
description = "HashiCorp Vagrant project";
|
||||
|
||||
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
inputs.nixpkgs.url = "github:nixos/nixpkgs/release-22.05";
|
||||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
outputs = { self, nixpkgs, flake-utils }:
|
||||
@ -9,16 +9,14 @@
|
||||
localOverlay = import ./nix/overlay.nix;
|
||||
overlays = [ localOverlay ];
|
||||
in flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system overlays;
|
||||
};
|
||||
let pkgs = import nixpkgs { inherit system overlays; };
|
||||
in {
|
||||
legacyPackages = pkgs;
|
||||
inherit (pkgs) devShell;
|
||||
}) // {
|
||||
# platform independent attrs
|
||||
overlay = final: prev: (nixpkgs.lib.composeManyExtensions overlays) final prev;
|
||||
overlay = final: prev:
|
||||
(nixpkgs.lib.composeManyExtensions overlays) final prev;
|
||||
inherit overlays;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,30 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoconf
|
||||
, autogen
|
||||
, automake
|
||||
, go
|
||||
, go-bindata
|
||||
, go-changelog
|
||||
, go-mockery
|
||||
, go-protobuf
|
||||
, go-protobuf-json
|
||||
, go-tools
|
||||
, grpc-tools
|
||||
, grpcurl
|
||||
, libarchive
|
||||
, libpng
|
||||
, libtool
|
||||
, mkShell
|
||||
, nasm
|
||||
, nodejs-16_x
|
||||
, pkg-config
|
||||
, protobufPin
|
||||
, protoc-gen-doc
|
||||
, protoc-gen-go-grpc
|
||||
, ruby
|
||||
, zlib
|
||||
}:
|
||||
{ lib, stdenv, autoconf, autogen, automake, go, go-bindata, go-changelog
|
||||
, go-mockery, go-protobuf, go-protobuf-json, go-tools, grpc-tools, grpcurl
|
||||
, libarchive, libpng, libtool, mkShell, nasm, nodejs-16_x, pkg-config
|
||||
, protobufPin, protoc-gen-doc, protoc-gen-go-grpc, ruby, sqlite, zlib }:
|
||||
|
||||
mkShell rec {
|
||||
name = "vagrant";
|
||||
@ -70,4 +47,6 @@ mkShell rec {
|
||||
# to use the legacy Vagrant in this repo. See client.initVagrantRubyRuntime
|
||||
PATH=$PWD/binstubs:$PATH
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user