From 3ffb0472abe2f2c287baab75fb7d6743f2aa6bcc Mon Sep 17 00:00:00 2001 From: xenofem Date: Sun, 20 Nov 2022 10:18:38 -0500 Subject: [PATCH] fix gems --- Gemfile.lock | 6 ++++-- flake.lock | 6 +++--- flake.nix | 10 ---------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4edb196..b30e5e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,6 +36,7 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) + mini_portile2 (2.8.0) netrc (0.11.0) opus-ruby (1.0.1) ffi @@ -64,7 +65,8 @@ GEM rubocop-ast (1.21.0) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) - sqlite3 (1.5.0-x86_64-linux) + sqlite3 (1.5.0) + mini_portile2 (~> 2.8.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) @@ -75,7 +77,7 @@ GEM websocket PLATFORMS - x86_64-linux + ruby DEPENDENCIES dicebag! diff --git a/flake.lock b/flake.lock index 2477b7a..c61fa3a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1658557357, - "narHash": "sha256-0gqNef6skYQKJSS2vLojxrXOrc72zoX5VTDKUqEo6Gk=", + "lastModified": 1668765800, + "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42ca9bef09e780eabe84328dd1b730cef978f098", + "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index df6b046..44d08fd 100644 --- a/flake.nix +++ b/flake.nix @@ -17,16 +17,6 @@ lockfile = ./Gemfile.lock; gemset = ./gemset.nix; ignoreCollisions = true; - gemConfig = pkgs.defaultGemConfig // { - sqlite3 = attrs: { - nativeBuildInputs = [ pkgs.pkg-config pkgs.sqlite.dev ]; - buildInputs = [ pkgs.sqlite.out ]; - buildFlags = [ - "--enable-system-libraries" - "--with-pkg-config=${pkgs.pkg-config}/bin/pkg-config" - ]; - }; - }; }; in rec { packages.x86_64-linux = rec {