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

Merge remote-tracking branch 'origin/master' into haskell-updates

Browse Source
This commit is contained in:
sternenseemann
2023-03-13 02:35:21 +01:00
parent b2c570ec43 7c84ea61ab
commit 5cc155a509
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/rure/Cargo.lock
Generated
+6 -6
View File
@@ -4,18 +4,18 @@ version = 3
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.19" version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.137" version = "0.2.140"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
[[package]] [[package]]
name = "memchr" name = "memchr"
@@ -25,9 +25,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.7.0" version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
pkgs/development/libraries/rure/default.nix
+5
View File
@@ -2,6 +2,7 @@
, stdenv , stdenv
, rustPlatform , rustPlatform
, fetchCrate , fetchCrate
, fixDarwinDylibNames
}: }:
let let
@@ -27,6 +28,10 @@ rustPlatform.buildRustPackage {
install -Dm644 include/rure.h -t "$dev/include" install -Dm644 include/rure.h -t "$dev/include"
''; '';
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
];
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;
meta = { meta = {
pkgs/servers/web-apps/engelsystem/default.nix
+6 -5
View File
@@ -3,14 +3,15 @@
let let
phpExt = php.withExtensions phpExt = php.withExtensions
({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]); ({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]);
in stdenv.mkDerivation rec { in
stdenv.mkDerivation rec {
pname = "engelsystem"; pname = "engelsystem";
version = "3.1.0"; version = "3.3.0";
src = fetchzip { src = fetchzip {
url = url =
"https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip"; "https://github.com/engelsystem/engelsystem/releases/download/v3.3.0/engelsystem-v3.3.0.zip";
sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai"; hash = "sha256-DS0klm26udXsiiFToeOJooA1WUR8gk0qf/UJL8E77ps=";
}; };
buildInputs = [ phpExt ]; buildInputs = [ phpExt ];
@@ -20,7 +21,6 @@ in stdenv.mkDerivation rec {
# prepare # prepare
rm -r ./storage/ rm -r ./storage/
rm -r ./docker/
ln -sf /etc/engelsystem/config.php ./config/config.php ln -sf /etc/engelsystem/config.php ./config/config.php
ln -sf /var/lib/engelsystem/storage/ ./storage ln -sf /var/lib/engelsystem/storage/ ./storage
@@ -43,6 +43,7 @@ in stdenv.mkDerivation rec {
description = 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"; "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"; homepage = "https://engelsystem.de";
changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ kloenk ]; maintainers = with maintainers; [ kloenk ];
mainProgram = "migrate"; mainProgram = "migrate";
pkgs/tools/misc/topgrade/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "topgrade"; pname = "topgrade";
version = "10.3.1"; version = "10.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "topgrade-rs"; owner = "topgrade-rs";
repo = "topgrade"; repo = "topgrade";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-sOXp/oo29oVdmn3qEb7HCSlYYOvbTpD21dX4JSYaqps="; hash = "sha256-yYRKNiX8JvCP44+mdLIOSjpxaVDz1YUNrj/IZ0bC72Y=";
}; };
cargoHash = "sha256-fZjMTVn4gx1hvtiD5NRkXY2f9HNSv7Vx3HdHypne5U0="; cargoHash = "sha256-2b6TOkjoycPA8rwca3nT212Yxl6q2Hmvv0f4Ic9hnWM=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
pkgs/tools/security/httpx/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "httpx"; pname = "httpx";
version = "1.2.7"; version = "1.2.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "projectdiscovery"; owner = "projectdiscovery";
repo = "httpx"; repo = "httpx";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-kZU7k7vAKgQfCQobGa5i5ZnO8ARUSozv4gz93g912uM="; hash = "sha256-uZTYRsOAmuROA8ZrePruE+eDIx9TW98ljByDkstZC1Q=";
}; };
vendorHash = "sha256-1EQt7L+dQvpBOGVHeaIOCUG960yv5h9nuQNnF4wSoug="; vendorHash = "sha256-czW1bnQp5+Om5EfW1DvCkAaNaqfAupmSJJvS14xKQUg=";
# Tests require network access # Tests require network access
doCheck = false; doCheck = false;