From 9c8923b5e6d2954661127cef8fc574318b7283c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Apr 2013 00:01:17 +0200 Subject: [PATCH] sqlite: Don't include the last component of the version in the filenames SQLite point releases are conservative, so we don't need to refer to SQLite versions at this level of precision. --- .../libraries/sqlite/{3.7.14.1.nix => 3.7.14.nix} | 0 .../libraries/sqlite/{3.7.16.2.nix => 3.7.16.nix} | 0 pkgs/top-level/all-packages.nix | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/sqlite/{3.7.14.1.nix => 3.7.14.nix} (100%) rename pkgs/development/libraries/sqlite/{3.7.16.2.nix => 3.7.16.nix} (100%) diff --git a/pkgs/development/libraries/sqlite/3.7.14.1.nix b/pkgs/development/libraries/sqlite/3.7.14.nix similarity index 100% rename from pkgs/development/libraries/sqlite/3.7.14.1.nix rename to pkgs/development/libraries/sqlite/3.7.14.nix diff --git a/pkgs/development/libraries/sqlite/3.7.16.2.nix b/pkgs/development/libraries/sqlite/3.7.16.nix similarity index 100% rename from pkgs/development/libraries/sqlite/3.7.16.2.nix rename to pkgs/development/libraries/sqlite/3.7.16.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65359a2d2384..12a78aa1af63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4998,17 +4998,17 @@ let srtp = callPackage ../development/libraries/srtp {}; - sqlite_3_7_16_2 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.2.nix { + sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix { readline = null; ncurses = null; }); - sqlite_3_7_14_1 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.1.nix { + sqlite_3_7_14 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.nix { readline = null; ncurses = null; }); - sqlite = sqlite_3_7_14_1; + sqlite = sqlite_3_7_14; sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses;