diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
| commit | ded9a4b1aa68b8645271a63e9543ef56177ae642 (patch) | |
| tree | d351102a17ab05c6e263e970f43ab3b30561112e /pkgs/development/libraries/sqlite | |
| parent | 98df4f635136e63644cb0ab646b55d60cbb444a4 (diff) | |
| parent | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (diff) | |
| download | nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.gz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.bz2 nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.lz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.xz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.zst nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.zip | |
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
Diffstat (limited to 'pkgs/development/libraries/sqlite')
| -rw-r--r-- | pkgs/development/libraries/sqlite/analyzer.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/sqlite/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/sqlite/sqlar.nix | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 031dd8f4f9c..5b68b4901f9 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { description = "A tool that shows statistics about SQLite databases"; downloadPage = http://sqlite.org/download.html; homepage = http://www.sqlite.org; + license = licenses.publicDomain; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 4fcaef7e0e2..166ea39493b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = http://sqlite.org/download.html; homepage = http://www.sqlite.org/; + license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 734d68ca3d4..e5d322330e8 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sqlite.org/sqlar; description = "SQLite Archive utilities"; + license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; |