Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
5f05f984a6
|
|
@ -85,7 +85,10 @@ in {
|
|||
b43Firmware_6_30_163_46
|
||||
b43FirmwareCutter
|
||||
xow_dongle-firmware
|
||||
] ++ optional pkgs.stdenv.hostPlatform.isx86 facetimehd-firmware;
|
||||
] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
|
||||
facetimehd-calibration
|
||||
facetimehd-firmware
|
||||
];
|
||||
})
|
||||
(mkIf cfg.wirelessRegulatoryDatabase {
|
||||
hardware.firmware = [ pkgs.wireless-regdb ];
|
||||
|
|
|
|||
|
|
@ -14,6 +14,18 @@ in
|
|||
|
||||
options.hardware.facetimehd.enable = mkEnableOption "facetimehd kernel module";
|
||||
|
||||
options.hardware.facetimehd.withCalibration = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to include sensor calibration files for facetimehd.
|
||||
This makes colors look much better but is experimental, see
|
||||
<link xlink:href="https://github.com/patjak/facetimehd/wiki/Extracting-the-sensor-calibration-files"/>
|
||||
for details.
|
||||
'';
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
boot.kernelModules = [ "facetimehd" ];
|
||||
|
|
@ -22,7 +34,8 @@ in
|
|||
|
||||
boot.extraModulePackages = [ kernelPackages.facetimehd ];
|
||||
|
||||
hardware.firmware = [ pkgs.facetimehd-firmware ];
|
||||
hardware.firmware = [ pkgs.facetimehd-firmware ]
|
||||
++ optional cfg.withCalibration pkgs.facetimehd-calibration;
|
||||
|
||||
# unload module during suspend/hibernate as it crashes the whole system
|
||||
powerManagement.powerDownCommands = ''
|
||||
|
|
|
|||
|
|
@ -193,6 +193,11 @@ in {
|
|||
|
||||
preStart = ''
|
||||
touch ${cfg.configFile}
|
||||
if ! test -e ${cfg.databaseDir}/.erlang.cookie; then
|
||||
touch ${cfg.databaseDir}/.erlang.cookie
|
||||
chmod 600 ${cfg.databaseDir}/.erlang.cookie
|
||||
dd if=/dev/random bs=16 count=1 | base64 > ${cfg.databaseDir}/.erlang.cookie
|
||||
fi
|
||||
'';
|
||||
|
||||
environment = {
|
||||
|
|
@ -204,6 +209,7 @@ in {
|
|||
ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';
|
||||
# 5. the vm.args file
|
||||
COUCHDB_ARGS_FILE=''${cfg.argsFile}'';
|
||||
HOME =''${cfg.databaseDir}'';
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "carla";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "falkTX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A0QmyphjsNU06kh2f9rXrR+GkDEI5HqXRA9J82E6qJU=";
|
||||
sha256 = "sha256-FAQTIM5NpcOhLNMf62qiKaxg6QtK5uIJF/XT6KJVnUc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "cider";
|
||||
version = "1.3.1308";
|
||||
version = "1.4.1.1680";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://1308-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-${version}.AppImage";
|
||||
sha256 = "1lbyvn1c8155p039qfzx7jwad7km073phkmrzjm0w3ahdpwz3wgi";
|
||||
url = "https://github.com/ciderapp/cider-releases/releases/download/v${version}/Cider-${builtins.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}-alpha.${builtins.elemAt (lib.splitVersion version) 3}.AppImage";
|
||||
sha256 = "sha256-hEv+vfMMH+Trwa1UF5R8EtyYeyiRVLP0BrXOK2+1q8M=";
|
||||
};
|
||||
|
||||
extraInstallCommands =
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "texstudio";
|
||||
version = "4.2.2";
|
||||
version = "4.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "${pname}-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-MZz8DQT1f6RU+euEED1bbg2MsaqC6+W3RoMk2qfIjr4=";
|
||||
sha256 = "19z9dx8258qbjyzgskkg0xdn88mvx191y1sz4nk15yxsdyf2z3p8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw
|
||||
, cairo, readline, ffmpeg, makeWrapper, wxGTK30, wxmac, netcdf, blas
|
||||
, cairo, readline, ffmpeg, makeWrapper, wxGTK31, wxmac, netcdf, blas
|
||||
, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, libLAS, proj-datumgrid
|
||||
, zstd, pdal, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grass";
|
||||
version = "7.8.6";
|
||||
version = "8.0.1";
|
||||
|
||||
src = with lib; fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "grass";
|
||||
rev = version;
|
||||
sha256 = "sha256-zvZqFWuxNyA+hu+NMiRbQVdzzrQPsZrdGdfVB17+SbM=";
|
||||
sha256 = "sha256-rcOT21HRJDR+DEYsZn6BjOOhy28DWapz9PN7cRAdWGc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite
|
||||
readline ffmpeg makeWrapper netcdf geos postgresql libmysqlclient blas
|
||||
libLAS proj-datumgrid zstd wrapGAppsHook ]
|
||||
++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK30 ]
|
||||
++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK31 ]
|
||||
++ lib.optional stdenv.isDarwin wxmac
|
||||
++ (with python3Packages; [ python python-dateutil numpy ]
|
||||
++ lib.optional stdenv.isDarwin wxPython_4_0
|
||||
|
|
@ -68,41 +68,15 @@ stdenv.mkDerivation rec {
|
|||
/* Ensures that the python script run at build time are actually executable;
|
||||
* otherwise, patchShebangs ignores them. */
|
||||
postConfigure = ''
|
||||
chmod +x scripts/d.out.file/d.out.file.py \
|
||||
scripts/d.to.rast/d.to.rast.py \
|
||||
scripts/d.what.rast/d.what.rast.py \
|
||||
scripts/d.what.vect/d.what.vect.py \
|
||||
scripts/g.extension/g.extension.py \
|
||||
scripts/g.extension.all/g.extension.all.py \
|
||||
scripts/r.drain/r.drain.py \
|
||||
scripts/r.pack/r.pack.py \
|
||||
scripts/r.import/r.import.py \
|
||||
scripts/r.tileset/r.tileset.py \
|
||||
scripts/r.unpack/r.unpack.py \
|
||||
scripts/v.clip/v.clip.py \
|
||||
scripts/v.rast.stats/v.rast.stats.py \
|
||||
scripts/v.to.lines/v.to.lines.py \
|
||||
scripts/v.what.strds/v.what.strds.py \
|
||||
scripts/v.unpack/v.unpack.py \
|
||||
scripts/wxpyimgview/*.py \
|
||||
gui/wxpython/animation/g.gui.animation.py \
|
||||
gui/wxpython/datacatalog/g.gui.datacatalog.py \
|
||||
gui/wxpython/rlisetup/g.gui.rlisetup.py \
|
||||
gui/wxpython/vdigit/g.gui.vdigit.py \
|
||||
temporal/t.rast.accumulate/t.rast.accumulate.py \
|
||||
temporal/t.rast.accdetect/t.rast.accdetect.py \
|
||||
temporal/t.rast.algebra/t.rast.algebra.py \
|
||||
temporal/t.rast3d.algebra/t.rast3d.algebra.py \
|
||||
temporal/t.vect.algebra/t.vect.algebra.py \
|
||||
temporal/t.downgrade/t.downgrade.py \
|
||||
temporal/t.select/t.select.py
|
||||
for d in gui lib scripts temporal tools; do
|
||||
patchShebangs $d
|
||||
for f in $(find . -name '*.py'); do
|
||||
chmod +x $f
|
||||
done
|
||||
|
||||
patchShebangs */
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/grass78 \
|
||||
wrapProgram $out/bin/grass \
|
||||
--set PYTHONPATH $PYTHONPATH \
|
||||
--set GRASS_PYTHON ${python3Packages.python.interpreter} \
|
||||
--suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
|
||||
|
|
@ -117,6 +91,6 @@ stdenv.mkDerivation rec {
|
|||
description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [mpickering];
|
||||
maintainers = with lib.maintainers; [ mpickering willcohen ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
|
|
@ -114,5 +115,6 @@ mkDerivation rec {
|
|||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ nh2 ];
|
||||
platforms = with platforms; linux; # only tested here; might work on others
|
||||
broken = stdenv.isLinux; # plugins/core/IO/qPDALIO/CMakeFiles/QPDAL_IO_PLUGIN.dir/src/LASFilter.cpp.o] Error 1
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
, gettext
|
||||
, fetchFromGitLab
|
||||
, python3Packages
|
||||
, libpwquality
|
||||
, wrapGAppsHook4
|
||||
, gtk4
|
||||
, glib
|
||||
|
|
@ -17,7 +16,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gnome-secrets";
|
||||
version = "6.1";
|
||||
version = "6.4";
|
||||
format = "other";
|
||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||
|
||||
|
|
@ -26,7 +25,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "World";
|
||||
repo = "secrets";
|
||||
rev = version;
|
||||
sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8=";
|
||||
sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -45,6 +44,7 @@ python3Packages.buildPythonApplication rec {
|
|||
glib
|
||||
gdk-pixbuf
|
||||
libadwaita
|
||||
python3Packages.libpwquality.dev # Use python-enabled libpwquality
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
@ -52,14 +52,9 @@ python3Packages.buildPythonApplication rec {
|
|||
construct
|
||||
pykeepass
|
||||
pyotp
|
||||
] ++ [
|
||||
libpwquality # using the python bindings
|
||||
libpwquality
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache";
|
||||
'';
|
||||
|
||||
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
|
||||
dontWrapGApps = true;
|
||||
|
||||
|
|
@ -76,4 +71,3 @@ python3Packages.buildPythonApplication rec {
|
|||
maintainers = with maintainers; [ mvnetbiz ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,270 +9,11 @@
|
|||
, packageOverrides ? self: super: { }
|
||||
}:
|
||||
let
|
||||
mkOverride = attrname: version: sha256:
|
||||
self: super: {
|
||||
${attrname} = super.${attrname}.overridePythonAttrs (
|
||||
oldAttrs: {
|
||||
inherit version;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version sha256;
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
|
||||
[
|
||||
# the following dependencies are non trivial to update since later versions introduce backwards incompatible
|
||||
# changes that might affect plugins, or due to other observed problems
|
||||
(mkOverride "click" "7.1.2" "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a")
|
||||
(mkOverride "flask-babel" "1.0.0" "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn")
|
||||
(mkOverride "itsdangerous" "1.1.0" "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19")
|
||||
(mkOverride "jinja2" "2.11.3" "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6")
|
||||
(mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
|
||||
(mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
|
||||
|
||||
# black uses hash, not sha256 identifier. Newer black version requires newer click version
|
||||
(
|
||||
self: super: {
|
||||
black = super.black.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "21.12b0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# tests need network
|
||||
(
|
||||
self: super: {
|
||||
curio = super.curio.overridePythonAttrs (oldAttrs: rec {
|
||||
disabledTests = [
|
||||
"test_timeout"
|
||||
"test_ssl_outgoing"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# tests need network
|
||||
(
|
||||
self: super: {
|
||||
trio = super.trio.overridePythonAttrs (oldAttrs: rec {
|
||||
disabledTests = [
|
||||
"test_local_address_real"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
"trio/tests/test_exports.py"
|
||||
"trio/tests/test_socket.py"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Requires flask<2, cannot mkOverride because tests need to be disabled
|
||||
(
|
||||
self: super: {
|
||||
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.1.4";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "15ni4xlm57a15f5hipp8w0c9zba20179bvfns2392fiq1lcbdghg";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Requires werkezug<2, cannot mkOverride because tests need to be disabled
|
||||
(
|
||||
self: super: {
|
||||
werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.0.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Requires unidecode>=0.04.14,<0.05. Upstream changed the source naming between releases
|
||||
(
|
||||
self: super: {
|
||||
unidecode = super.unidecode.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.04.21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "avian2";
|
||||
repo = "unidecode";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0p5bkibv0xm1265dlfrz3zq3k9bbx07gl8zyq8mvvb8hi7p5lifg";
|
||||
};
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Requires websocket-client <1.0, >=0.57. Cannot do mkOverride b/c differing underscore/hyphen in pypi source name
|
||||
(
|
||||
self: super: {
|
||||
websocket-client = super.websocket-client.overridePythonAttrs (
|
||||
oldAttrs: rec {
|
||||
version = "0.59.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk";
|
||||
};
|
||||
propagatedBuildInputs = with self; [
|
||||
six
|
||||
pysocks
|
||||
];
|
||||
disabledTests = [
|
||||
"testConnect" # requires network access
|
||||
];
|
||||
}
|
||||
);
|
||||
}
|
||||
)
|
||||
|
||||
# Octoprint needs zeroconf >=0.24 <0.25. This can't be done via mkOverride, because in zeroconf 0.32
|
||||
# the super package was migrated to fetchFromGitHub.
|
||||
(
|
||||
self: super: {
|
||||
zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec {
|
||||
version = "0.24.5";
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9";
|
||||
};
|
||||
pythonImportsCheck = [
|
||||
"zeroconf"
|
||||
];
|
||||
buildInputs = with self; [
|
||||
pytestCheckHook
|
||||
nose
|
||||
];
|
||||
pytestFlagsArray = [ "zeroconf/test.py" ];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Octoprint pulls in celery indirectly but has no support for the up-to-date releases
|
||||
(
|
||||
self: super: {
|
||||
celery = super.celery.overrideAttrs (oldAttrs: rec {
|
||||
version = "5.0.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-MTkw/d3nA9jjcCmjBL+RQpzRGu72PFfebayp2Vjh8lU=";
|
||||
};
|
||||
disabledTestPaths = [
|
||||
"t/unit/backends/test_mongodb.py"
|
||||
"t/unit/backends/test_cassandra.py"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Octoprint would allow later sentry-sdk releases but not later click releases
|
||||
(
|
||||
self: super: {
|
||||
sentry-sdk = super.sentry-sdk.overrideAttrs (oldAttrs: rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-vdE6eqELMM69CWHaNYhF0HMCTV3tQsJlMHAA96oCy8c=";
|
||||
};
|
||||
disabledTests = [
|
||||
"test_apply_simulates_delivery_info"
|
||||
"test_auto_enabling_integrations_catches_import_error"
|
||||
"test_leaks"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# Don't test integrations
|
||||
"tests/integrations"
|
||||
# test crashes on aarch64
|
||||
"tests/test_transport.py"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Octoprint fails due to a newly added test in pytest-httpbin
|
||||
# see https://github.com/NixOS/nixpkgs/issues/159864
|
||||
(
|
||||
self: super: {
|
||||
pytest-httpbin = super.pytest-httpbin.overridePythonAttrs (oldAttrs: rec {
|
||||
disabledTests = [
|
||||
"test_redirect_location_is_https_for_secure_server"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# All test fail on aarch64
|
||||
(
|
||||
self: super: {
|
||||
azure-core = super.azure-core.overridePythonAttrs (oldAttrs: rec {
|
||||
doCheck = stdenv.buildPlatform == "x86_64-linux";
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# needs network
|
||||
(
|
||||
self: super: {
|
||||
falcon = super.falcon.overridePythonAttrs (oldAttrs: rec {
|
||||
#pytestFlagsArray = [ "-W ignore::DeprecationWarning" ];
|
||||
disabledTestPaths = oldAttrs.disabledTestPaths or [] ++ [
|
||||
"tests/asgi/test_asgi_servers.py"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# update broke some tests
|
||||
(
|
||||
self: super: {
|
||||
sanic = super.sanic.overridePythonAttrs (oldAttrs: rec {
|
||||
disabledTestPaths = oldAttrs.disabledTestPaths or [] ++ [
|
||||
"test_cli.py"
|
||||
"test_cookies.py"
|
||||
# requires network
|
||||
"test_worker.py"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
(
|
||||
self: super: {
|
||||
flask-restful = super.flask-restful.overridePythonAttrs (oldAttrs: rec {
|
||||
# remove werkzeug patch
|
||||
patches = [];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
(
|
||||
self: super: {
|
||||
trytond = super.trytond.overridePythonAttrs (oldAttrs: rec {
|
||||
# remove werkzeug patch
|
||||
patches = [];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Built-in dependency
|
||||
(
|
||||
self: super: {
|
||||
|
|
@ -313,14 +54,14 @@ let
|
|||
self: super: {
|
||||
octoprint-pisupport = self.buildPythonPackage rec {
|
||||
pname = "OctoPrint-PiSupport";
|
||||
version = "2021.10.28";
|
||||
version = "2022.3.28";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint-PiSupport";
|
||||
rev = version;
|
||||
sha256 = "01bpvv1sn3113fdpw6b90c2rj8lqay118x609yy64z9ccm93khl9";
|
||||
sha256 = "yzE/jz604nX/CHcW3aa7goH1ey8qZ7rLw31SMfNKJZM=";
|
||||
};
|
||||
|
||||
# requires octoprint itself during tests
|
||||
|
|
@ -333,13 +74,13 @@ let
|
|||
self: super: {
|
||||
octoprint = self.buildPythonPackage rec {
|
||||
pname = "OctoPrint";
|
||||
version = "1.7.3";
|
||||
version = "1.8.0rc5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctoPrint";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
sha256 = "sha256-U6g7WysHHOlZ4p5BM4tw3GGAxQmxv6ltYgAp1rO/eCg=";
|
||||
sha256 = "sha256-FeT45w6VXaFV4BsuOMk58nxxiu9jhCNnA2F7Uh/3sB0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with super; [
|
||||
|
|
@ -387,7 +128,7 @@ let
|
|||
werkzeug
|
||||
wrapt
|
||||
zeroconf
|
||||
zipstream-new
|
||||
zipstream-ng
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
py.pkgs.appdirs
|
||||
];
|
||||
|
|
@ -426,6 +167,7 @@ let
|
|||
"wrapt"
|
||||
"zeroconf"
|
||||
"Flask-Login"
|
||||
"werkzeug"
|
||||
];
|
||||
in
|
||||
''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config
|
||||
{ lib, mkDerivation, fetchFromGitHub, pkg-config
|
||||
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
|
||||
, libosmscout, valhalla, libpostal, osrm-backend, protobuf
|
||||
, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
|
||||
|
|
@ -14,30 +14,16 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "osmscout-server";
|
||||
version = "1.17.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinigus";
|
||||
repo = "osmscout-server";
|
||||
rev = version;
|
||||
sha256 = "0rpsi6nyhcz6bv0jab4vixkxhjmn84xi0q2xz15a097hn46cklx9";
|
||||
sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Two patches required to work with valhalla 3.1
|
||||
patches = [
|
||||
# require C++14 to match latest Valhalla
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rinigus/osmscout-server/commit/78b41b9b4c607fe9bfd6fbd61ae31cb7c8a725cd.patch";
|
||||
sha256 = "0gk9mdwa75awl0bj30gm8waj454d8k2yixxwh05m0p550cbv3lg0";
|
||||
})
|
||||
# add Valhalla 3.1 config
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rinigus/osmscout-server/commit/584de8bd47700053960fa139a2d7f8d3d184c876.patch";
|
||||
sha256 = "0liz72n83q93bzzyyiqjkxa6hp9zjx7v9rgsmpwf88gc4caqm2dz";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
buildInputs = [
|
||||
kirigami2 qtquickcontrols2 qtlocation
|
||||
|
|
@ -45,13 +31,6 @@ mkDerivation rec {
|
|||
libpostal sqlite marisa kyotocabinet boost protobuf date
|
||||
];
|
||||
|
||||
# OSMScout server currently defaults to an earlier version of valhalla,
|
||||
# but valhalla 3.1 support has been added. (See patches above)
|
||||
# Replace the default valhalla.json with the valhalla 3.1 version
|
||||
postPatch = ''
|
||||
mv data/valhalla.json-3.1 data/valhalla.json
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant
|
||||
"CONFIG+=disable_mapnik" # Disable the optional mapnik backend
|
||||
|
|
|
|||
|
|
@ -19,15 +19,15 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "101.0.4951.41",
|
||||
"sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",
|
||||
"sha256bin64": "1jbj5cykxamf32c1s4gsid1wxcsdf4hng2d19q9h7b2ashkvvrbi",
|
||||
"version": "102.0.5005.27",
|
||||
"sha256": "0fznry72w50dpijg55yxkaz1hv1zkvvxini3yxadwpfa5y0mpn3m",
|
||||
"sha256bin64": "0k543zz3njsn5kh1wf90hqywll9s6g4xrnh2zqph066l91gj17rx",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-03-14",
|
||||
"version": "2022-04-14",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
|
||||
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
|
||||
"rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
|
||||
"sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -17,6 +17,15 @@
|
|||
"vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc",
|
||||
"version": "2.8.0"
|
||||
},
|
||||
"age": {
|
||||
"owner": "clementblaise",
|
||||
"provider-source-address": "registry.terraform.io/clementblaise/age",
|
||||
"repo": "terraform-provider-age",
|
||||
"rev": "v0.1.1",
|
||||
"sha256": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
|
||||
"vendorSha256": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=",
|
||||
"version": "0.1.1"
|
||||
},
|
||||
"aiven": {
|
||||
"owner": "aiven",
|
||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rclone";
|
||||
version = "1.58.0";
|
||||
version = "1.58.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zCKXi3qeiq2AGT7UioVfCbB4bc5F2tXJ507zPa+O0pc=";
|
||||
sha256 = "sha256-Hh0IVNaLAUOmdYJ6cbYFyDCLwL+0HyZdRzKnXAT0CB8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-mgupx5SNQ3wUkQCeTVnw3wwdSCrTcwLYxcX6tlqXTyQ=";
|
||||
vendorSha256 = "sha256-MPo1t1gzlrzAzbTOv/dSs2BH8NwlXmf6vo1DOFP2TrM=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "QtRVSim";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvut";
|
||||
repo = "qtrvsim";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "B1l+ysrodeDbxYfdLLMF8yk4/uPXTcDrTaMtYm89HuU=";
|
||||
sha256 = "BV/nHRvimPaBtY1nfK1PZ2yJ9xWZpNlwiTRfI/9KQec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -1,25 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-interactive-rebase-tool";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MitMaro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DYl/GUbeNtKmXoR3gq8mK8EfsZNVNlrdngAwfzG+epw=";
|
||||
sha256 = "sha256-++KTMzTt84dowoZP+Bc9E/jUS21YN5ybKrlpQUKCir0=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# update git2 crate to fix a compile error
|
||||
(fetchpatch {
|
||||
url = "https://github.com/MitMaro/git-interactive-rebase-tool/commit/f4d3026f23118d29a263bbca6c83f963e76c34c4.patch";
|
||||
sha256 = "sha256-6ErPRcPbPRXbEslNiNInbbUhbOWb9ZRll7ZDRgTpWS4=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-2aHW9JIiqkO0X0B0D44tSZ8QkmKH/QZoYvKNEQWldo4=";
|
||||
cargoSha256 = "sha256-OUaP/nDs589FYaGYcleRMTQNu3/q/2wBjHSv2q8OyjA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-todo";
|
||||
version = "unstable-2022-03-11";
|
||||
version = "unstable-2022-03-13";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gnome-todo";
|
||||
rev = "07791399742366b4e3a6897430054d91df4594b4";
|
||||
sha256 = "821KgxkkW4T6bdGuttAz9ao/WStM1QEfn4hY/b0d0jI=";
|
||||
rev = "68787718eabf164f9087367113689996cd06fefd";
|
||||
sha256 = "srfu22s8nVVJYw8c97T1ubT6nQqbA1Sav5Ckemdcn30=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-watcom-v2";
|
||||
version = "unstable-2022-04-23";
|
||||
version = "unstable-2022-04-24";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "3351d37f44eef84fcd428b8b5537cb29a7db22a8";
|
||||
sha256 = "mSF9xFKJ5AQ+Ds84qMD8xJJ7B9AMujgksxMNzSDzLA4=";
|
||||
rev = "13fcf849005f8e2f1c072ad727721eeb52d17b39";
|
||||
sha256 = "Wz9Lbwz00xwes4yiko4RA95QdKOkRHUitAFsCNWhfkw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,10 +5,17 @@ with lib; mkCoqDerivation {
|
|||
owner = "Lysxia";
|
||||
repo = "coq-simple-io";
|
||||
inherit version;
|
||||
defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.3.0" else null;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.11" "8.15"; out = "1.7.0"; }
|
||||
{ case = range "8.7" "8.13"; out = "1.3.0"; }
|
||||
] null;
|
||||
release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
|
||||
release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
|
||||
extraNativeBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
|
||||
propagatedBuildInputs = [ coq-ext-lib ];
|
||||
extraNativeBuildInputs = (with coq.ocamlPackages; [ cppo zarith ]);
|
||||
propagatedBuildInputs = [ coq-ext-lib ]
|
||||
++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
|
||||
|
||||
mlPlugin = true;
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, stdenv, fetchMavenArtifact }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liquibase-redshift-extension";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchMavenArtifact {
|
||||
artifactId = "liquibase-redshift";
|
||||
groupId = "org.liquibase.ext";
|
||||
sha256 = "sha256-jZdDKAC4Cvmkih8VH84Z3Q8BzsqGO55Uefr8vOlbDAk=";
|
||||
inherit version;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m444 -D $src/share/java/liquibase-redshift-${version}.jar $out/share/java/liquibase-redshift.jar
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/liquibase/liquibase-redshift/";
|
||||
description = "Amazon Redshift extension for Liquibase";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sir4ur0n ];
|
||||
};
|
||||
}
|
||||
28
pkgs/development/java-modules/redshift_jdbc/default.nix
Normal file
28
pkgs/development/java-modules/redshift_jdbc/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, stdenv, fetchMavenArtifact }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "redshift-jdbc";
|
||||
version = "2.1.0.3";
|
||||
|
||||
src = fetchMavenArtifact {
|
||||
artifactId = "redshift-jdbc42";
|
||||
groupId = "com.amazon.redshift";
|
||||
sha256 = "sha256-TO/JXh/pZ7tUZGfHqkzgZx18gLnISvnPVyGavzFv6vo=";
|
||||
inherit version;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -m444 -D $src/share/java/redshift-jdbc42-${version}.jar $out/share/java/redshift-jdbc42.jar
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/aws/amazon-redshift-jdbc-driver/";
|
||||
description =
|
||||
"JDBC 4.2 driver for Amazon Redshift allowing Java programs to connect to a Redshift database";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sir4ur0n ];
|
||||
};
|
||||
}
|
||||
|
|
@ -78,5 +78,6 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
broken = stdenv.isLinux; #r2000.cpp:824:13: error: expected primary-expression before '}' token
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gusb";
|
||||
version = "0.3.7";
|
||||
version = "0.3.10";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
|
||||
sha256 = "sha256-2l8l1oc2ImibM1FIbL4CjvwlRAP2Rt2BIl3+hULYxn0=";
|
||||
sha256 = "sha256-DrC5qw+LugxZYxyAnDe2Fu806zyOAAsLm3HPEeSTG9w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
{ lib, mkDerivation, fetchgit, cmake, pkg-config
|
||||
, marisa, qtlocation }:
|
||||
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config
|
||||
, marisa, qttools, qtlocation }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "libosmscout";
|
||||
version = "2017.06.30";
|
||||
version = "2022.04.25";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.code.sf.net/p/libosmscout/code";
|
||||
rev = "0c0fde4d9803539c99911389bc918377a93f350c";
|
||||
sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Framstag";
|
||||
repo = "libosmscout";
|
||||
rev = "4c3b28472864b8e9cdda80a05ec73ef22cb39323";
|
||||
sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ marisa qtlocation ];
|
||||
buildInputs = [ marisa qttools qtlocation ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data";
|
||||
|
|
|
|||
|
|
@ -7,36 +7,43 @@
|
|||
, libtiff
|
||||
, curl
|
||||
, gtest
|
||||
, nlohmann_json
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proj";
|
||||
version = "8.2.1";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = version;
|
||||
hash = "sha256-tnaIqYKgYHY1Tg33jsKYn9QL8YUobgXKbQsodoCXNys=";
|
||||
sha256 = "sha256-zMP+WzC65BFz8g8mF5t7toqxmxCJePysd6WJuqpe8yg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev"];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ sqlite libtiff curl ];
|
||||
buildInputs = [ sqlite libtiff curl nlohmann_json ];
|
||||
|
||||
checkInputs = [ gtest ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_GTEST=ON"
|
||||
"-DRUN_NETWORK_DEPENDENT_TESTS=OFF"
|
||||
"-DNLOHMANN_JSON_ORIGIN=external"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
export TMP=$TMPDIR
|
||||
'';
|
||||
preCheck =
|
||||
let
|
||||
libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||
in
|
||||
''
|
||||
export HOME=$TMPDIR
|
||||
export TMP=$TMPDIR
|
||||
export ${libPathEnvVar}=$PWD/lib
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, buildPackages
|
||||
, docSupport ? true
|
||||
, doxygen ? null
|
||||
, graphviz ? null
|
||||
}:
|
||||
|
||||
assert docSupport -> doxygen != null;
|
||||
|
|
@ -16,13 +17,13 @@ assert docSupport -> doxygen != null;
|
|||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waylandpp";
|
||||
version = "0.2.9";
|
||||
version = "0.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NilsBrause";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-c7sayJjQaqJWso2enESBx6OUW9vxxsfuHFolYDIYlXw=";
|
||||
sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
"-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ] ++ optional docSupport doxygen;
|
||||
nativeBuildInputs = [ cmake pkg-config ] ++ optionals docSupport [ doxygen graphviz ];
|
||||
buildInputs = [ pugixml wayland libGL libffi ];
|
||||
|
||||
outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ];
|
||||
|
|
|
|||
|
|
@ -28,5 +28,6 @@ buildOctavePackage rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ KarlJoad ];
|
||||
description = "GNU Octave bindings to PROJ library for cartographic projections and CRS transformations";
|
||||
broken = true; # error: unlink: operation failed: No such file or directory
|
||||
};
|
||||
}
|
||||
|
|
|
|||
37
pkgs/development/python-modules/mkdocs-minify/default.nix
Normal file
37
pkgs/development/python-modules/mkdocs-minify/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, callPackage
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, mkdocs
|
||||
, csscompressor
|
||||
, htmlmin
|
||||
, jsmin
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "mkdocs-minify";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "byrnereese";
|
||||
repo = "${pname}-plugin";
|
||||
rev = version;
|
||||
sha256 = "sha256-7v4uX711KAKuXFeVdLuIdGQi2i+dL4WX7+Zd4H1L3lM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
csscompressor
|
||||
htmlmin
|
||||
jsmin
|
||||
mkdocs
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mkdocs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A mkdocs plugin to minify the HTML of a page before it is written to disk.";
|
||||
homepage = "https://github.com/byrnereese/mkdocs-minify-plugin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tfc ];
|
||||
};
|
||||
}
|
||||
31
pkgs/development/python-modules/mkdocs-redirects/default.nix
Normal file
31
pkgs/development/python-modules/mkdocs-redirects/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, callPackage
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, mkdocs
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "mkdocs-redirects";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkdocs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hdMfl8j+kZzePkSd/bBHKuVXAVA1sAt7DvPZj9x5i0c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mkdocs
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mkdocs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source plugin for Mkdocs page redirects";
|
||||
homepage = "https://github.com/mkdocs/mkdocs-redirects";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tfc ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
|
@ -16,6 +17,7 @@ buildPythonPackage rec {
|
|||
description = "Library to simulate plate tectonics with Python bindings";
|
||||
homepage = "https://github.com/Mindwerks/plate-tectonics";
|
||||
license = licenses.lgpl3;
|
||||
broken = stdenv.isLinux;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,25 @@
|
|||
{ lib, stdenv, fetchurl, jre, makeWrapper
|
||||
, mysqlSupport ? true, mysql_jdbc
|
||||
, postgresqlSupport ? true, postgresql_jdbc }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, jre
|
||||
, makeWrapper
|
||||
, mysqlSupport ? true
|
||||
, mysql_jdbc
|
||||
, postgresqlSupport ? true
|
||||
, postgresql_jdbc
|
||||
, redshiftSupport ? true
|
||||
, redshift_jdbc
|
||||
, liquibase_redshift_extension
|
||||
}:
|
||||
|
||||
let
|
||||
extraJars =
|
||||
lib.optional mysqlSupport mysql_jdbc
|
||||
++ lib.optional postgresqlSupport postgresql_jdbc;
|
||||
++ lib.optional postgresqlSupport postgresql_jdbc
|
||||
++ lib.optionals redshiftSupport [
|
||||
redshift_jdbc
|
||||
liquibase_redshift_extension
|
||||
];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -30,7 +44,8 @@ stdenv.mkDerivation rec {
|
|||
CP="\$CP":"\$jar"
|
||||
done
|
||||
'';
|
||||
in ''
|
||||
in
|
||||
''
|
||||
mkdir -p $out
|
||||
mv ./{lib,licenses,liquibase.jar} $out/
|
||||
|
||||
|
|
@ -54,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
liquibase.integration.commandline.Main \''${1+"\$@"}
|
||||
EOF
|
||||
chmod +x $out/bin/liquibase
|
||||
'';
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Version Control for your database";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
|
||||
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, docutils, pkg-config
|
||||
, libkrb5, keyutils, pam, talloc, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -10,6 +10,22 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-ZgnoB0tUISlf8BKjHwLM2aBYQVxhnIE2Lrt4jb8HVrg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix buffer-overflow in handling of ip= parameter in mount.cifs
|
||||
# https://www.openwall.com/lists/oss-security/2022/04/27/5
|
||||
name = "CVE-2022-27239.patch";
|
||||
url = "https://github.com/piastry/cifs-utils/commit/007c07fd91b6d42f8bd45187cf78ebb06801139d.patch";
|
||||
sha256 = "sha256-3uoHso2q17r2bcEW+ZjYUWsW4OIGYA7kxYZxQQy0JOg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Fix disclosure of invalid credential configuration in verbose mode
|
||||
name = "CVE-2022-29869.patch";
|
||||
url = "https://github.com/piastry/cifs-utils/commit/8acc963a2e7e9d63fe1f2e7f73f5a03f83d9c379.patch";
|
||||
sha256 = "sha256-MjfreeL1ME550EYK9LPOUAAjIk1BoMGfb+pQe3A1bz8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
|
||||
|
||||
buildInputs = [ libkrb5 keyutils pam talloc python3 ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
{ lib, stdenv, fetchurl, unrar-wrapper, pkgs }:
|
||||
|
||||
let
|
||||
|
||||
version = "5.1.5769";
|
||||
|
||||
|
||||
# Described on https://github.com/patjak/facetimehd/wiki/Extracting-the-sensor-calibration-files
|
||||
|
||||
# From the wiki page, range extracted with binwalk:
|
||||
zipUrl = "https://download.info.apple.com/Mac_OS_X/031-30890-20150812-ea191174-4130-11e5-a125-930911ba098f/bootcamp${version}.zip";
|
||||
zipRange = "2338085-3492508"; # the whole download is 518MB, this deflate stream is 1.2MB
|
||||
|
||||
# CRC and length from the ZIP entry header (not strictly necessary, but makes it extract cleanly):
|
||||
gzFooter = ''\x51\x1f\x86\x78\xcf\x5b\x12\x00'';
|
||||
|
||||
# Also from the wiki page:
|
||||
calibrationFiles = [
|
||||
{ file = "1771_01XX.dat"; offset = "1644880"; size = "19040"; }
|
||||
{ file = "1871_01XX.dat"; offset = "1606800"; size = "19040"; }
|
||||
{ file = "1874_01XX.dat"; offset = "1625840"; size = "19040"; }
|
||||
{ file = "9112_01XX.dat"; offset = "1663920"; size = "33060"; }
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
pname = "facetimehd-calibration";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = zipUrl;
|
||||
sha256 = "1dzyv457fp6d8ly29sivqn6llwj5ydygx7p8kzvdnsp11zvid2xi";
|
||||
curlOpts = "-r ${zipRange}";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontInstall = true;
|
||||
|
||||
buildInputs = [ unrar-wrapper ];
|
||||
|
||||
buildPhase = ''
|
||||
{ printf '\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x00'
|
||||
cat $src
|
||||
printf '${gzFooter}'
|
||||
} | zcat > AppleCamera64.exe
|
||||
unrar x AppleCamera64.exe AppleCamera.sys
|
||||
|
||||
mkdir -p $out/lib/firmware/facetimehd
|
||||
'' + lib.concatMapStrings ({file, offset, size}: ''
|
||||
dd bs=1 skip=${offset} count=${size} if=AppleCamera.sys of=$out/lib/firmware/facetimehd/${file}
|
||||
'') calibrationFiles;
|
||||
|
||||
meta = with lib; {
|
||||
description = "facetimehd calibration";
|
||||
homepage = "https://support.apple.com/kb/DL1837";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ womfoo grahamc ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,26 +1,26 @@
|
|||
{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_78
|
||||
{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_91
|
||||
, coreutils, bash, makeWrapper, python3, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "couchdb";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
|
||||
# when updating this, please consider bumping the erlang/OTP version
|
||||
# in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
|
||||
sha256 = "1y5cfic88drlr9qiwyj2p8xc9m9hcbvw77j5lwbp0cav78f2vphi";
|
||||
sha256 = "sha256-acn9b4ATNVf2igLpLdpypP1kbWRvQp9Fu4Mpow+C8g4=";
|
||||
};
|
||||
|
||||
buildInputs = [ erlang icu openssl spidermonkey_78 (python3.withPackages(ps: with ps; [ requests ]))];
|
||||
buildInputs = [ erlang icu openssl spidermonkey_91 (python3.withPackages(ps: with ps; [ requests ]))];
|
||||
postPatch = ''
|
||||
substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-78' "${spidermonkey_78.dev}/include/mozjs-78"
|
||||
substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91"
|
||||
patchShebangs bin/rebar
|
||||
'';
|
||||
|
||||
dontAddPrefix= "True";
|
||||
configureFlags = ["--spidermonkey-version=78"];
|
||||
configureFlags = ["--spidermonkey-version=91"];
|
||||
buildFlags = ["release"];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
{lib, stdenv, fetchgit, autoreconfHook, halibut}:
|
||||
{ lib, stdenv
|
||||
, fetchgit
|
||||
, cmake
|
||||
, halibut
|
||||
}:
|
||||
let
|
||||
date = "20200705";
|
||||
rev = "2a7d4a2";
|
||||
date = "20211129";
|
||||
rev = "8cd63c5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "agedu";
|
||||
|
|
@ -11,10 +15,10 @@ stdenv.mkDerivation {
|
|||
src = fetchgit {
|
||||
url = "https://git.tartarus.org/simon/agedu.git";
|
||||
inherit rev;
|
||||
sha256 = "gRNscl/vhBoZaHFCs9JjDBHDRoEpILJLtiI4YV+K/b4=";
|
||||
hash = "sha256-5wqpL7wrFwIf6lxVte+GXLsXYY0/36EIAUepVNDCnSE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [autoreconfHook halibut];
|
||||
nativeBuildInputs = [ cmake halibut ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Unix utility for tracking down wasted disk space";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.5.3";
|
||||
version = "9.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yBXW9jrE9VUEu0EoBCtctTkQo129Vo+zFgP0Hkmm5hQ=";
|
||||
sha256 = "sha256-YBg7mY8po7yVrSX1GaoI9/E3zFbdWWQEVCuR0H0DgJ4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nRZbSkSix2knIQBEMPx5oC47VKXNZ2e1NgKt9mAhaPQ=";
|
||||
vendorSha256 = "sha256-kaqTJMRbLSF1zy6qXqdOSzmbcV35rzrou4X0WzoQoGc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwarden";
|
||||
version = "1.31.3";
|
||||
version = "1.32.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb";
|
||||
sha256 = "sha256-ASL4+FZh5st3V5Z+jsfvLD26hG9KNVI+tht7kL8lbL4=";
|
||||
sha256 = "sha256-G1k8kf00EQVH/z2foH4NHCw82/eTi7BMMfkVtX6IfQo=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -21000,7 +21000,9 @@ with pkgs;
|
|||
|
||||
wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
|
||||
|
||||
waylandpp = callPackage ../development/libraries/waylandpp { };
|
||||
waylandpp = callPackage ../development/libraries/waylandpp {
|
||||
graphviz = graphviz-nox;
|
||||
};
|
||||
|
||||
wcslib = callPackage ../development/libraries/science/astronomy/wcslib { };
|
||||
|
||||
|
|
@ -22308,6 +22310,10 @@ with pkgs;
|
|||
|
||||
postgresqlTestHook = callPackage ../build-support/setup-hooks/postgresql-test-hook { };
|
||||
|
||||
redshift_jdbc = callPackage ../development/java-modules/redshift_jdbc { };
|
||||
|
||||
liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { };
|
||||
|
||||
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
|
||||
prometheus = callPackage ../servers/monitoring/prometheus { buildGoModule = buildGo118Module; };
|
||||
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
|
||||
|
|
@ -22900,6 +22906,8 @@ with pkgs;
|
|||
|
||||
extrace = callPackage ../os-specific/linux/extrace { };
|
||||
|
||||
facetimehd-calibration = callPackage ../os-specific/linux/firmware/facetimehd-calibration { };
|
||||
|
||||
facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
|
||||
|
||||
fatrace = callPackage ../os-specific/linux/fatrace { };
|
||||
|
|
|
|||
|
|
@ -5258,6 +5258,8 @@ in {
|
|||
mkdocs = callPackage ../development/python-modules/mkdocs { };
|
||||
mkdocs-material = callPackage ../development/python-modules/mkdocs-material { };
|
||||
mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { };
|
||||
mkdocs-minify = callPackage ../development/python-modules/mkdocs-minify { };
|
||||
mkdocs-redirects = callPackage ../development/python-modules/mkdocs-redirects { };
|
||||
|
||||
mkl-service = callPackage ../development/python-modules/mkl-service { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue