Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-09-28 00:01:31 +00:00 committed by GitHub
commit 2be25e103b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 496 additions and 325 deletions

@ -68,7 +68,7 @@ luautf8,,,,,,pstn
luazip,,,,,,
lua-yajl,,,,,,pstn
luuid,,,,,,
luv,,,,1.30.0-0,,
luv,,,,1.42.0-0,,
lyaml,,,,,,lblasc
markdown,,,,,,
mediator_lua,,,,,,

1 name src ref server version luaversion maintainers
68 luazip
69 lua-yajl pstn
70 luuid
71 luv 1.30.0-0 1.42.0-0
72 lyaml lblasc
73 markdown
74 mediator_lua

@ -59,6 +59,9 @@ stdenv.mkDerivation rec {
libpulseaudio
];
# https://github.com/xou816/spot/issues/313
mesonBuildType = "release";
postPatch = ''
chmod +x build-aux/cargo.sh
patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py

@ -32,13 +32,13 @@ let
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi";
sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk";
};
patches = [

@ -1,9 +1,42 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos
, xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex
, libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
, protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport
, qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }:
with lib;
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, cmake
, ninja
, flex
, bison
, proj
, geos
, xlibsWrapper
, sqlite
, gsl
, qwt
, fcgi
, python3Packages
, libspatialindex
, libspatialite
, postgresql
, txt2tags
, openssl
, libzip
, hdf5
, netcdf
, exiv2
, protobuf
, qtbase
, qtsensors
, qca-qt5
, qtkeychain
, qscintilla
, qtserialport
, qtxmlpatterns
, withGrass ? true
, grass
, withWebKit ? true
, qtwebkit
}:
let
pythonBuildInputs = with python3Packages; [
qscintilla-qt5
@ -25,8 +58,7 @@ let
];
in mkDerivation rec {
version = "3.16.10";
pname = "qgis";
name = "${pname}-unwrapped-${version}";
pname = "qgis-unwrapped";
src = fetchFromGitHub {
owner = "qgis";
@ -35,6 +67,13 @@ in mkDerivation rec {
sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30=";
};
patches = [
(fetchpatch {
url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch";
sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy";
})
];
passthru = {
inherit pythonBuildInputs;
inherit python3Packages;

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :
{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } :
stdenv.mkDerivation rec {
pname = "osm2xmap";
@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
makeFlags = [
"GIT_VERSION=${version}"
"GIT_TIMESTAMP="
"SHAREDIR=${placeholder "out"}/share/osm2xmap"
"SHAREDIR=${placeholder "out"}/share/osm2xmap/"
"INSTALL_BINDIR=${placeholder "out"}/bin"
"INSTALL_MANDIR=${placeholder "out"}/share/man/man1"
];
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
buildInputs = [ libroxml proj libyamlcpp boost ];
buildInputs = [ libroxml proj_7 libyamlcpp boost ];
meta = with lib; {
homepage = "https://github.com/sembruk/osm2xmap";

@ -6,7 +6,7 @@
, wxGTK30-gtk3
, wxmac
, ffmpeg
, proj
, proj_7
, perl532
, unscii
, python
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ];
buildInputs = [
libGL libGLU ffmpeg proj
libGL libGLU ffmpeg proj_7
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
wxmac Carbon Cocoa
] ++ lib.optionals stdenv.hostPlatform.isLinux [

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }:
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }:
stdenv.mkDerivation rec {
version = "1.2.6.1";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];
buildInputs = [ bzip2 qtbase libnova proj_7 openjpeg libpng ];
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ]
++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];

@ -1,31 +1,69 @@
{ lib, stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal
, proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }:
{ lib
, mkDerivation
, fetchurl
, cmake
, doxygen
, graphviz
, boost
, cgal_5
, gdal
, glew
, gmp
, libGL
, libGLU
, mpfr
, proj
, python3
, qtxmlpatterns
, qwt
}:
stdenv.mkDerivation rec {
let
python = python3.withPackages (ps: with ps; [
numpy
]);
boost' = boost.override {
enablePython = true;
inherit python;
};
cgal = cgal_5.override {
boost = boost';
};
in mkDerivation rec {
pname = "gplates";
version = "2.2.0";
version = "2.3.0";
src = fetchurl {
url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2";
sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b";
name = "gplates_${version}_src.tar.bz2";
url = "https://www.earthbyte.org/download/8421/?uid=b89bb31428";
sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2
doxygen graphviz gmp mpfr
(boost.override {
enablePython = true;
python = python2;
})
nativeBuildInputs = [
cmake
doxygen
graphviz
];
NIX_CFLAGS_LINK="-ldl -lpthread -lutil";
buildInputs = [
boost'
cgal
gdal
glew
gmp
libGL
libGLU
mpfr
proj
python
qtxmlpatterns
qwt
];
meta = with lib; {
description = "Desktop software for the interactive visualisation of plate-tectonics";
homepage = "https://www.gplates.org";
license = licenses.gpl2;
license = licenses.gpl2Only;
platforms = platforms.all;
};
}

@ -1,10 +1,10 @@
{ lib
, fetchFromGitHub
, crystal_0_33
, crystal_1_0
}:
let
crystal = crystal_0_33;
crystal = crystal_1_0;
in crystal.buildCrystalPackage rec {
pname = "thicket";

@ -2,7 +2,7 @@
ameba = {
owner = "veelenga";
repo = "ameba";
rev = "v0.10.0";
sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912";
rev = "v0.14.3";
sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1";
};
}

@ -10,7 +10,7 @@
, format ? "make"
, installManPages ? true
# Specify binaries to build in the form { foo.src = "src/foo.cr"; }
# The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; }
# The default `crystal build` options can be overridden with { foo.options = [ "--optionname" ]; }
, crystalBinaries ? { }
, ...
}@args:
@ -32,8 +32,7 @@ let
})
(import shardsFile));
# we previously had --no-debug here but that is not recommended by upstream
defaultOptions = [ "--release" "--progress" "--verbose" ];
defaultOptions = [ "--release" "--progress" "--verbose" "--no-debug" ];
buildDirectly = shardsFile == null || crystalBinaries != { };
@ -120,7 +119,7 @@ stdenv.mkDerivation (mkDerivationArgs // {
installCheckPhase = args.installCheckPhase or ''
for f in $out/bin/*; do
$f --help
$f --help > /dev/null
done
'';

@ -56,6 +56,7 @@ let
buildCommand = ''
mkdir -p $out
tar --strip-components=1 -C $out -xf ${src}
patchShebangs $out/bin/crystal
'';
};
@ -93,6 +94,10 @@ let
outputs = [ "out" "lib" "bin" ];
postPatch = ''
export TMP=$(mktemp -d)
export HOME=$TMP
mkdir -p $HOME/test
# Add dependency of crystal to docs to avoid issue on flag changes between releases
# https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782
substituteInPlace Makefile \
@ -103,39 +108,35 @@ let
ln -sf spec/compiler spec/std
# Dirty fix for when no sandboxing is enabled
rm -rf /tmp/crystal
mkdir -p /tmp/crystal
mkdir -p $TMP/crystal
substituteInPlace spec/std/file_spec.cr \
--replace '/bin/ls' '${coreutils}/bin/ls' \
--replace '/usr/share' '/tmp/crystal' \
--replace '/usr' '/tmp'
--replace '/usr/share' "$TMP/crystal" \
--replace '/usr' "$TMP" \
--replace '/tmp' "$TMP"
substituteInPlace spec/std/process_spec.cr \
--replace '/bin/cat' '${coreutils}/bin/cat' \
--replace '/bin/ls' '${coreutils}/bin/ls' \
--replace '/usr/bin/env' '${coreutils}/bin/env' \
--replace '"env"' '"${coreutils}/bin/env"' \
--replace '"/usr"' '"/tmp"'
substituteInPlace spec/std/socket/tcp_server_spec.cr \
--replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'
--replace '/usr' "$TMP" \
--replace '/tmp' "$TMP"
substituteInPlace spec/std/system_spec.cr \
--replace '`hostname`' '`${hostname}/bin/hostname`'
# See https://github.com/crystal-lang/crystal/pull/8640
substituteInPlace spec/std/http/cookie_spec.cr \
--replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'
# See https://github.com/crystal-lang/crystal/issues/8629
substituteInPlace spec/std/socket/udp_socket_spec.cr \
--replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'
'';
# See https://github.com/crystal-lang/crystal/pull/8699
substituteInPlace spec/std/xml/xml_spec.cr \
--replace 'it "handles errors"' 'pending "handles errors"'
# Defaults are 4
preBuild = ''
export CRYSTAL_WORKERS=$NIX_BUILD_CORES
export threads=$NIX_BUILD_CORES
export CRYSTAL_CACHE_DIR=$TMP
'';
buildInputs = commonBuildInputs extraBuildInputs;
@ -197,9 +198,6 @@ let
checkTarget = "compiler_spec";
preCheck = ''
export HOME=/tmp
mkdir -p $HOME/test
export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
export PATH=${lib.makeBinPath checkInputs}:$PATH
'';
@ -214,60 +212,26 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
platforms = builtins.attrNames archs;
# Error running at_exit handler: Nil assertion failed
broken = lib.versions.minor version == "32" && stdenv.isDarwin;
broken = lib.versionOlder version "0.36.1" && stdenv.isDarwin;
};
})
);
in
rec {
binaryCrystal_0_31 = genericBinary {
version = "0.31.1";
binaryCrystal_0_36 = genericBinary {
version = "0.36.1";
sha256s = {
x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih";
i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr";
x86_64-darwin = "1dgxgv0s3swkc5cwawzgpbc6bcd2nx4hjxc7iw2h907y1vgmbipz";
x86_64-linux = "065vzq34g7hgzl2mrzy9gwwsfikc78nj7xxsbrk67r6rz0a7bk1q";
i686-linux = "18m4b1lnd682i5ygbg6cljqjny60nn2mlrzrk765h2ip6fljqbm1";
x86_64-darwin = "0xggayk92zh64pb5sz77n12hkcd1hg8kw90z7gb18594q551sf1v";
};
};
crystal_0_31 = generic {
version = "0.31.1";
sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8";
doCheck = false; # 5 checks are failing now
binary = binaryCrystal_0_31;
};
crystal_0_32 = generic {
version = "0.32.1";
sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6";
binary = crystal_0_31;
};
crystal_0_33 = generic {
version = "0.33.0";
sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi";
binary = crystal_0_32;
};
crystal_0_34 = generic {
version = "0.34.0";
sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4";
binary = crystal_0_33;
};
crystal_0_35 = generic {
version = "0.35.1";
sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69";
binary = crystal_0_34;
# Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789
extraBuildInputs = [ git ];
};
crystal_0_36 = generic {
version = "0.36.1";
sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk=";
binary = crystal_0_35;
binary = binaryCrystal_0_36;
};
crystal_1_0 = generic {

@ -82,66 +82,25 @@ let
# configured trees)
luarocks_config = "luarocks-config.lua";
luarocks_content = let
extraVariablesStr = lib.concatStringsSep "\n "
(lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables);
in ''
local_cache = ""
-- To prevent collisions when creating environments, we install the rock
-- files into per-package subdirectories
rocks_subdir = '${rocksSubdir}'
-- Then we need to tell luarocks where to find the rock files per
-- dependency
rocks_trees = {
${lib.concatStringsSep "\n, " rocksTrees}
}
'' + lib.optionalString lua.pkgs.isLuaJIT ''
-- Luajit provides some additional functionality built-in; this exposes
-- that to luarock's dependency system
rocks_provided = {
jit='${lua.luaversion}-1';
ffi='${lua.luaversion}-1';
luaffi='${lua.luaversion}-1';
bit='${lua.luaversion}-1';
}
'' + ''
-- For single-output external dependencies
external_deps_dirs = {
${lib.concatStringsSep "\n, " externalDepsDirs}
}
variables = {
-- Some needed machinery to handle multiple-output external dependencies,
-- as per https://github.com/luarocks/luarocks/issues/766
${lib.optionalString (lib.length depVariables > 0) ''
${lib.concatStringsSep "\n " depVariables}''}
${extraVariablesStr}
}
${extraConfig}
'';
generatedConfig = lua.pkgs.lib.generateLuarocksConfig {
inherit externalDeps;
inherit extraVariables;
inherit rocksSubdir;
inherit requiredLuaRocks;
};
in
''
${generatedConfig}
${extraConfig}
'';
rocksSubdir = "${attrs.pname}-${version}-rocks";
externalDepsDirs = map
(x: "'${builtins.toString x}'")
(lib.filter (lib.isDerivation) externalDeps);
rocksTrees = lib.imap0
(i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }")
requiredLuaRocks;
# Filter out the lua derivation itself from the Lua module dependency
# closure, as it doesn't have a rock tree :)
requiredLuaRocks = lib.filter (d: d ? luaModule)
(lua.pkgs.requiredLuaModules propagatedBuildInputs);
# Explicitly point luarocks to the relevant locations for multiple-output
# derivations that are external dependencies, to work around an issue it has
# (https://github.com/luarocks/luarocks/issues/766)
depVariables = lib.concatMap ({name, dep}: [
"${name}_INCDIR='${lib.getDev dep}/include';"
"${name}_LIBDIR='${lib.getLib dep}/lib';"
"${name}_BINDIR='${lib.getBin dep}/bin';"
]) externalDeps';
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
in

@ -0,0 +1,27 @@
# Hooks for building lua packages.
{ lua
, lib
, makeSetupHook
, findutils
, runCommand
}:
let
callPackage = lua.pkgs.callPackage;
luaInterpreter = lua.interpreter;
in {
lua-setup-hook = LuaPathSearchPaths: LuaCPathSearchPaths:
let
hook = ./setup-hook.sh;
in runCommand "lua-setup-hook.sh" {
# hum doesn't seem to like caps !! BUG ?
luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths;
luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths;
} ''
cp ${hook} hook.sh
substituteAllInPlace hook.sh
mv hook.sh $out
'';
}

@ -1,15 +0,0 @@
{ runCommand, lib, }:
LuaPathSearchPaths: LuaCPathSearchPaths:
let
hook = ./setup-hook.sh;
in runCommand "lua-setup-hook.sh" {
# hum doesn't seem to like caps !! BUG ?
luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths;
luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths;
} ''
cp ${hook} hook.sh
substituteAllInPlace hook.sh
mv hook.sh $out
''

@ -96,5 +96,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ hrdinka ];
license = licenses.lgpl21;
platforms = platforms.all;
# https://github.com/mapnik/mapnik/issues/4232
broken = lib.versionAtLeast proj.version "8.0.0";
};
}

@ -0,0 +1,58 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, sqlite
, libtiff
, curl
, gtest
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "proj";
version = "7.2.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "PROJ";
rev = version;
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
};
patches = [
(fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557
name = "gie_self_tests-fail.diff"; # included in >= 8.0.1
url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
})
];
postPatch = lib.optionalString (version == "7.2.1") ''
substituteInPlace CMakeLists.txt \
--replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"
'';
outputs = [ "out" "dev"];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ sqlite libtiff curl ];
checkInputs = [ gtest ];
cmakeFlags = [
"-DUSE_EXTERNAL_GTEST=ON"
];
doCheck = true;
meta = with lib; {
description = "Cartographic Projections Library";
homepage = "https://proj4.org";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ vbgl dotlambda ];
};
}

@ -7,33 +7,19 @@
, libtiff
, curl
, gtest
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "proj";
version = "7.2.1";
version = "8.1.1";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "PROJ";
rev = version;
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w=";
};
patches = [
(fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557
name = "gie_self_tests-fail.diff"; # included in >= 8.0.1
url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
})
];
postPatch = lib.optionalString (version == "7.2.1") ''
substituteInPlace CMakeLists.txt \
--replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"
'';
outputs = [ "out" "dev"];
nativeBuildInputs = [ cmake pkg-config ];
@ -44,17 +30,14 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DUSE_EXTERNAL_GTEST=ON"
"-DRUN_NETWORK_DEPENDENT_TESTS=OFF"
];
doCheck = stdenv.is64bit;
preCheck = ''
export HOME=$TMPDIR
'';
doCheck = true;
meta = with lib; {
description = "Cartographic Projections Library";
homepage = "https://proj4.org";
homepage = "https://proj.org/";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ vbgl dotlambda ];

@ -23,6 +23,7 @@ alt-getopt = buildLuarocksPackage {
"date": "2017-01-06T13:50:55+03:00",
"path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt",
"sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -50,6 +51,7 @@ argparse = buildLuarocksPackage {
"date": "2020-07-08T11:17:50+10:00",
"path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse",
"sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -119,6 +121,7 @@ bit32 = buildLuarocksPackage {
"date": "2015-02-17T10:44:04+01:00",
"path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2",
"sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -171,7 +174,8 @@ cassowary = buildLuarocksPackage {
"date": "2021-07-19T14:37:34+03:00",
"path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua",
"sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq",
"fetchSubmodules": false,
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
@ -179,10 +183,6 @@ cassowary = buildLuarocksPackage {
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua penlight ];
checkInputs = [ busted ];
# Avoid circular dependency issue with busted / penlight, see:
# https://github.com/NixOS/nixpkgs/pull/136453/files#r700982255
doCheck = false;
meta = {
homepage = "https://github.com/sile-typesetter/cassowary.lua";
@ -196,7 +196,7 @@ compat53 = buildLuarocksPackage {
pname = "compat53";
version = "0.7-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/compat53-0.7-1.rockspec";
url = "https://luafr.org/luarocks/compat53-0.7-1.rockspec";
sha256 = "1r7a3q1cjrcmdycrv2ikgl83irjhxs53sa88v2fdpr9aaamlb101";
}).outPath;
src = fetchurl {
@ -228,6 +228,7 @@ cosmo = buildLuarocksPackage {
"date": "2016-06-17T05:39:58-07:00",
"path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo",
"sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -257,6 +258,7 @@ coxpcall = buildLuarocksPackage {
"date": "2018-02-26T19:53:11-03:00",
"path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall",
"sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -304,6 +306,7 @@ cyrussasl = buildLuarocksPackage {
"date": "2015-08-21T18:24:54-04:00",
"path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl",
"sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -326,10 +329,11 @@ digestif = buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/astoff/digestif",
"rev": "3a9076f76d8121526adcdbb9303d04dd3c721a34",
"date": "2021-06-24T16:18:41+02:00",
"path": "/nix/store/alzrvcxdmdfqqmm0diaxfljyr3jz1zk3-digestif",
"sha256": "110vsqyyp2pvn6nk492a9r56iyzymy0w1f2hvx26pv5x01mxm20x",
"rev": "9f8f299cf7094d72edbd32a455869751246028b7",
"date": "2021-09-25T14:32:42+02:00",
"path": "/nix/store/ln1zx9cw2b7q4x5vzd6hv5nd01c1gsy3-digestif",
"sha256": "1cf14m03jvfs1mwaywfgv759jh0ha3pxrnyj7jxjxlsj6cim89v0",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -395,10 +399,11 @@ gitsigns-nvim = buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lewis6991/gitsigns.nvim",
"rev": "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3",
"date": "2021-08-29T23:08:52+01:00",
"path": "/nix/store/4685c871dzh0kqf3fs5iqmaysag4m9nx-gitsigns.nvim",
"sha256": "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p",
"rev": "7e5c1a831f555dc398dd1564489e2b8a5c867754",
"date": "2021-09-25T16:49:34+01:00",
"path": "/nix/store/a1h8xxb9w4kvvmq7q30m1ny2pq3zbmin-gitsigns.nvim",
"sha256": "02kssw0lpprf9k3il6gfd00gj9fbjbksipa4f6xqkgfdq5c9l9fr",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -419,7 +424,7 @@ http = buildLuarocksPackage {
pname = "http";
version = "0.3-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/http-0.3-0.rockspec";
url = "https://luafr.org/luarocks/http-0.3-0.rockspec";
sha256 = "0fn3irkf5nnmfc83alc40b316hs8l7zdq2xlaiaa65sjd8acfvia";
}).outPath;
src = fetchurl {
@ -442,7 +447,7 @@ inspect = buildLuarocksPackage {
pname = "inspect";
version = "3.1.1-0";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.rockspec";
url = "https://luarocks.org/inspect-3.1.1-0.rockspec";
sha256 = "00spibq2h4an8v0204vr1hny4vv6za720c37ipsahpjk198ayf1p";
}).outPath;
src = fetchurl {
@ -473,6 +478,7 @@ ldbus = buildLuarocksPackage {
"date": "2019-08-16T14:26:05+10:00",
"path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus",
"sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -499,6 +505,7 @@ ldoc = buildLuarocksPackage {
"date": "2021-06-24T13:07:51+02:00",
"path": "/nix/store/pzk1qi4fdviz2pq5bg3q91jmrg8wziqx-LDoc",
"sha256": "05wd5m5v3gv777kgikj46216slxyf1zdbzl4idara9lcfw3mfyyw",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -527,6 +534,7 @@ lgi = buildLuarocksPackage {
"date": "2017-10-09T20:55:55+02:00",
"path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi",
"sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -655,7 +663,7 @@ lpty = buildLuarocksPackage {
pname = "lpty";
version = "1.2.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lpty-1.2.2-1.rockspec";
url = "https://luafr.org/luarocks/lpty-1.2.2-1.rockspec";
sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg";
}).outPath;
src = fetchurl {
@ -677,7 +685,7 @@ lrexlib-gnu = buildLuarocksPackage {
pname = "lrexlib-gnu";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lrexlib-gnu-2.9.1-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.1-1.rockspec";
sha256 = "1jfjxh26iwsavipkwmscwv52l77qxzvibfmlvpskcpawyii7xcw8";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -686,6 +694,7 @@ lrexlib-gnu = buildLuarocksPackage {
"date": "2020-08-07T12:10:29+03:00",
"path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib",
"sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -715,6 +724,7 @@ lrexlib-pcre = buildLuarocksPackage {
"date": "2020-08-07T12:10:29+03:00",
"path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib",
"sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -736,7 +746,7 @@ lrexlib-posix = buildLuarocksPackage {
pname = "lrexlib-posix";
version = "2.9.1-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.1-1.rockspec";
url = "https://luafr.org/luarocks/lrexlib-posix-2.9.1-1.rockspec";
sha256 = "1zxrx9yifm9ry4wbjgv86rlvq3ff6qivldvib3ha4767azla0j0r";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -745,6 +755,7 @@ lrexlib-posix = buildLuarocksPackage {
"date": "2020-08-07T12:10:29+03:00",
"path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib",
"sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -774,6 +785,7 @@ lua-cjson = buildLuarocksPackage {
"date": "2018-04-19T12:03:43-07:00",
"path": "/nix/store/qdpqx2g0xi1c9fknzxx280mcdq6fi8rw-lua-cjson",
"sha256": "0i2sjsi6flax1k0bm647yijgmc02jznq9bn88mj71pgii79pfjhw",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -803,6 +815,7 @@ lua-cmsgpack = buildLuarocksPackage {
"date": "2015-06-03T08:39:04+02:00",
"path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack",
"sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -854,6 +867,7 @@ lua-lsp = buildLuarocksPackage {
"date": "2020-10-17T15:07:11-04:00",
"path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp",
"sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -905,6 +919,7 @@ lua-resty-http = buildLuarocksPackage {
"date": "2021-04-09T17:11:35+01:00",
"path": "/nix/store/zzd1xj4r0iy3srs2hgv4mlm6wflmk24x-lua-resty-http",
"sha256": "1whwn2fwm8c9jda4z1sb5636sfy4pfgjdxw0grcgmf6451xi57nw",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -934,6 +949,7 @@ lua-resty-jwt = buildLuarocksPackage {
"date": "2021-01-20T16:53:57-05:00",
"path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt",
"sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -954,7 +970,7 @@ lua-resty-openidc = buildLuarocksPackage {
pname = "lua-resty-openidc";
version = "1.7.4-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-resty-openidc-1.7.4-1.rockspec";
url = "https://luarocks.org/lua-resty-openidc-1.7.4-1.rockspec";
sha256 = "12r03pzx1lpaxzy71iqh0kf1zs6gx1k89vpxc5va9r7nr47a56vy";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -963,6 +979,7 @@ lua-resty-openidc = buildLuarocksPackage {
"date": "2020-11-17T17:42:16+01:00",
"path": "/nix/store/240kss5xx1br5n3qz6djw21cs1fj4pfg-lua-resty-openidc",
"sha256": "1gw71av1r0c6v4f1h0bj0l6way2hmipic6wmipnavr17bz7m1q7z",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -981,17 +998,18 @@ lua-resty-openidc = buildLuarocksPackage {
lua-resty-openssl = buildLuarocksPackage {
pname = "lua-resty-openssl";
version = "0.7.4-1";
version = "0.7.5-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-resty-openssl-0.7.4-1.rockspec";
sha256 = "1h87nc8rnay2h0hcc9rylkdzrssibjs6whyim53k647wqkm3fslm";
url = "https://luafr.org/luarocks/lua-resty-openssl-0.7.5-1.rockspec";
sha256 = "13v14in9cgmjgarmy6br9629ns1qlhw7a30c061y6gncjannnv6y";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/fffonion/lua-resty-openssl.git",
"rev": "5b113a6059e63dbcf7c6fa95a149a9381b904219",
"date": "2021-08-02T18:09:14+08:00",
"path": "/nix/store/qk6fcp5hwqsm4mday34l1mdkx0ba76bx-lua-resty-openssl",
"sha256": "1iar6znh0i45zkx03n8vrkwhx732158hmxfmfjgbpv547mh30ly6",
"rev": "6a7f4a1649da7e0499b542b73c61e8dbdf91f57e",
"date": "2021-09-18T06:15:54+08:00",
"path": "/nix/store/01bninsbgix30zl97lk0p10ycqkc37kx-lua-resty-openssl",
"sha256": "1ypji678lna9z3a48lhxs7wrw8d1prln7yfvqfm96lbmfvr5wfxw",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1019,6 +1037,7 @@ lua-resty-session = buildLuarocksPackage {
"date": "2021-01-04T14:02:41+02:00",
"path": "/nix/store/jqc8arr46mx1xbmrsw503zza1kmz7mcv-lua-resty-session",
"sha256": "09q8xbxkr431i2k21vdyx740rv325v0zmnx0qa3q9x15kcfsd2fm",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1068,6 +1087,7 @@ lua-toml = buildLuarocksPackage {
"date": "2017-12-08T16:30:50-08:00",
"path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml",
"sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1097,6 +1117,7 @@ lua-yajl = buildLuarocksPackage {
"date": "2020-11-12T06:22:23-08:00",
"path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl",
"sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1118,7 +1139,7 @@ lua-zlib = buildLuarocksPackage {
pname = "lua-zlib";
version = "1.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/lua-zlib-1.2-1.rockspec";
url = "https://luafr.org/luarocks/lua-zlib-1.2-1.rockspec";
sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1127,6 +1148,7 @@ lua-zlib = buildLuarocksPackage {
"date": "2017-10-07T08:26:37-07:00",
"path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib",
"sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1173,6 +1195,7 @@ luabitop = buildLuarocksPackage {
"date": "2021-08-30T10:14:03+02:00",
"path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop",
"sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1202,6 +1225,7 @@ luacheck = buildLuarocksPackage {
"date": "2020-08-20T19:21:52-03:00",
"path": "/nix/store/8r4x8snxp0kjabn9bsxwh62pfczd8wma-luacheck",
"sha256": "08jsqibksdvpl6mvf8d6rlh5pii78hqm3fkhbkgzrs6k8kk5a7lf",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1222,7 +1246,7 @@ luacov = buildLuarocksPackage {
pname = "luacov";
version = "0.15.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luacov-0.15.0-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luacov-0.15.0-1.rockspec";
sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1231,6 +1255,7 @@ luacov = buildLuarocksPackage {
"date": "2021-02-15T18:47:58-03:00",
"path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov",
"sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1260,6 +1285,7 @@ luadbi = buildLuarocksPackage {
"date": "2019-01-14T09:39:17+00:00",
"path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi",
"sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1280,7 +1306,7 @@ luadbi-mysql = buildLuarocksPackage {
pname = "luadbi-mysql";
version = "0.7.2-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luadbi-mysql-0.7.2-1.rockspec";
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.2-1.rockspec";
sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1289,6 +1315,7 @@ luadbi-mysql = buildLuarocksPackage {
"date": "2019-01-14T09:39:17+00:00",
"path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi",
"sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1318,6 +1345,7 @@ luadbi-postgresql = buildLuarocksPackage {
"date": "2019-01-14T09:39:17+00:00",
"path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi",
"sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1347,6 +1375,7 @@ luadbi-sqlite3 = buildLuarocksPackage {
"date": "2019-01-14T09:39:17+00:00",
"path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi",
"sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1367,7 +1396,7 @@ luaepnf = buildLuarocksPackage {
pname = "luaepnf";
version = "0.3-2";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaepnf-0.3-2.rockspec";
url = "https://luafr.org/luarocks/luaepnf-0.3-2.rockspec";
sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa";
}).outPath;
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
@ -1376,6 +1405,7 @@ luaepnf = buildLuarocksPackage {
"date": "2015-01-15T16:54:10+01:00",
"path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf",
"sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1450,6 +1480,7 @@ luaffi = buildLuarocksPackage {
"date": "2021-03-01T11:46:30-05:00",
"path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb",
"sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1479,6 +1510,7 @@ luafilesystem = buildLuarocksPackage {
"date": "2017-09-15T20:07:33-03:00",
"path": "/nix/store/20xm4942kvnb8kypg76jl7zrym5cz03c-luafilesystem",
"sha256": "0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1509,6 +1541,7 @@ lualogging = buildLuarocksPackage {
"date": "2021-08-12T19:29:39+02:00",
"path": "/nix/store/q1v28n04hh3r7aw37cxakzksfa3kw5qa-lualogging",
"sha256": "0nj0ik91lgl9rwgizdkn7vy9brddsz1kxfn70c01x861vaxi63iz",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1603,6 +1636,7 @@ luasec = buildLuarocksPackage {
"date": "2021-08-14T10:28:09-03:00",
"path": "/nix/store/jk2npg54asnmj5fnpldn8dxym9gx8x4g-luasec",
"sha256": "14hx72qw3gjgz12v5bwpz3irgbf69f8584z8y7lglccbyydp4jla",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1655,6 +1689,7 @@ luasql-sqlite3 = buildLuarocksPackage {
"date": "2021-08-27T15:17:22-03:00",
"path": "/nix/store/2374agarn72cnlnk2vripfy1zz2y50la-luasql",
"sha256": "13xs1g67d2p69x4wzxk1h97xh25388h0kkh9bjgw3l1yss9zlxhx",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1720,7 +1755,7 @@ luautf8 = buildLuarocksPackage {
pname = "luautf8";
version = "0.1.3-1";
knownRockspec = (fetchurl {
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luautf8-0.1.3-1.rockspec";
url = "https://luarocks.org/luautf8-0.1.3-1.rockspec";
sha256 = "16i9wfgd0f299g1afgjp0hhczlrk5g8i0kq3ka0f8bwj3mp2wmcp";
}).outPath;
src = fetchurl {
@ -1752,6 +1787,7 @@ luazip = buildLuarocksPackage {
"date": "2017-09-05T14:02:52+03:00",
"path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip",
"sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1792,14 +1828,14 @@ luuid = buildLuarocksPackage {
luv = buildLuarocksPackage {
pname = "luv";
version = "1.30.0-0";
version = "1.42.0-0";
knownRockspec = (fetchurl {
url = "https://luarocks.org/luv-1.30.0-0.rockspec";
sha256 = "05j231z6vpfjbxxmsizbigrsr80bk2dg48fcz12isj668lhia32h";
url = "https://luarocks.org/luv-1.42.0-0.rockspec";
sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09";
}).outPath;
src = fetchurl {
url = "https://github.com/luvit/luv/releases/download/1.30.0-0/luv-1.30.0-0.tar.gz";
sha256 = "1vxmxgdjk2bdnm8d9n3z5lfg6x34cx97j5nh8camm6ps5c0mmisw";
url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz";
sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm";
};
disabled = (luaOlder "5.1");
@ -1848,6 +1884,7 @@ markdown = buildLuarocksPackage {
"date": "2015-09-27T17:49:28+03:00",
"path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown",
"sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1899,6 +1936,7 @@ moonscript = buildLuarocksPackage {
"date": "2021-03-18T11:51:52-07:00",
"path": "/nix/store/xijbk0bgjpxjgmvscbqnghj4r3zdzgxl-moonscript",
"sha256": "14xx6pij0djblfv3g2hi0xlljh7h0yrbb03f4x90q5j66v693gx7",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -1957,18 +1995,16 @@ nvim-client = buildLuarocksPackage {
penlight = buildLuarocksPackage {
pname = "penlight";
version = "1.11.0-1";
knownRockspec = (fetchurl {
url = "https://luarocks.org/penlight-1.11.0-1.rockspec";
sha256 = "1sjhnywvamyi9fadhra5pw2an1rhy2hk2byfxmr3n5wi0xrqv004";
}).outPath;
version = "dev-1";
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/lunarmodules/penlight.git",
"rev": "e3712f00fae09a166dd62540b677600165d5bcd7",
"date": "2021-08-18T21:37:47+02:00",
"path": "/nix/store/i70ndw8qhvcm828ifb3vyj08y22xp0ka-penlight",
"sha256": "19n9xqkb4hlak0k7hamk4ixwjvyxslsnyh1zjazdzrl8n736xhkl",
"fetchSubmodules": false,
"rev": "0653cdb05591454a9804a7fee8c873b8f06b0b8f",
"date": "2021-08-31T23:42:29+02:00",
"path": "/nix/store/zf3k6z36bxsrbxkkmsa4w6m7vxvlpfgn-penlight",
"sha256": "0l1819dyr9hzmimnjjg99fad6k3ksmlm77hgvdybgz8558lj4g1i",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
}
@ -1976,7 +2012,7 @@ penlight = buildLuarocksPackage {
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua luafilesystem ];
checkInputs = [ busted ];
checkInputs = [ busted busted ];
doCheck = false;
meta = {
@ -1993,10 +2029,11 @@ plenary-nvim = buildLuarocksPackage {
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
"url": "https://github.com/nvim-lua/plenary.nvim",
"rev": "15c3cb9e6311dc1a875eacb9fc8df69ca48d7402",
"date": "2021-08-19T19:04:12+02:00",
"path": "/nix/store/fjj6gs1yc9gw3qh3xabf7mra4dlyac5a-plenary.nvim",
"sha256": "0gdysws82vdcyfsfpkpg9wqw223vg6hh74pf821wxh8p6qg3r26m",
"rev": "8c6cc07a68b65eb707be44598f0084647d495978",
"date": "2021-09-26T16:13:25+02:00",
"path": "/nix/store/j8hmr48blm4brq8rqv7b9m08vmalg8sp-plenary.nvim",
"sha256": "05h5n7jj33y9vs6gc8hqlfd628j6i33s3c8fmfl6ahxwfygx2wpd",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -2023,6 +2060,7 @@ rapidjson = buildLuarocksPackage {
"date": "2021-04-09T19:59:20+08:00",
"path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson",
"sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -2090,6 +2128,7 @@ std-_debug = buildLuarocksPackage {
"date": "2020-04-15T16:34:01-07:00",
"path": "/nix/store/rgbn0nn7glm7s52d90ds87j10bx20nij-_debug",
"sha256": "0p6jz6syh2r8qfk08jf2hp4p902rkamjzpzl8xhkpzf8rdzs937w",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -2116,6 +2155,7 @@ std-normalize = buildLuarocksPackage {
"date": "2020-04-15T17:16:16-07:00",
"path": "/nix/store/jr4agcn13fk56b8105p6yr9gn767fkds-normalize",
"sha256": "0jiykdjxc4b5my12fnzrw3bxracjgxc265xrn8kfx95350kvbzl1",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false
@ -2165,6 +2205,7 @@ vstruct = buildLuarocksPackage {
"date": "2020-05-06T23:13:06-04:00",
"path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct",
"sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57",
"fetchLFS": false,
"fetchSubmodules": true,
"deepClone": false,
"leaveDotGit": false

@ -60,4 +60,72 @@ rec {
requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs;
};
});
/* generate luarocks config
generateLuarocksConfig {
externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl; } ];
rocksSubdir = "subdir";
};
*/
generateLuarocksConfig = {
externalDeps
, requiredLuaRocks
, extraVariables ? {}
, rocksSubdir
}: let
rocksTrees = lib.imap0
(i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }")
requiredLuaRocks;
# Explicitly point luarocks to the relevant locations for multiple-output
# derivations that are external dependencies, to work around an issue it has
# (https://github.com/luarocks/luarocks/issues/766)
depVariables = lib.concatMap ({name, dep}: [
"${name}_INCDIR='${lib.getDev dep}/include';"
"${name}_LIBDIR='${lib.getLib dep}/lib';"
"${name}_BINDIR='${lib.getBin dep}/bin';"
]) externalDeps';
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
externalDepsDirs = map
(x: "'${builtins.toString x}'")
(lib.filter (lib.isDerivation) externalDeps);
extraVariablesStr = lib.concatStringsSep "\n "
(lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables);
in ''
local_cache = ""
-- To prevent collisions when creating environments, we install the rock
-- files into per-package subdirectories
rocks_subdir = '${rocksSubdir}'
-- Then we need to tell luarocks where to find the rock files per
-- dependency
rocks_trees = {
${lib.concatStringsSep "\n, " rocksTrees}
}
'' + lib.optionalString lua.pkgs.isLuaJIT ''
-- Luajit provides some additional functionality built-in; this exposes
-- that to luarock's dependency system
rocks_provided = {
jit='${lua.luaversion}-1';
ffi='${lua.luaversion}-1';
luaffi='${lua.luaversion}-1';
bit='${lua.luaversion}-1';
}
'' + ''
-- For single-output external dependencies
external_deps_dirs = {
${lib.concatStringsSep "\n, " externalDepsDirs}
}
variables = {
-- Some needed machinery to handle multiple-output external dependencies,
-- as per https://github.com/luarocks/luarocks/issues/766
${lib.optionalString (lib.length depVariables > 0) ''
${lib.concatStringsSep "\n " depVariables}''}
${extraVariablesStr}
}
'';
}

