Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ocaml-sqlite3: 2.0.9 -> 5.0.1 #77295

Merged
merged 3 commits into from Jan 13, 2020
Merged

ocaml-sqlite3: 2.0.9 -> 5.0.1 #77295

merged 3 commits into from Jan 13, 2020

Conversation

@kazcw
Copy link
Contributor

@kazcw kazcw commented Jan 8, 2020

Motivation for this change

version bump

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-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.
Notify maintainers

cc @Massegi @vbgl

@kazcw kazcw force-pushed the kazcw:ocaml-sqlite3 branch from d4f1992 to 265e51b Jan 8, 2020
Copy link
Contributor

@vbgl vbgl left a comment

This does not build.

Also please remove meta.platforms.

@@ -1,18 +1,16 @@
{ stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }:
{ stdenv, fetchurl, sqlite, ocaml, pkgconfig, dune-configurator, buildDune2Package }:

This comment has been minimized.

@vbgl

vbgl Jan 9, 2020
Contributor

Suggested change
{ stdenv, fetchurl, sqlite, ocaml, pkgconfig, dune-configurator, buildDune2Package }:
{ lib, fetchurl, sqlite, pkgconfig, buildDunePackage }:
stdenv.mkDerivation rec {
pname = "ocaml-sqlite3";
version = "2.0.9";
buildDune2Package rec {

This comment has been minimized.

@vbgl

vbgl Jan 9, 2020
Contributor

Suggested change
buildDune2Package rec {
buildDunePackage rec {
buildInputs = [ ocaml findlib ocamlbuild sqlite ];

createFindlibDestdir = true;
buildInputs = [ dune-configurator ocaml sqlite ];

This comment has been minimized.

@vbgl

vbgl Jan 9, 2020
Contributor

Suggested change
buildInputs = [ dune-configurator ocaml sqlite ];
buildInputs = [ sqlite ];
buildInputs = [ ocaml findlib ocamlbuild sqlite ];

createFindlibDestdir = true;
buildInputs = [ dune-configurator ocaml sqlite ];

meta = with stdenv.lib; {

This comment has been minimized.

@vbgl

vbgl Jan 9, 2020
Contributor

Suggested change
meta = with stdenv.lib; {
meta = with lib; {
@kazcw
Copy link
Contributor Author

@kazcw kazcw commented Jan 9, 2020

My testing methodology has been insufficient to catch the build failure. I've been running nix-shell -I nixpkgs=$NIXGIT ocamlPackages_latest.ocaml_sqlite3, nix-shell -I nixpkgs=$NIXGIT ocamlPackages.ocaml_sqlite3, and depending on it in the .nix for a project that accesses a database using the 5.x api.

@kazcw
Copy link
Contributor Author

@kazcw kazcw commented Jan 9, 2020

I've made the suggested improvements

Co-Authored-By: Vincent Laporte <vbgl@users.noreply.github.com>
@vbgl
vbgl approved these changes Jan 13, 2020
@vbgl vbgl merged commit c4036d5 into NixOS:master Jan 13, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.