diff options
author | Vikram Narayanan <vikram186@gmail.com> | 2021-11-26 20:30:55 -0800 |
---|---|---|
committer | Vikram Narayanan <vikram186@gmail.com> | 2021-11-27 17:39:47 -0800 |
commit | b35726542e8cf68512e87fbd23eb22778f977f22 (patch) | |
tree | 6f9c4377fb6040eb907b7f9c949766df9aec4fae /pkgs/tools/typesetting | |
parent | 9c191ebcdfe917043195c54ab6ae8e934434fe7b (diff) | |
download | nixpkgs-b35726542e8cf68512e87fbd23eb22778f977f22.tar nixpkgs-b35726542e8cf68512e87fbd23eb22778f977f22.tar.gz nixpkgs-b35726542e8cf68512e87fbd23eb22778f977f22.tar.bz2 nixpkgs-b35726542e8cf68512e87fbd23eb22778f977f22.tar.lz nixpkgs-b35726542e8cf68512e87fbd23eb22778f977f22.tar.xz nixpkgs-b35726542e8cf68512e87fbd23eb22778f977f22.tar.zst nixpkgs-b35726542e8cf68512e87fbd23eb22778f977f22.zip |
docbookrx: fix build
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/docbookrx/Gemfile | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/docbookrx/Gemfile.lock | 33 | ||||
-rw-r--r-- | pkgs/tools/typesetting/docbookrx/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/typesetting/docbookrx/gemset.nix | 98 |
4 files changed, 123 insertions, 21 deletions
diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile b/pkgs/tools/typesetting/docbookrx/Gemfile index 73fee2920d5..d5290dcb009 100644 --- a/pkgs/tools/typesetting/docbookrx/Gemfile +++ b/pkgs/tools/typesetting/docbookrx/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'nokogiri', '~> 1.8.0' +gem 'nokogiri', '~> 1.11.7' diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile.lock b/pkgs/tools/typesetting/docbookrx/Gemfile.lock index 423fac6c30a..07b58b649f4 100644 --- a/pkgs/tools/typesetting/docbookrx/Gemfile.lock +++ b/pkgs/tools/typesetting/docbookrx/Gemfile.lock @@ -1,15 +1,38 @@ +PATH + remote: . + specs: + docbookrx (1.0.0.dev) + nokogiri (~> 1.11.7) + GEM remote: https://rubygems.org/ specs: - mini_portile2 (2.3.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + diff-lcs (1.4.4) + nokogiri (1.11.7-x86_64-linux) + racc (~> 1.4) + racc (1.6.0) + rake (13.0.6) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.3) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.4) PLATFORMS ruby DEPENDENCIES - nokogiri (~> 1.8.0) + docbookrx! + rake (~> 13.0.0) + rspec (~> 3.9.0) BUNDLED WITH - 2.1.4 + 2.2.24 diff --git a/pkgs/tools/typesetting/docbookrx/default.nix b/pkgs/tools/typesetting/docbookrx/default.nix index a41276ea432..059233d09b0 100644 --- a/pkgs/tools/typesetting/docbookrx/default.nix +++ b/pkgs/tools/typesetting/docbookrx/default.nix @@ -3,7 +3,6 @@ , stdenv , ruby , bundlerEnv -# , libxml2 }: let @@ -13,10 +12,6 @@ let inherit ruby; - # buildInputs = [ - # libxml2 - # ]; - gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; @@ -25,15 +20,15 @@ let in stdenv.mkDerivation { pname = "docbookrx"; - version = "unstable-2018-05-02"; + version = "unstable-2018-05-18"; buildInputs = [ env.wrappedRuby ]; src = fetchFromGitHub { owner = "asciidoctor"; repo = "docbookrx"; - rev = "682d8c2f7a9e1e6f546c5f7d0067353621c68a7a"; - sha256 = "07jilh17gj8xx4ps4ln787izmhv8xwwwv6fkqqg3pwjni5qikx7w"; + rev = "83d1d1235e3bb44506123eda337780a912581cd0"; + sha256 = "sha256-OdPRh7ZIhgM7hs5qPiuxLEUuMEtaXcgZ83M6i6CV6AY="; }; # TODO: I don't know ruby packaging but this does the trick for now diff --git a/pkgs/tools/typesetting/docbookrx/gemset.nix b/pkgs/tools/typesetting/docbookrx/gemset.nix index bd756b996bb..fde67f2d4ee 100644 --- a/pkgs/tools/typesetting/docbookrx/gemset.nix +++ b/pkgs/tools/typesetting/docbookrx/gemset.nix @@ -1,23 +1,107 @@ { - mini_portile2 = { - groups = ["default"]; + diff-lcs = { + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; type = "gem"; }; - version = "2.3.0"; + version = "1.4.4"; + }; + docbookrx = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + path = ./.; + type = "path"; + }; + version = "1.0.0.dev"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "4976a9c9e796527d51dc6c311b9bd93a0233f6a7962a0f569aa5c782461836ef"; + type = "gem"; + }; + version = "1.11.7"; + }; + racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + type = "gem"; + }; + version = "1.6.0"; + }; + rake = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + type = "gem"; + }; + version = "3.9.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8891149l4rdlaz58k1dprc09rhpvq98bblk4qpd3dvcvqklkvh"; + type = "gem"; + }; + version = "3.9.3"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gjqa3h4r8jna8dh22al4f6ks4x6l4knshx2b8jygkd1gk68n92q"; + type = "gem"; + }; + version = "3.9.4"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + type = "gem"; + }; + version = "3.9.1"; + }; + rspec-support = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ig6wk1ln6wy0d6fjlbfwxibps1nidc6111fcnm0jfa1z5nkqczl"; type = "gem"; }; - version = "1.8.5"; + version = "3.9.4"; }; } |