Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
commit
5cc155a509
12
pkgs/development/libraries/rure/Cargo.lock
generated
12
pkgs/development/libraries/rure/Cargo.lock
generated
|
@ -4,18 +4,18 @@ version = 3
|
|||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.7.19"
|
||||
version = "0.7.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
|
||||
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.137"
|
||||
version = "0.2.140"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
|
||||
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
|
@ -25,9 +25,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
|||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.7.0"
|
||||
version = "1.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
|
||||
checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, fixDarwinDylibNames
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -27,6 +28,10 @@ rustPlatform.buildRustPackage {
|
|||
install -Dm644 include/rure.h -t "$dev/include"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -3,14 +3,15 @@
|
|||
let
|
||||
phpExt = php.withExtensions
|
||||
({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "engelsystem";
|
||||
version = "3.1.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchzip {
|
||||
url =
|
||||
"https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip";
|
||||
sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai";
|
||||
"https://github.com/engelsystem/engelsystem/releases/download/v3.3.0/engelsystem-v3.3.0.zip";
|
||||
hash = "sha256-DS0klm26udXsiiFToeOJooA1WUR8gk0qf/UJL8E77ps=";
|
||||
};
|
||||
|
||||
buildInputs = [ phpExt ];
|
||||
|
@ -20,7 +21,6 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
# prepare
|
||||
rm -r ./storage/
|
||||
rm -r ./docker/
|
||||
|
||||
ln -sf /etc/engelsystem/config.php ./config/config.php
|
||||
ln -sf /var/lib/engelsystem/storage/ ./storage
|
||||
|
@ -43,6 +43,7 @@ in stdenv.mkDerivation rec {
|
|||
description =
|
||||
"Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what";
|
||||
homepage = "https://engelsystem.de";
|
||||
changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ kloenk ];
|
||||
mainProgram = "migrate";
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "topgrade";
|
||||
version = "10.3.1";
|
||||
version = "10.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "topgrade-rs";
|
||||
repo = "topgrade";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sOXp/oo29oVdmn3qEb7HCSlYYOvbTpD21dX4JSYaqps=";
|
||||
hash = "sha256-yYRKNiX8JvCP44+mdLIOSjpxaVDz1YUNrj/IZ0bC72Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fZjMTVn4gx1hvtiD5NRkXY2f9HNSv7Vx3HdHypne5U0=";
|
||||
cargoHash = "sha256-2b6TOkjoycPA8rwca3nT212Yxl6q2Hmvv0f4Ic9hnWM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.2.7";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kZU7k7vAKgQfCQobGa5i5ZnO8ARUSozv4gz93g912uM=";
|
||||
hash = "sha256-uZTYRsOAmuROA8ZrePruE+eDIx9TW98ljByDkstZC1Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1EQt7L+dQvpBOGVHeaIOCUG960yv5h9nuQNnF4wSoug=";
|
||||
vendorHash = "sha256-czW1bnQp5+Om5EfW1DvCkAaNaqfAupmSJJvS14xKQUg=";
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
|
Loading…
Reference in a new issue