@ -300,7 +300,7 @@ with super;
preBuild = self.luv.preBuild + ''
sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
'';
nativeBuildInputs = [ pkgs.fixDarwinDylibNames ];

@ -8,14 +8,21 @@
buildPythonPackage rec {
pname = "cartopy";
version = "0.19.0.post1";
version = "0.20.0";
src = fetchPypi {
inherit version;
pname = "Cartopy";
sha256 = "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb";
sha256 = "eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a";
};
postPatch = ''
# https://github.com/SciTools/cartopy/issues/1880
substituteInPlace lib/cartopy/tests/test_crs.py \
--replace "test_osgb(" "dont_test_osgb(" \
--replace "test_epsg(" "dont_test_epsg("
'';
buildInputs = [
geos proj
];

@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder
, pandas, shapely, fiona, pyproj
, pytestCheckHook, Rtree }:
@ -14,6 +14,19 @@ buildPythonPackage rec {
sha256 = "sha256-58X562OkRzZ4UTNMTwXW4U5czoa5tbSMBCcE90DqbaE=";
};
patches = [
(fetchpatch {
name = "skip-pandas-master-fillna-test.patch";
url = "https://github.com/geopandas/geopandas/pull/1878.patch";
sha256 = "1yw3i4dbhaq7f02n329b9y2cqxbwlz9db81mhgrfc7af3whwysdb";
})
(fetchpatch {
name = "fix-proj4strings-test.patch";
url = "https://github.com/geopandas/geopandas/pull/1958.patch";
sha256 = "0kzmpq5ry87yvhqr6gnh9p2606b06d3ynzjvw0hpp9fncczpc2yn";
})
];
propagatedBuildInputs = [
pandas
shapely

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.18.47";
version = "1.18.48";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0687354a1970a157f293ff57f8b38379497b606643633912cc28f76e0333b301";
sha256 = "a14917021aac10432887b2acb634be8d66401ffb87cdb0fc271aff867929538c";
};
propagatedBuildInputs = [

@ -1,19 +1,21 @@
diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py
--- a/pyproj/datadir.py 2021-04-10 18:26:52.829018483 +0100
+++ b/pyproj/datadir.py 2021-04-10 18:44:59.155190614 +0100
@@ -70,7 +70,7 @@
diff --git a/pyproj/datadir.py b/pyproj/datadir.py
index 9ca1d25..4198490 100644
--- a/pyproj/datadir.py
+++ b/pyproj/datadir.py
@@ -70,7 +70,7 @@ def get_data_dir() -> str:
global _VALIDATED_PROJ_DATA
if _VALIDATED_PROJ_DATA is not None:
return _VALIDATED_PROJ_DATA
global _USER_PROJ_DATA
- internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
+ internal_datadir = Path("@proj@/share/proj")
proj_lib_dirs = os.environ.get("PROJ_LIB", "")
prefix_datadir = Path(sys.prefix, "share", "proj")
diff -Nur a/setup.py b/setup.py
--- a/setup.py 2021-04-10 18:26:52.817018512 +0100
+++ b/setup.py 2021-04-10 18:46:01.652324424 +0100
@@ -11,7 +11,7 @@
diff --git a/setup.py b/setup.py
index 6bb0c6c..b3d0321 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ from setuptools import Extension, setup
PROJ_MIN_VERSION = parse_version("7.2.0")
CURRENT_FILE_PATH = Path(__file__).absolute().parent
BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
@ -22,7 +24,7 @@ diff -Nur a/setup.py b/setup.py
def get_proj_version(proj_dir: Path) -> str:
@@ -150,7 +150,7 @@
@@ -155,7 +155,7 @@ def get_extension_modules():
# By default we'll try to get options PROJ_DIR or the local version of proj
proj_dir = get_proj_dir()
library_dirs = get_proj_libdirs(proj_dir)
@ -31,21 +33,11 @@ diff -Nur a/setup.py b/setup.py
proj_version = get_proj_version(proj_dir)
check_proj_version(proj_version)
diff -Nur a/test/conftest.py b/test/conftest.py
--- a/test/conftest.py 2021-04-10 18:26:52.831018478 +0100
+++ b/test/conftest.py 2021-04-10 18:37:01.605682432 +0100
@@ -2,6 +2,7 @@
from contextlib import contextmanager
from distutils.version import LooseVersion
from pathlib import Path
+import stat
import pyproj
from pyproj.datadir import get_data_dir, get_user_data_dir, set_data_dir
diff -Nur a/test/test_cli.py b/test/test_cli.py
--- a/test/test_cli.py 2021-04-10 18:26:52.831018478 +0100
+++ b/test/test_cli.py 2021-04-10 22:17:04.665088162 +0100
@@ -14,7 +14,7 @@
diff --git a/test/test_cli.py b/test/test_cli.py
index 7a696de..1b9b777 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson
from test.conftest import grids_available, proj_env, tmp_chdir
PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyproj";
version = "3.1.0";
version = "3.2.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pyproj4";
repo = "pyproj";
rev = version;
sha256 = "sha256-UN8cJk5Lgd+d2tKmFuF6QvKr36w1435RKovzGfMXi1E=";
sha256 = "sha256-r343TvXpSr+EMAbvzSUpsfipwP8TFmitOfT0gjgoO00=";
};
# force pyproj to use ${proj}

