JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #136052 from r-burns/fossil

Browse Source 
fossil: 2.15.1 -> 2.16
This commit is contained in:
Guillaume Girol 2021-09-10 19:57:48 +00:00 committed by GitHub
commit 330090f6c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/version-management/fossil/default.nix
View File

@ -15,12 +15,11 @@
stdenv.mkDerivation rec {
pname = "fossil";
version = "2.15.1";
version = "2.16";
src = fetchurl {
url = "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz";
name = "${pname}-${version}.tar.gz";
sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E=";
url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy";
};
nativeBuildInputs = [ installShellFiles tcl tcllib ];

8
pkgs/development/libraries/sqlite/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null
, python3Packages
, enableDeserialize ? false
}:
assert interactive -> readline != null && ncurses != null;
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";
NIX_CFLAGS_COMPILE = toString [
NIX_CFLAGS_COMPILE = toString ([
"-DSQLITE_ENABLE_COLUMN_METADATA"
"-DSQLITE_ENABLE_DBSTAT_VTAB"
"-DSQLITE_ENABLE_JSON1"
@ -48,7 +49,10 @@ stdenv.mkDerivation rec {
"-DSQLITE_SECURE_DELETE"
"-DSQLITE_MAX_VARIABLE_NUMBER=250000"
"-DSQLITE_MAX_EXPR_DEPTH=10000"
];
] ++ lib.optionals enableDeserialize [
# Can be removed in v3.36+, as this will become the default
"-DSQLITE_ENABLE_DESERIALIZE"
]);
# Test for features which may not be available at compile time
preBuild = ''

4
pkgs/top-level/all-packages.nix
View File

@ -24421,7 +24421,9 @@ with pkgs;
foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
fossil = callPackage ../applications/version-management/fossil { };
fossil = callPackage ../applications/version-management/fossil {
sqlite = sqlite.override { enableDeserialize = true; };
};
freebayes = callPackage ../applications/science/biology/freebayes { };