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: 2760b2446242
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dac633fc37bf
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on May 27, 2018

  1. Revert "sqlite{,-analyzer}: use the same src (#40945)" 

    This reverts commit e28a586.
    @dtzWill
    dtzWill committed May 27, 2018
    1
    Copy the full SHA
    232bc96 View commit details

  2. Merge pull request #41128 from dtzWill/fix/sqlite-build-opts 

    Revert "sqlite{,-analyzer}: use the same src (#40945)"
    @lukateras
    lukateras authored May 27, 2018
    Copy the full SHA
    dac633f View commit details
Showing with 36 additions and 24 deletions.
  1. +15 −3 pkgs/development/libraries/sqlite/analyzer.nix
  2. +11 −0 pkgs/development/libraries/sqlite/archive-version.nix
  3. +10 −21 pkgs/development/libraries/sqlite/default.nix
18 changes: 15 additions & 3 deletions pkgs/development/libraries/sqlite/analyzer.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
{ stdenv, tcl, sqlite }:
{ stdenv, fetchurl, unzip, sqlite, tcl }:

let
archiveVersion = import ./archive-version.nix stdenv.lib;
in

stdenv.mkDerivation rec {
name = "sqlite-analyzer-${version}";
inherit (sqlite) src version;
version = "3.23.1";

src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
};

nativeBuildInputs = [ unzip ];
buildInputs = [ tcl ];

nativeBuildInputs = [ tcl ];
makeFlags = [ "sqlite3_analyzer" ];

installPhase = "install -Dt $out/bin sqlite3_analyzer";

meta = with stdenv.lib; {
11 changes: 11 additions & 0 deletions pkgs/development/libraries/sqlite/archive-version.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
lib: version:

with lib;

let
fragments = splitString "." version;
major = head fragments;
minor = concatMapStrings (fixedWidthNumber 2) (tail fragments);
in

major + minor + "00"
31 changes: 10 additions & 21 deletions pkgs/development/libraries/sqlite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,29 @@
{ stdenv, fetchzip, tcl, zlib, interactive ? false, readline ? null, ncurses ? null }:
{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:

assert interactive -> readline != null && ncurses != null;

with stdenv.lib;

let
archiveVersion = version:
let
segments = splitString "." version;
major = head segments;
minor = concatMapStrings (fixedWidthNumber 2) (tail segments);
in
major + minor + "00";
archiveVersion = import ./archive-version.nix stdenv.lib;
in

stdenv.mkDerivation rec {
name = "sqlite-${version}";
version = "3.23.1";

src = fetchzip {
url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
sha256 = "1dshxmiqdiympg1i2jsz3x543zmcgzhn78lpsjc0546rir0s0zk0";
# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j";
};

outputs = [ "bin" "dev" "out" ];
separateDebugInfo = stdenv.isLinux;

nativeBuildInputs = [ tcl ];
buildInputs = [ zlib ]
++ optionals interactive [ readline ncurses ];
buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ];

configureFlags = [
# Disables libtclsqlite.so, tcl is still required for the build itself:
"--disable-tcl"
"--enable-threadsafe"
] ++ optional interactive "--enable-readline";
configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";

NIX_CFLAGS_COMPILE = [
"-DSQLITE_ENABLE_COLUMN_METADATA"
@@ -72,9 +61,9 @@ stdenv.mkDerivation rec {
# Necessary for FTS5 on Linux
export NIX_LDFLAGS="$NIX_LDFLAGS -lm"
echo
echo ""
echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"
echo
echo ""
'';

meta = {