@ -1,7 +1,6 @@
{ lib
, fetchFromGitHub
, crystal_0_34
, crystal_0_36
, crystal_1_0
}:
let
generic =
@ -36,18 +35,12 @@ let
in
rec {
# needed for anything that requires the old v1 shards format
shards_0_11 = generic {
version = "0.11.1";
sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71";
crystal = crystal_0_34;
};
shards_0_14 = generic {
version = "0.14.1";
shards_0_15 = generic {
version = "0.15.0";
sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU=";
crystal = crystal_0_36;
crystal = crystal_1_0;
};
shards = shards_0_14;
shards = shards_0_15;
}

@ -106,7 +106,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
postInstall = let
links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";
in ''
in lib.optionalString supportFlags.embedInstallers ''
mkdir -p $out/share/wine/gecko $out/share/wine/mono/
${lib.strings.concatStringsSep "\n"
((map (links "share/wine/gecko") geckos)

@ -45,6 +45,7 @@
faudioSupport ? false,
vkd3dSupport ? false,
mingwSupport ? wineRelease != "stable",
embedInstallers ? false # The Mono and Gecko MSI installers
}:
let wine-build = build: release:
@ -57,7 +58,7 @@ let wine-build = build: release:
gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport
vkd3dSupport mingwSupport;
vkd3dSupport mingwSupport embedInstallers;
};
});

