sqldiff: init at 3.33.0 #69112
Merged
sqldiff: init at 3.33.0 #69112
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bdesham
reviewed
Sep 19, 2019
| @@ -0,0 +1,43 @@ | |||
| { stdenv, fetchurl, unzip, sqlite, tcl }: | |||
There was a problem hiding this comment.
Suggested change
| { stdenv, fetchurl, unzip, sqlite, tcl }: | |
| { stdenv, fetchurl, unzip, sqlite, tcl, Foundation }: |
| }; | ||
|
|
||
| nativeBuildInputs = [ unzip ]; | ||
| buildInputs = [ tcl ]; |
There was a problem hiding this comment.
Suggested change
| buildInputs = [ tcl ]; | |
| buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation; |
pkgs/top-level/all-packages.nix
Outdated
| @@ -13674,7 +13674,9 @@ in | |||
|
|
|||
| sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); | |||
|
|
|||
| sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/analyzer.nix { }); | |||
| sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqlite-analyzer; | |||
There was a problem hiding this comment.
Suggested change
| sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqlite-analyzer; | |
| sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { | |
| inherit (darwin.apple_sdk.frameworks) Foundation; | |
| }).sqlite-analyzer; |
pkgs/top-level/all-packages.nix
Outdated
| sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/analyzer.nix { }); | ||
| sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqlite-analyzer; | ||
|
|
||
| sqldiff = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqldiff; |
There was a problem hiding this comment.
Suggested change
| sqldiff = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { }).sqldiff; | |
| sqldiff = lowPrio (callPackage ../development/libraries/sqlite/tools.nix { | |
| inherit (darwin.apple_sdk.frameworks) Foundation; | |
| }).sqldiff; |
|
Awesome, thanks! I committed it, with you (@bdesham) as author. Can you please verify whether I didn't make any mistakes? |
|
Yep, still works fine! |
|
I don’t remember anything about lowPrio, feel free to remove it
…On Thu 19. Sep 2019 at 20:13, Daniel Schaefer ***@***.***> wrote:
Motivation for this change
It's part of the SQLite tools: https://www.sqlite.org/download.html,
https://www.sqlite.org/sqldiff.html
and can be built from the sources that we already have.
It generates SQL statements that represent the difference of two SQLite
databases.
@pesterhazy <https://github.com/pesterhazy> why did you add lowPrio to
the sqlite-analyzer package?
It's not included in any other derivation, right?
Things done
- Tested using sandboxing (nix.useSandbox
<http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox> on
NixOS, or option sandbox in nix.conf
<http://nixos.org/nix/manual/#sec-conf-file> on non-NixOS)
- Built on platform(s)
- NixOS
- macOS
- other Linux distributions
- Tested via one or more NixOS test(s) if existing and applicable for
the change (look inside nixos/tests
<https://github.com/NixOS/nixpkgs/blob/master/nixos/tests>)
- Tested compilation of all pkgs that depend on this change using nix-shell
-p nix-review --run "nix-review wip"
- Tested execution of all binary files (usually in ./result/bin/)
- Determined the impact on package closure size (by running nix
path-info -S before and after)
- Ensured that relevant documentation is up to date
- Fits CONTRIBUTING.md
<https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md>.
------------------------------
You can view, comment on, or merge this pull request online at:
#69112
Commit Summary
- sqldiff: init at 3.28.0
File Changes
- *D* pkgs/development/libraries/sqlite/analyzer.nix
<https://github.com/NixOS/nixpkgs/pull/69112/files#diff-0> (31)
- *A* pkgs/development/libraries/sqlite/tools.nix
<https://github.com/NixOS/nixpkgs/pull/69112/files#diff-1> (43)
- *M* pkgs/top-level/all-packages.nix
<https://github.com/NixOS/nixpkgs/pull/69112/files#diff-2> (4)
Patch Links:
- https://github.com/NixOS/nixpkgs/pull/69112.patch
- https://github.com/NixOS/nixpkgs/pull/69112.diff
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#69112?email_source=notifications&email_token=AAAZ6WDAQEF3GKWCBCILRUDQKO6MZA5CNFSM4IYONAUKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HMPUJBA>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAAZ6WEESL7FHY4W7XVNQ6LQKO6MZANCNFSM4IYONAUA>
.
|
JohnAZoidberg
force-pushed
the
sqldiff
branch
from
2cf8cb8
to
cb66a8e
Compare
JohnAZoidberg
force-pushed
the
sqldiff
branch
from
cb66a8e
to
5d57ac8
Compare
|
Upated, to bring up to date with sqlite proper. |
10 tasks
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/124 |
|
sadly sqlite was bumped and the assertion fals |
lowPrio dropped, too, because the contents of these derivations don't appear in any others.
|
Pushed and rebased against latest master, with 3.33.0. |
This was referenced Sep 19, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
It's part of the SQLite tools: https://www.sqlite.org/download.html, https://www.sqlite.org/sqldiff.html
and can be built from the sources that we already have.
It generates SQL statements that represent the difference of two SQLite databases.
@pesterhazy why did you add
lowPrioto thesqlite-analyzerpackage?It's not included in any other derivation, right?
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)