From 2811b032d639684d3983282e9d10d89f37d161d5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 31 Oct 2019 16:50:15 +0000 Subject: treewide: Make still dont* Variables are optional in most cases Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case: - cc-wrapper's `dontlink`, because it already is handled. Also, in nix files escaping was manually added. EMP --- pkgs/development/ruby-modules/gem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/ruby-modules') diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 7b92a586b54..af38160a5fa 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { runHook preUnpack if [[ -f $src && $src == *.gem ]]; then - if [[ -z "$dontBuild" ]]; then + if [[ -z "''${dontBuild-}" ]]; then # we won't know the name of the directory that RubyGems creates, # so we'll just use a glob to find it and move it over. gempkg="$src" -- cgit 1.4.1 From dcfc821c6c4294db933dfee0b7de25d856ff49c2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 11 Nov 2019 23:30:24 +0000 Subject: treewide: Stop using Qt 5.9 --- pkgs/applications/misc/merkaartor/default.nix | 5 +++-- .../version-management/bcompare/default.nix | 2 +- pkgs/development/ruby-modules/gem-config/default.nix | 7 +------ pkgs/tools/graphics/nifskope/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 17 +++++++---------- 5 files changed, 18 insertions(+), 20 deletions(-) (limited to 'pkgs/development/ruby-modules') diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 3023a5b5930..149546e46d2 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj -, qtbase, qtsvg, qtwebkit }: +, qtbase, qtsvg, qtwebview, qtwebkit }: stdenv.mkDerivation rec { pname = "merkaartor"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; - buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; + buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; enableParallelBuilding = true; @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://merkaartor.be/; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; + broken = true; # Does not build with qt >= 5.12 }; } diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 8f862af0a28..d8a6ec05844 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qt511, qtbase, stdenv, runtimeShell }: +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: stdenv.mkDerivation rec { pname = "bcompare"; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index d8c3d484f43..18e24d5a31e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,7 +21,7 @@ , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi , cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl -, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem +, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk @@ -70,11 +70,6 @@ in buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; }; - capybara-webkit = attrs: { - buildInputs = [ qt59.qtbase qt59.qtwebkit ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - }; - charlock_holmes = attrs: { buildInputs = [ which icu zlib ]; }; diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 0e545fbfab9..90716d04a75 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook, fetchpatch }: stdenv.mkDerivation { pname = "nifskope"; @@ -18,6 +18,11 @@ stdenv.mkDerivation { src = ./qttools-bins.patch; qttools = "${qttools.dev}/bin"; }) + (fetchpatch { + name = "qt512-build-fix.patch"; + url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch"; + sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj"; + }) ]; buildInputs = [ qtbase qttools libGLU.dev ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be48819fe15..8a03c1ee550 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5213,7 +5213,7 @@ in niff = callPackage ../tools/package-management/niff { }; - nifskope = libsForQt59.callPackage ../tools/graphics/nifskope { }; + nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { }; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; @@ -9853,7 +9853,7 @@ in funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = libsForQt59.callPackage ../development/tools/misc/gede { }; + gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -13482,10 +13482,7 @@ in python-qt = callPackage ../development/libraries/python-qt { python = python27; - qmake = qt59.qmake; - qttools = qt59.qttools; - qtwebengine = qt59.qtwebengine; - qtxmlpatterns = qt59.qtxmlpatterns; + inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; @@ -18164,7 +18161,7 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt59.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { python = python27; }; @@ -19853,7 +19850,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { gdal = gdal_2; # https://github.com/openstreetmap/merkaartor/issues/179 }; @@ -20562,7 +20559,7 @@ in gtksharp = gtk-sharp-2_0; }; - plex-media-player = libsForQt59.callPackage ../applications/video/plex-media-player { }; + plex-media-player = libsForQt5.callPackage ../applications/video/plex-media-player { }; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); @@ -22462,7 +22459,7 @@ in chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt59.callPackage ../games/chessx { }; + chessx = libsForQt5.callPackage ../games/chessx { }; chiaki = libsForQt5.callPackage ../games/chiaki { }; -- cgit 1.4.1 From 114a83c2ef8d46493cc3115e7a4445f92321a8d4 Mon Sep 17 00:00:00 2001 From: Americo Date: Thu, 28 Nov 2019 07:03:27 -0800 Subject: solargraph: 0.37.2 -> 0.38.0 (#74362) --- .../ruby-modules/solargraph/Gemfile.lock | 16 +++++------ .../development/ruby-modules/solargraph/gemset.nix | 32 +++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'pkgs/development/ruby-modules') diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index edd946d9285..c2e4840eab0 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -3,18 +3,18 @@ GEM specs: ast (2.4.0) backport (1.1.2) - htmlentities (4.3.4) - jaro_winkler (1.5.3) + jaro_winkler (1.5.4) + maruku (0.7.3) mini_portile2 (2.4.0) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) - parallel (1.18.0) + parallel (1.19.1) parser (2.6.5.0) ast (~> 2.4.0) rainbow (3.0.0) reverse_markdown (1.3.0) nokogiri - rubocop (0.75.1) + rubocop (0.77.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -22,11 +22,11 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) - solargraph (0.37.2) + solargraph (0.38.0) backport (~> 1.1) bundler (>= 1.17.2) - htmlentities (~> 4.3, >= 4.3.4) jaro_winkler (~> 1.5) + maruku (~> 0.7, >= 0.7.3) nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) reverse_markdown (~> 1.0, >= 1.0.5) @@ -46,4 +46,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index aa28f666e5a..e1ea15fb4e1 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -19,25 +19,25 @@ }; version = "1.1.2"; }; - htmlentities = { + jaro_winkler = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; type = "gem"; }; - version = "4.3.4"; + version = "1.5.4"; }; - jaro_winkler = { + maruku = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf"; + sha256 = "1r7bxpgnx2hp3g12bjrmdrpv663dfqxsdp0af69kjhxmaxpia56x"; type = "gem"; }; - version = "1.5.3"; + version = "0.7.3"; }; mini_portile2 = { groups = ["default"]; @@ -55,20 +55,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; + sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; type = "gem"; }; - version = "1.10.4"; + version = "1.10.5"; }; parallel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "091p5zrzzyg3fg48jhdz9lzjf2r9r3akra2cd46yd4nza3xgxshz"; + sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; type = "gem"; }; - version = "1.18.0"; + version = "1.19.1"; }; parser = { dependencies = ["ast"]; @@ -108,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5q1i7776yklkcwwx6ibm2mwnjky6wv7rpa3xhn8448854is31n"; + sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9"; type = "gem"; }; - version = "0.75.1"; + version = "0.77.0"; }; ruby-progressbar = { groups = ["default"]; @@ -124,15 +124,15 @@ version = "1.10.1"; }; solargraph = { - dependencies = ["backport" "htmlentities" "jaro_winkler" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w20g68i6djc2vyx3awzvn15brdfpcwbna27r0903h5djcmnr8a0"; + sha256 = "1pdqpxvjj6r6gzrz9rmxfg85cmfjs4y2lyq8p5qfg3kfpqx4rhpw"; type = "gem"; }; - version = "0.37.2"; + version = "0.38.0"; }; thor = { groups = ["default"]; @@ -174,4 +174,4 @@ }; version = "0.9.20"; }; -} +} \ No newline at end of file -- cgit 1.4.1 From c4aaab4053ab092530fdeede394499f9e709b833 Mon Sep 17 00:00:00 2001 From: buckley310 Date: Mon, 9 Dec 2019 19:07:19 -0500 Subject: defaultGemConfig: change 'infocmp' reference from 'ncurses.dev' to 'ncurses' (#75309) --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/ruby-modules') diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 18e24d5a31e..de9d06f7ce0 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -536,7 +536,7 @@ in dontBuild = false; postPatch = '' substituteInPlace lib/rbreadline.rb \ - --replace 'infocmp' '${ncurses.dev}/bin/infocmp' + --replace 'infocmp' '${ncurses}/bin/infocmp' ''; }; -- cgit 1.4.1 From 62e680cdcf40da86b1f47e7f59a2716820ff1e3c Mon Sep 17 00:00:00 2001 From: Burke Libbey Date: Mon, 16 Dec 2019 17:50:56 -0500 Subject: ruby-modules: parse build_flags correctly: In building a gem whose native extension is a Rakefile, the previous version of this code will call essentially `rake ""`, when it means to call `rake`. This change converts `""` into `[]` rather than `[""]`. --- pkgs/development/ruby-modules/gem/nix-bundle-install.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/development/ruby-modules') diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 142d2da9bee..0d501bd9add 100644 --- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -5,6 +5,7 @@ require 'rubygems/command' require 'fileutils' require 'pathname' require 'tmpdir' +require 'shellwords' if defined?(Encoding.default_internal) Encoding.default_internal = Encoding::UTF_8 @@ -31,7 +32,7 @@ bin_dir = File.join(ENV["out"], "bin") type = ARGV[0] name = ARGV[1] version = ARGV[2] -build_flags = ARGV[3] +build_flags = Shellwords.split(ARGV[3]) if type == "git" uri = ARGV[4] REPO = ARGV[5] @@ -117,7 +118,7 @@ else source = Bundler::Source::Path.new(options) end spec = source.specs.search_all(name).first -Bundler.rubygems.with_build_args [build_flags] do +Bundler.rubygems.with_build_args build_flags do source.install(spec) end -- cgit 1.4.1