Skip to content

Commit 6958f6f

Browse files
committed
Update flake
1 parent d4789e8 commit 6958f6f

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

flake.nix

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,15 @@
1313
outputs = { self, nixpkgs, flake-utils, nixpkgs-ruby }:
1414
flake-utils.lib.eachDefaultSystem (system:
1515
let
16-
pkgs = import nixpkgs {
17-
inherit system;
18-
overlays = [ nixpkgs-ruby.overlays.default ];
19-
};
16+
pkgs = nixpkgs.legacyPackages.${system};
2017
lib = pkgs.lib;
2118

2219
isLinux = pkgs.stdenv.isLinux;
2320

24-
rubyVersion = lib.strings.trim (builtins.readFile ./.ruby-version);
25-
rubyMajorMinor = lib.versions.majorMinor rubyVersion;
26-
rubyAttr = "ruby-${rubyVersion}";
27-
rubyFallbackAttr = "ruby-${rubyMajorMinor}";
28-
rubyPkg =
29-
if builtins.hasAttr rubyAttr pkgs
30-
then pkgs.${rubyAttr}
31-
else pkgs.${rubyFallbackAttr};
21+
rubyPkg = nixpkgs-ruby.lib.packageFromRubyVersionFile {
22+
file = ./.ruby-version;
23+
inherit system;
24+
};
3225

3326
python-with-packages = pkgs.python3.withPackages (ps: with ps; [
3427
huggingface-hub
@@ -58,7 +51,6 @@
5851
bundleWrapped
5952

6053
rubyPkg
61-
pkgs.rubocop
6254

6355
python-with-packages
6456
pkgs.pipenv
@@ -75,6 +67,7 @@
7567
BUNDLE_DISABLE_SHARED_GEMS = "true";
7668

7769
shellHook = ''
70+
export PATH="${rubyPkg}/bin:$PATH"
7871
export PATH="$PWD/.bundle/bin:$PATH"
7972
'';
8073
};

gliner.gemspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ Gem::Specification.new do |spec|
1616
spec.files = Dir.glob('lib/**/*') + Dir.glob('bin/*') + %w[README.md LICENSE gliner.gemspec]
1717
spec.require_paths = ['lib']
1818

19+
spec.add_dependency 'httpx', '~> 1.0'
1920
spec.add_dependency 'onnxruntime', '~> 0.10'
2021
spec.add_dependency 'tokenizers', '~> 0.6'
21-
spec.add_dependency 'httpx', '~> 1.0'
2222

2323
spec.add_development_dependency 'rake', '~> 13.0'
2424
spec.add_development_dependency 'rspec', '~> 3.13'
2525
spec.add_development_dependency 'rubocop', '~> 1.50'
26+
27+
spec.metadata['rubygems_mfa_required'] = 'true'
2628
end

0 commit comments

Comments
 (0)