Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 471175e0be6e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 376516f335b3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 6, 2017

  1. sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with Qt 5.9

    @peterhoeg
    peterhoeg committed Nov 6, 2017

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    dd18e06 View commit details

Commits on Nov 7, 2017

  1. Merge pull request #31120 from peterhoeg/f/sqlite 

    sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with Qt 5.9
    @peterhoeg
    peterhoeg authored Nov 7, 2017
    Copy the full SHA
    376516f View commit details
Showing with 18 additions and 11 deletions.
  1. +17 −10 pkgs/development/tools/database/sqlitebrowser/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
27 changes: 17 additions & 10 deletions pkgs/development/tools/database/sqlitebrowser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,39 @@
{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }:
{ mkDerivation, lib, fetchFromGitHub, cmake, antlr
, qtbase, qttools, qscintilla, sqlite }:

mkDerivation rec {
version = "3.10.0";
version = "3.10.1";
name = "sqlitebrowser-${version}";

src = fetchFromGitHub {
repo = "sqlitebrowser";
owner = "sqlitebrowser";
rev = "v${version}";
sha256 = "1fwr7p4b6glc3s0a06i7cg8l9p1mrcm4vyhyf2wi89cyg22rrf5c";
sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar";
};

buildInputs = [ qtbase qttools sqlite ];
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase qscintilla sqlite ];

cmakeFlags = [ "-DUSE_QT5=TRUE" ];
nativeBuildInputs = [ cmake antlr qttools ];

# A regression was introduced in CMakeLists.txt on v3.9.x
# See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755
enableParallelBuilding = true;

# We have to patch out Test and PrintSupport to make this work with Qt 5.9
# It can go when the application supports 5.9
postPatch = ''
substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)'
substituteInPlace CMakeLists.txt \
--replace Test "" \
--replace PrintSupport ""
substituteInPlace libs/qcustomplot-source/CMakeLists.txt \
--replace PrintSupport ""
'';

meta = with lib; {
description = "DB Browser for SQLite";
homepage = http://sqlitebrowser.org/;
license = licenses.gpl3;
maintainers = [ maintainers.matthiasbeyer ];
maintainers = with maintainers; [ matthiasbeyer ];
platforms = platforms.linux; # can only test on linux
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7593,7 +7593,7 @@ with pkgs;
flex = flex_2_5_35;
};

sqlitebrowser = libsForQt56.callPackage ../development/tools/database/sqlitebrowser { };
sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };

sselp = callPackage ../tools/X11/sselp{ };