@ -1,21 +1,21 @@
{
"4.14": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.247-hardened1.patch",
"sha256": "0k3ii26ry0cszxs5n4ljll61p1kdi3dn5cvzjr8zb78bfrk7lbra",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.247-hardened1/linux-hardened-4.14.247-hardened1.patch"
"name": "linux-hardened-4.14.248-hardened1.patch",
"sha256": "1lwqlpd21f8rwqfyz61083w0lg2bjzdjf7rzrqxsw1jz0l879035",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.248-hardened1/linux-hardened-4.14.248-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.207-hardened1.patch",
"sha256": "1yn6c8axvnmck1ignw4k3pi458x0m2qm7g5vjwf2rw8cnzskrs48",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.207-hardened1/linux-hardened-4.19.207-hardened1.patch"
"name": "linux-hardened-4.19.208-hardened1.patch",
"sha256": "0bg45n1kgd628gwjkp1vxslxyci6589ygy9mmmhpl7kj3y7370ck",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.208-hardened1/linux-hardened-4.19.208-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.68-hardened1.patch",
"sha256": "11cn72lzgc6vcbx4xbdvfxrfwy3hfn7sqjxf5laqw9jdhacnlhvn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.68-hardened1/linux-hardened-5.10.68-hardened1.patch"
"name": "linux-hardened-5.10.69-hardened1.patch",
"sha256": "11frhnprvxnqxm8yn1kay2jv2i473i9glnvsjnqz6kj8f0q2gl4v",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.69-hardened1/linux-hardened-5.10.69-hardened1.patch"
},
"5.13": {
"extra": "-hardened1",
@ -25,14 +25,14 @@
},
"5.14": {
"extra": "-hardened1",
"name": "linux-hardened-5.14.7-hardened1.patch",
"sha256": "18i0qxhzga2vg0kal5ifsks0vra6gj21q6whcjry9sglxandn2vg",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.7-hardened1/linux-hardened-5.14.7-hardened1.patch"
"name": "linux-hardened-5.14.8-hardened1.patch",
"sha256": "1kg02ixyd2dbk97iz28g26k1nnxi96s0bcyr90wc7diylhf7kz4a",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.8-hardened1/linux-hardened-5.14.8-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.148-hardened1.patch",
"sha256": "0kb2d9csm8bbjark2ii0n1jpfcr6avdr8r5g97awzbg9jxkfs0j4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.148-hardened1/linux-hardened-5.4.148-hardened1.patch"
"name": "linux-hardened-5.4.149-hardened1.patch",
"sha256": "1v21dz66ngsdsdcld23rgmidz955x74al5nsxnvwasc5gh18ahh9",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.149-hardened1/linux-hardened-5.4.149-hardened1.patch"
}
}

