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: 73f1ed5f4bf4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fbd7615bb235
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 16, 2021

  1. sqlar: fix build error 

    Disable warnings to be treated as errors, since otherwise the build
would fail with this message:

```
sqlite3.c: In function 'sqlite3SelectNew':
sqlite3.c:116663:10: error: function may return address of local variable [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wreturn-local-addr-Werror=return-local-addr8;;]
116663 |   return pNew;
```
    @nagy
    nagy committed Jan 16, 2021
    Copy the full SHA
    531e121 View commit details

Commits on Jan 17, 2021

  1. Merge pull request #109579 from nagy/sqlar-fix 

    sqlar: fix build error
    @SuperSandro2000
    SuperSandro2000 authored Jan 17, 2021
    Copy the full SHA
    fbd7615 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/libraries/sqlite/sqlar.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/sqlite/sqlar.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ stdenv.mkDerivation {

buildInputs = [ fuse zlib ];

buildFlags = [ "sqlar" "sqlarfs" ];
buildFlags = [ "sqlar" "sqlarfs" "CFLAGS=-Wno-error" ];

installPhase = ''
install -D -t $out/bin sqlar sqlarfs