@ -11123,9 +11123,6 @@ with pkgs;
inherit (callPackages ../development/compilers/crystal {
llvmPackages = llvmPackages_10;
})
crystal_0_33
crystal_0_34
crystal_0_35
crystal_0_36
crystal_1_0
crystal;
@ -14726,8 +14723,7 @@ with pkgs;
shallot = callPackage ../tools/misc/shallot { };
inherit (callPackage ../development/tools/build-managers/shards { })
shards_0_11
shards_0_14
shards_0_15
shards;
shellcheck = callPackage ../development/tools/shellcheck {};
@ -18552,6 +18548,8 @@ with pkgs;
proj = callPackage ../development/libraries/proj { };
proj_7 = callPackage ../development/libraries/proj/7.nix { };
proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { };
proselint = callPackage ../tools/text/proselint {
@ -26971,7 +26969,14 @@ with pkgs;
qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };
qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {};
qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {
gdal = gdal.override {
libgeotiff = libgeotiff.override { proj = proj_7; };
libspatialite = libspatialite.override { proj = proj_7; };
proj = proj_7;
};
proj = proj_7;
};
garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};
@ -31135,10 +31140,7 @@ with pkgs;
gildas = callPackage ../applications/science/astronomy/gildas { };
gplates = callPackage ../applications/science/misc/gplates {
boost = boost160;
cgal = cgal.override { boost = boost160; };
};
gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
gravit = callPackage ../applications/science/astronomy/gravit { };

@ -12,18 +12,12 @@
, fetchFromGitHub, which, writeText
, pkgs
, lib
}:
}@args:
let
packages = ( self:
let
# a function of lua_path / lua_cpath
lua-setup-hook = callPackage ../development/interpreters/lua-5/setup-hook.nix {
inherit lib;
};
callPackage = pkgs.newScope self;
buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args );
@ -52,11 +46,13 @@ in
# helper functions for dealing with LUA_PATH and LUA_CPATH
lib = luaLib;
getLuaPath = drv: luaLib.getPath drv (luaLib.luaPathList lua.luaversion) ;
getLuaCPath = drv: luaLib.getPath drv (luaLib.luaCPathList lua.luaversion) ;
getLuaPath = drv: getPath drv (luaLib.luaPathList lua.luaversion) ;
getLuaCPath = drv: getPath drv (luaLib.luaCPathList lua.luaversion) ;
inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib;})
lua-setup-hook;
inherit lua lua-setup-hook callPackage;
inherit lua callPackage;
inherit buildLuaPackage buildLuarocksPackage buildLuaApplication;
inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT
requiredLuaModules toLuaModule hasLuaModule;

@ -47,6 +47,7 @@ rec {
ldapSupport = true;
faudioSupport = true;
vkd3dSupport = true;
embedInstallers = true;
};
stable = base.override { wineRelease = "stable"; };